shuber 2004/09/22 15:44:22 CEST
Modified files:
war/src/webapp/jsp delete_element.jsp
delete_element_bottom.jsp
delete_question.jsp
delete_question_bottom.jsp
display_faqs.jsp display_questions.jsp
display_topics.jsp display_tree.jsp
edit_element.jsp edit_element_bottom.jsp
edit_question.jsp
edit_question_bottom.jsp error.jsp
menu_faq.jsp menu_none.jsp
menu_project.jsp menu_topic.jsp roles.jsp
template.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 faq/war/src/webapp/jsp/delete_element.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/delete_element.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/delete_element_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/delete_element_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3 faq/war/src/webapp/jsp/delete_question.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/delete_question.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/delete_question_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/delete_question_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/display_faqs.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/display_faqs.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/display_questions.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/display_questions.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/display_topics.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/display_topics.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/display_tree.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/display_tree.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -4 faq/war/src/webapp/jsp/edit_element.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/edit_element.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/edit_element_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/edit_element_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +6 -6 faq/war/src/webapp/jsp/edit_question.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/edit_question.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/edit_question_bottom.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/edit_question_bottom.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 faq/war/src/webapp/jsp/error.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/error.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/menu_faq.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/menu_faq.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/menu_none.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/menu_none.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/menu_project.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/menu_project.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2 faq/war/src/webapp/jsp/menu_topic.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/menu_topic.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 faq/war/src/webapp/jsp/roles.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/roles.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -4 faq/war/src/webapp/jsp/template.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/faq/war/src/webapp/jsp/template.jsp.diff?r1=1.1&r2=1.2&f=h
Index: delete_element.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/delete_element.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_element.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ delete_element.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,7 +1,7 @@
<%@ page language="java" import="org.jahia.tools.*,org.jahia.webapps.faq.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="node" class="Node" 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="node" class="org.jahia.webapps.faq.Node" scope="session"/>
<%
String contextPath = request.getContextPath();
%>
Index: delete_element_bottom.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/delete_element_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_element_bottom.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ delete_element_bottom.jsp 22 Sep 2004 13:44:21 -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"/>
<%
Integer currentPos = (Integer) pageContext.findAttribute("currentPos");
String contextPath = request.getContextPath();
Index: delete_question.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/delete_question.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_question.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ delete_question.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,7 +1,7 @@
<%@ page language="java" import="org.jahia.tools.*,org.jahia.webapps.faq.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="question" class="Question" 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="question" class="org.jahia.webapps.faq.Question" scope="session"/>
<%
String contextPath = request.getContextPath();
%>
Index: delete_question_bottom.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/delete_question_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete_question_bottom.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ delete_question_bottom.jsp 22 Sep 2004 13:44:21 -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"/>
<%
Integer currentPos = (Integer) pageContext.findAttribute("currentPos");
String contextPath = request.getContextPath();
Index: display_faqs.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/display_faqs.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display_faqs.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ display_faqs.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true"
import="org.jahia.webapps.faq.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="node" class="Node" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="node" class="org.jahia.webapps.faq.Node" scope="session"/>
<% String contextPath = request.getContextPath();
System.out.println("je suis dans display faq"); %>
Index: display_questions.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/display_questions.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display_questions.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ display_questions.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true"
import="org.jahia.webapps.faq.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="node" class="Node" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="node" class="org.jahia.webapps.faq.Node" scope="session"/>
<%
Integer faqRole = (Integer) pageContext.findAttribute("faqRole");
String contextPath = request.getContextPath();
Index: display_topics.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/display_topics.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display_topics.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ display_topics.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true"
import="org.jahia.webapps.faq.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="node" class="Node" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="node" class="org.jahia.webapps.faq.Node" scope="session"/>
<% String contextPath = request.getContextPath(); %>
Index: display_tree.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/display_tree.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- display_tree.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ display_tree.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true"
import="org.jahia.webapps.faq.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="tree" class="Tree" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
+<jsp:useBean id="tree" class="org.jahia.webapps.faq.Tree" scope="session"/>
<%
Integer currentPos = (Integer) pageContext.findAttribute("currentPos");
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
Index: edit_element.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/edit_element.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_element.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ edit_element.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,8 +1,8 @@
<%@ page language="java" import="org.jahia.tools.*,org.jahia.webapps.faq.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="action" class="String" scope="session"/>
-<jsp:useBean id="node" class="Node" 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="action" class="java.lang.String" scope="session"/>
+<jsp:useBean id="node" class="org.jahia.webapps.faq.Node" scope="session"/>
<%
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
String contextPath = request.getContextPath();
Index: edit_element_bottom.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/edit_element_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_element_bottom.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ edit_element_bottom.jsp 22 Sep 2004 13:44:21 -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"/>
<%
Integer currentPos = (Integer) pageContext.findAttribute("currentPos");
String contextPath = request.getContextPath();
Index: edit_question.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/edit_question.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_question.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ edit_question.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,10 +1,10 @@
<%@ page buffer="none" session="true"
import="org.jahia.webapps.faq.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="node" class="Node" scope="session"/>
-<jsp:useBean id="question" class="Question" scope="session"/>
-<jsp:useBean id="titles" class="Vector" scope="session"/>
-<jsp:useBean id="action" 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="node" class="org.jahia.webapps.faq.Node" scope="session"/>
+<jsp:useBean id="question" class="org.jahia.webapps.faq.Question" scope="session"/>
+<jsp:useBean id="titles" class="java.util.Vector" scope="session"/>
+<jsp:useBean id="action" class="java.lang.String" scope="session"/>
<%
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
String contextPath = request.getContextPath();
Index: edit_question_bottom.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/edit_question_bottom.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit_question_bottom.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ edit_question_bottom.jsp 22 Sep 2004 13:44:21 -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"/>
<%
Integer currentPos = (Integer) pageContext.findAttribute("currentPos");
String contextPath = request.getContextPath();
Index: error.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/error.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ error.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java"
import="org.jahia.tools.*,org.jahia.webapps.faq.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
<html>
<head>
<title>Login Error</title>
Index: menu_faq.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/menu_faq.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu_faq.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ menu_faq.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true" %>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="servlet" class="String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
<%
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
String contextPath = request.getContextPath();
Index: menu_none.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/menu_none.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu_none.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ menu_none.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true" %>
-<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(); %>
Index: menu_project.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/menu_project.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu_project.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ menu_project.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true" %>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="servlet" class="String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
<%
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
String contextPath = request.getContextPath();
Index: menu_topic.jsp
===================================================================
RCS file: /home/cvs/repository/faq/war/src/webapp/jsp/menu_topic.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu_topic.jsp 13 Sep 2004 14:08:50 -0000 1.1
+++ menu_topic.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,6 +1,6 @@
<%@ page buffer="none" session="true" %>
-<jsp:useBean id="contextId" class="String" scope="session"/>
-<jsp:useBean id="servlet" class="String" scope="session"/>
+<jsp:useBean id="contextId" class="java.lang.String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
<%
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
String contextPath = request.getContextPath();
Index: roles.jsp
===================================================================
RCS file: /home/cvs/repository/faq/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 14:08:50 -0000 1.1
+++ roles.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -1,5 +1,5 @@
<%@ page language="java"
import="org.jahia.webapps.faq.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="servlet" class="String" scope="session"/>
+<jsp:useBean id="servlet" class="java.lang.String" scope="session"/>
<%
Integer faqRole = (Integer) pageContext.findAttribute("faqRole");
String roles[] = FaqServlet.getRoles();
Index: template.jsp
===================================================================
RCS file: /home/cvs/repository/faq/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 14:08:50 -0000 1.1
+++ template.jsp 22 Sep 2004 13:44:21 -0000 1.2
@@ -3,10 +3,10 @@
<title>FAQ portlet</title>
</head>
<%@ page language="java"
import="org.jahia.webapps.faq.*,org.jahia.tools.*,java.util.*" %>
-<jsp:useBean id="faqRoles" class="Vector" scope="session"/>
-<jsp:useBean id="menuPage" class="String" scope="session"/>
-<jsp:useBean id="nextPage" class="String" scope="session"/>
-<jsp:useBean id="bottomPage" class="String" scope="session"/>
+<jsp:useBean id="faqRoles" class="java.util.Vector" scope="session"/>
+<jsp:useBean id="menuPage" class="java.lang.String" scope="session"/>
+<jsp:useBean id="nextPage" class="java.lang.String" scope="session"/>
+<jsp:useBean id="bottomPage" class="java.lang.String" scope="session"/>
<%
Integer faqRole = (Integer) pageContext.findAttribute("faqRole");
Boolean modeStandalone = (Boolean) pageContext.findAttribute("modeStandalone");
