craigmcc 01/04/18 12:53:19
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester Session05.java
SessionListener01.java SessionListener02.java
tester/web/golden Session05.txt
Log:
Add a simple test for session event listeners.
Revision Changes Path
1.31 +10 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tester.xml 2001/04/18 02:59:33 1.30
+++ tester.xml 2001/04/18 19:53:02 1.31
@@ -717,6 +717,16 @@
joinSession="true"
outContent="Session04 PASSED"/>
+ <!-- Exercise session event listeners -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Session05" debug="${debug}"
+ golden="${golden.path}/Session05.txt"/>
+
+ <!-- Exercise session event listeners -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedSession05" debug="${debug}"
+ golden="${golden.path}/Session05.txt"/>
+
</target>
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session05.java
Index: Session05.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Part 5 of Session Tests. Ensures that the appropriate session listener
* events get called in the appropriate order. Relies on proper configuration
* of SessionListener01 and SessionListener02 in the web.xml file
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/04/18 19:53:08 $
*/
public class Session05 extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
// Reset the static logger to ensure no leftovers exist
StaticLogger.reset();
// Perform session management activities to trigger listener events
HttpSession session = request.getSession(true);
session.setAttribute("attribute1", "value1");
session.setAttribute("attribute1", "value2");
session.removeAttribute("attribute1");
session.removeAttribute("attribute2"); // Not present, so no logging
session.invalidate();
// Render the response (to be compared as a golden file)
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
while (true) {
String message = StaticLogger.read();
if (message == null)
break;
writer.println(message);
}
StaticLogger.reset();
}
}
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener01.java
Index: SessionListener01.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Application event listener for session events. All events that occur
* are logged appropriately to the static logger.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/04/18 19:53:09 $
*/
public class SessionListener01
implements HttpSessionListener, HttpSessionAttributeListener {
public void attributeAdded(HttpSessionBindingEvent event) {
StaticLogger.write("SessionListener01: attributeAdded(" +
event.getName() + "," + event.getValue() + ")");
}
public void attributeRemoved(HttpSessionBindingEvent event) {
StaticLogger.write("SessionListener01: attributeRemoved(" +
event.getName() + "," + event.getValue() + ")");
}
public void attributeReplaced(HttpSessionBindingEvent event) {
StaticLogger.write("SessionListener01: attributeReplaced(" +
event.getName() + "," + event.getValue() + ")");
}
public void sessionCreated(HttpSessionEvent event) {
StaticLogger.write("SessionListener01: sessionCreated()");
}
public void sessionDestroyed(HttpSessionEvent event) {
StaticLogger.write("SessionListener01: sessionDestroyed()");
}
}
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener02.java
Index: SessionListener02.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Application event listener for session events. All events that occur
* are logged appropriately to the static logger.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/04/18 19:53:09 $
*/
public class SessionListener02
implements HttpSessionListener, HttpSessionAttributeListener {
public void attributeAdded(HttpSessionBindingEvent event) {
StaticLogger.write("SessionListener02: attributeAdded(" +
event.getName() + "," + event.getValue() + ")");
}
public void attributeRemoved(HttpSessionBindingEvent event) {
StaticLogger.write("SessionListener02: attributeRemoved(" +
event.getName() + "," + event.getValue() + ")");
}
public void attributeReplaced(HttpSessionBindingEvent event) {
StaticLogger.write("SessionListener02: attributeReplaced(" +
event.getName() + "," + event.getValue() + ")");
}
public void sessionCreated(HttpSessionEvent event) {
StaticLogger.write("SessionListener02: sessionCreated()");
}
public void sessionDestroyed(HttpSessionEvent event) {
StaticLogger.write("SessionListener02: sessionDestroyed()");
}
}
1.23 +27 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- web.xml 2001/04/17 16:35:03 1.22
+++ web.xml 2001/04/18 19:53:12 1.23
@@ -228,6 +228,18 @@
</filter-mapping>
+ <!-- ========== Listener Definitions ================================== -->
+
+
+ <listener>
+ <listener-class>org.apache.tester.SessionListener01</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.tester.SessionListener02</listener-class>
+ </listener>
+
+
<!-- ========== Servlet Definitions =================================== -->
<servlet>
@@ -406,6 +418,11 @@
</servlet>
<servlet>
+ <servlet-name>Session05</servlet-name>
+ <servlet-class>org.apache.tester.Session05</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>SetBufferSize01</servlet-name>
<servlet-class>org.apache.tester.SetBufferSize01</servlet-class>
</servlet>
@@ -761,6 +778,16 @@
<servlet-mapping>
<servlet-name>Session04</servlet-name>
<url-pattern>/WrappedSession04</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session05</servlet-name>
+ <url-pattern>/Session05</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session05</servlet-name>
+ <url-pattern>/WrappedSession05</url-pattern>
</servlet-mapping>
<servlet-mapping>
1.1 jakarta-tomcat-4.0/tester/web/golden/Session05.txt
Index: Session05.txt
===================================================================
SessionListener01: sessionCreated()
SessionListener02: sessionCreated()
SessionListener01: attributeAdded(attribute1,value1)
SessionListener02: attributeAdded(attribute1,value1)
SessionListener01: attributeReplaced(attribute1,value2)
SessionListener02: attributeReplaced(attribute1,value2)
SessionListener01: attributeRemoved(attribute1,value2)
SessionListener02: attributeRemoved(attribute1,value2)
SessionListener02: sessionDestroyed()
SessionListener01: sessionDestroyed()
