cziegeler 02/01/30 08:42:50
Modified: src/java/org/apache/cocoon/components/deli DeliImpl.java
deli.xconf
Log:
Removed superfluous use-deli configuration parameter
Revision Changes Path
1.7 +33 -40
xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeliImpl.java 29 Jan 2002 19:48:48 -0000 1.6
+++ DeliImpl.java 30 Jan 2002 16:42:49 -0000 1.7
@@ -67,7 +67,7 @@
* A Delivery Context Library for CC/PP and UAProf</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Mark H. Butler</a>
- * @version CVS $ $ $Date: 2002/01/29 19:48:48 $
+ * @version CVS $ $ $Date: 2002/01/30 16:42:49 $
*/
public class DeliImpl
@@ -93,20 +93,17 @@
/** A context, used to retrieve the path to the configuration file */
protected CocoonServletContext servletContext;
- /** This flag indicates whether DELI has been enabled in sitemap.xmap */
- boolean useDeli = false;
-
/** Contextualize this class */
public void contextualize(Context context) throws ContextException
{
try
{
- org.apache.cocoon.environment.Context ctx =
(org.apache.cocoon.environment.Context)
context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
- servletContext = new CocoonServletContext(ctx);
+ org.apache.cocoon.environment.Context ctx =
(org.apache.cocoon.environment.Context)
context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
+ servletContext = new CocoonServletContext(ctx);
}
catch (Exception e)
{
- System.out.println(e);
+ System.out.println(e);
}
}
@@ -121,17 +118,13 @@
public final void parameterize(Parameters params)
{
this.deliConfig = params.getParameter("deli-config-file", this.deliConfig);
- this.useDeli = params.getParameterAsBoolean("use-deli", this.useDeli);
try
{
- if (this.useDeli)
- {
- workspace = new Workspace(servletContext, this.deliConfig);
- }
+ workspace = new Workspace(servletContext, this.deliConfig);
}
catch (Exception e)
{
- System.out.println(e);
+ System.out.println(e);
}
}
@@ -220,37 +213,37 @@
public class CocoonServletContext implements ServletContext
{
- org.apache.cocoon.environment.Context envContext;
+ org.apache.cocoon.environment.Context envContext;
- public CocoonServletContext(org.apache.cocoon.environment.Context context)
+ public CocoonServletContext(org.apache.cocoon.environment.Context context)
{
- envContext = context;
- }
- public Object getAttribute(String name) { return
envContext.getAttribute(name); }
+ envContext = context;
+ }
+ public Object getAttribute(String name) { return
envContext.getAttribute(name); }
public void setAttribute(String name, Object value) {
envContext.setAttribute(name, value); }
- public Enumeration getAttributeNames() { return
envContext.getAttributeNames(); }
- public java.net.URL getResource(String path) throws MalformedURLException {
return envContext.getResource(path);}
- public String getRealPath(String path) { return envContext.getRealPath(path); }
- public String getMimeType(String file) { return envContext.getMimeType(file); }
- public String getInitParameter(String name) { return
envContext.getInitParameter(name); }
- public java.io.InputStream getResourceAsStream(String path){ return
envContext.getResourceAsStream(path);}
-
- public ServletContext getContext(String uripath) { return (null); }
- public Enumeration getInitParameterNames() {return (null); }
- public int getMajorVersion() { return (2); }
- public int getMinorVersion() { return (3); }
- public RequestDispatcher getNamedDispatcher(String name) { return (null); }
- public RequestDispatcher getRequestDispatcher(String path) { return (null); }
+ public Enumeration getAttributeNames() { return envContext.getAttributeNames();
}
+ public java.net.URL getResource(String path) throws MalformedURLException {
return envContext.getResource(path);}
+ public String getRealPath(String path) { return
envContext.getRealPath(path); }
+ public String getMimeType(String file) { return envContext.getMimeType(file); }
+ public String getInitParameter(String name) { return
envContext.getInitParameter(name); }
+ public java.io.InputStream getResourceAsStream(String path){ return
envContext.getResourceAsStream(path);}
+
+ public ServletContext getContext(String uripath) { return (null); }
+ public Enumeration getInitParameterNames() {return (null); }
+ public int getMajorVersion() { return (2); }
+ public int getMinorVersion() { return (3); }
+ public RequestDispatcher getNamedDispatcher(String name) { return (null); }
+ public RequestDispatcher getRequestDispatcher(String path) { return (null);
}
public Set getResourcePaths(String path) { return null; }
- public String getServerInfo() { return (null); }
- public Servlet getServlet(String name) throws ServletException { return
(null); }
- public String getServletContextName() { return (null); }
- public Enumeration getServletNames() { return (null); }
- public Enumeration getServlets() { return (null); }
- public void log(String message) {}
- public void log(Exception exception, String message) {}
- public void log(String message, Throwable exception) {}
- public void removeAttribute(String name) {}
+ public String getServerInfo() { return (null); }
+ public Servlet getServlet(String name) throws ServletException { return
(null); }
+ public String getServletContextName() { return (null); }
+ public Enumeration getServletNames() { return (null); }
+ public Enumeration getServlets() { return (null); }
+ public void log(String message) {}
+ public void log(Exception exception, String message) {}
+ public void log(String message, Throwable exception) {}
+ public void removeAttribute(String name) {}
}
/**
1.4 +0 -1
xml-cocoon2/src/java/org/apache/cocoon/components/deli/deli.xconf
Index: deli.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/deli.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deli.xconf 29 Jan 2002 19:49:17 -0000 1.3
+++ deli.xconf 30 Jan 2002 16:42:50 -0000 1.4
@@ -1,5 +1,4 @@
<!-- Deli support -->
<deli class="org.apache.cocoon.components.deli.DeliImpl">
<parameter name="deli-config-file"
value="resources/deli/config/deliConfig.xml"/>
- <parameter name="use-deli" value="true"/>
</deli>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
