bloritsch 01/02/15 12:50:24
Modified: src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Added: src/org/apache/cocoon/servlet Tag: xml-cocoon2
ParanoidCocoonServlet.java
Log:
Added alternative Servlet. The Paranoid Servlet wraps cocoon,
the other one does not.
Revision Changes Path
No revision
No revision
1.1.4.58 +6 -20
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.57
retrieving revision 1.1.4.58
diff -u -r1.1.4.57 -r1.1.4.58
--- CocoonServlet.java 2001/02/15 20:30:17 1.1.4.57
+++ CocoonServlet.java 2001/02/15 20:50:07 1.1.4.58
@@ -60,7 +60,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.4.57 $ $Date: 2001/02/15 20:30:17 $
+ * @version CVS $Revision: 1.1.4.58 $ $Date: 2001/02/15 20:50:07 $
*/
public class CocoonServlet extends HttpServlet {
@@ -92,7 +92,7 @@
throws ServletException {
super.init(conf);
- RepositoryClassLoader classloader = new RepositoryClassLoader(new
URL[] {}, this.getClass().getClassLoader());
+ ClassLoader classloader = this.getClass().getClassLoader();
ServletContext context = conf.getServletContext();
ClassUtils.setClassLoader(classloader);
@@ -100,9 +100,9 @@
this.appContext.put(Constants.CONTEXT_SERVLET_CONTEXT, context);
- this.initLogger(conf.getInitParameter("log-level"), context,
classloader);
+ this.initLogger(conf.getInitParameter("log-level"), context);
- this.appContext.put(Constants.CONTEXT_CLASSPATH,
this.getClassPath(context, classloader));
+ this.appContext.put(Constants.CONTEXT_CLASSPATH,
this.getClassPath(context));
this.forceLoad(conf.getInitParameter("load-class"));
@@ -133,18 +133,12 @@
*
* @throws ServletException
*/
- private String getClassPath(final ServletContext context,
RepositoryClassLoader classloader)
+ private String getClassPath(final ServletContext context)
throws ServletException {
StringBuffer buildClassPath = new StringBuffer();
String classDir = context.getRealPath("/WEB-INF/classes");
File root = new File(context.getRealPath("/WEB-INF/lib"));
- try {
- classloader.addDirectory(new File(classDir));
- } catch (Exception e) {
- log.debug("Could not add directory" + classDir, e);
- }
-
buildClassPath.append(classDir);
if (root.isDirectory()) {
@@ -153,12 +147,6 @@
for (int i = 0; i < libraries.length; i++) {
buildClassPath.append(File.pathSeparatorChar)
.append(IOUtils.getFullFilename(libraries[i]));
-
- try {
- classloader.addDirectory(libraries[i]);
- } catch (Exception e) {
- log.debug("Could not add file" +
IOUtils.getFullFilename(libraries[i]));
- }
}
}
@@ -183,7 +171,7 @@
*
* @throws ServletException
*/
- private void initLogger(final String logLevel, final ServletContext
context, final RepositoryClassLoader classloader)
+ private void initLogger(final String logLevel, final ServletContext
context)
throws ServletException {
final Priority.Enum logPriority;
@@ -202,8 +190,6 @@
new FileOutputLogTarget(path),
new ServletLogTarget(context, Priority.ERROR)
});
-
- classloader.setLogger(this.log);
} catch (Exception e) {
LogKit.log("Could not set up Cocoon Logger, will use screen
instead", e);
}
No revision
No revision
1.1.2.1 +482 -0
xml-cocoon/src/org/apache/cocoon/servlet/Attic/ParanoidCocoonServlet.java
