cziegeler 02/02/07 00:59:17
Modified: src/java/org/apache/cocoon/environment/commandline
FileSavingEnvironment.java
LinkSamplingEnvironment.java
src/java/org/apache/cocoon/environment/http
HttpEnvironment.java
src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java
src/java/org/apache/cocoon/util/log CocoonLogFormatter.java
XMLCocoonLogFormatter.java
Log:
Last changes from Constants to ObjectModelHelper
Revision Changes Path
1.4 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java
Index: FileSavingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileSavingEnvironment.java 4 Feb 2002 13:10:03 -0000 1.3
+++ FileSavingEnvironment.java 7 Feb 2002 08:59:17 -0000 1.4
@@ -56,6 +56,7 @@
package org.apache.cocoon.environment.commandline;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.log.Logger;
import java.io.File;
@@ -67,7 +68,7 @@
* This environment is used to save the requested file to disk.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Id: FileSavingEnvironment.java,v 1.3 2002/02/04 13:10:03 cziegeler
Exp $
+ * @version CVS $Id: FileSavingEnvironment.java,v 1.4 2002/02/07 08:59:17 cziegeler
Exp $
*/
public class FileSavingEnvironment extends AbstractCommandLineEnvironment {
@@ -83,8 +84,8 @@
super(uri, null, context, stream, log);
this.getLogger().debug("FileSavingEnvironment: uri = " + uri);
this.objectModel.put(Constants.LINK_OBJECT, links);
- this.objectModel.put(Constants.REQUEST_OBJECT, new CommandLineRequest(this,
null, uri, null, attributes, parameters));
- this.objectModel.put(Constants.RESPONSE_OBJECT, new CommandLineResponse());
+ this.objectModel.put(ObjectModelHelper.REQUEST_OBJECT, new
CommandLineRequest(this, null, uri, null, attributes, parameters));
+ this.objectModel.put(ObjectModelHelper.RESPONSE_OBJECT, new
CommandLineResponse());
}
}
1.6 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java
Index: LinkSamplingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LinkSamplingEnvironment.java 4 Feb 2002 13:10:03 -0000 1.5
+++ LinkSamplingEnvironment.java 7 Feb 2002 08:59:17 -0000 1.6
@@ -55,6 +55,7 @@
package org.apache.cocoon.environment.commandline;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.log.Logger;
import java.io.*;
@@ -67,7 +68,7 @@
* This environment is sample the links of the resource.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Id: LinkSamplingEnvironment.java,v 1.5 2002/02/04 13:10:03
cziegeler Exp $
+ * @version CVS $Id: LinkSamplingEnvironment.java,v 1.6 2002/02/07 08:59:17
cziegeler Exp $
*/
public class LinkSamplingEnvironment extends AbstractCommandLineEnvironment
@@ -86,8 +87,8 @@
if (getLogger().isDebugEnabled()) {
this.getLogger().debug( "LinkSamplingEnvironment: uri = " + uri );
}
- this.objectModel.put( Constants.REQUEST_OBJECT, new CommandLineRequest(
this, null, uri, null, attributes, parameters ) );
- this.objectModel.put( Constants.RESPONSE_OBJECT, new CommandLineResponse()
);
+ this.objectModel.put( ObjectModelHelper.REQUEST_OBJECT, new
CommandLineRequest( this, null, uri, null, attributes, parameters ) );
+ this.objectModel.put( ObjectModelHelper.RESPONSE_OBJECT, new
CommandLineResponse() );
}
/**
1.5 +5 -4
xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
Index: HttpEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpEnvironment.java 4 Feb 2002 13:10:03 -0000 1.4
+++ HttpEnvironment.java 7 Feb 2002 08:59:17 -0000 1.5
@@ -57,6 +57,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.AbstractEnvironment;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Session;
@@ -70,7 +71,7 @@
/**
* @author ?
- * @version CVS $Id: HttpEnvironment.java,v 1.4 2002/02/04 13:10:03 cziegeler Exp $
+ * @version CVS $Id: HttpEnvironment.java,v 1.5 2002/02/07 08:59:17 cziegeler Exp $
*/
public class HttpEnvironment extends AbstractEnvironment implements Redirector {
@@ -110,9 +111,9 @@
this.response = new HttpResponse (res);
this.webcontext = context;
this.outputStream = response.getOutputStream();
- this.objectModel.put(Constants.REQUEST_OBJECT, this.request);
- this.objectModel.put(Constants.RESPONSE_OBJECT, this.response);
- this.objectModel.put(Constants.CONTEXT_OBJECT, this.webcontext);
+ this.objectModel.put(ObjectModelHelper.REQUEST_OBJECT, this.request);
+ this.objectModel.put(ObjectModelHelper.RESPONSE_OBJECT, this.response);
+ this.objectModel.put(ObjectModelHelper.CONTEXT_OBJECT, this.webcontext);
// This is a hack for the Php Generator
this.objectModel.put(HTTP_REQUEST_OBJECT, req);
this.objectModel.put(HTTP_RESPONSE_OBJECT, res);
1.6 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EnvironmentWrapper.java 4 Feb 2002 09:45:07 -0000 1.5
+++ EnvironmentWrapper.java 7 Feb 2002 08:59:17 -0000 1.6
@@ -55,9 +55,9 @@
package org.apache.cocoon.environment.wrapper;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.log.Logger;
@@ -77,7 +77,7 @@
* contains a <code>RequestWrapper</code> object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: EnvironmentWrapper.java,v 1.5 2002/02/04 09:45:07 cziegeler Exp $
+ * @version $Id: EnvironmentWrapper.java,v 1.6 2002/02/07 08:59:17 cziegeler Exp $
*/
public final class EnvironmentWrapper
extends AbstractEnvironment
@@ -133,9 +133,9 @@
key = (String)keys.next();
this.objectModel.put(key, oldObjectModel.get(key));
}
- this.request = new
RequestWrapper((Request)oldObjectModel.get(Constants.REQUEST_OBJECT),
+ this.request = new
RequestWrapper(ObjectModelHelper.getRequest(oldObjectModel),
requestURI, queryString, this);
- this.objectModel.put(Constants.REQUEST_OBJECT, this.request);
+ this.objectModel.put(ObjectModelHelper.REQUEST_OBJECT, this.request);
this.objectModel.put("Internal-Request", "true");
}
1.4 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Index: CocoonLogFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CocoonLogFormatter.java 4 Feb 2002 14:17:59 -0000 1.3
+++ CocoonLogFormatter.java 7 Feb 2002 08:59:17 -0000 1.4
@@ -56,7 +56,7 @@
package org.apache.cocoon.util.log;
import org.apache.avalon.framework.CascadingThrowable;
-import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.log.ContextMap;
import org.apache.log.LogEvent;
@@ -79,7 +79,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: CocoonLogFormatter.java,v 1.3 2002/02/04 14:17:59 cziegeler
Exp $
+ * @version CVS $Id: CocoonLogFormatter.java,v 1.4 2002/02/07 08:59:17 cziegeler
Exp $
*/
public class CocoonLogFormatter extends ExtensiblePatternFormatter
@@ -197,7 +197,7 @@
Object context = ctxMap.get("objectModel");
if (context != null && context instanceof Map) {
// Get the request
- Request request =
(Request)((Map)context).get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest((Map)context);
if (request != null) {
result = request.getRequestURI();
}
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java
Index: XMLCocoonLogFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLCocoonLogFormatter.java 4 Feb 2002 14:17:59 -0000 1.4
+++ XMLCocoonLogFormatter.java 7 Feb 2002 08:59:17 -0000 1.5
@@ -55,7 +55,7 @@
package org.apache.cocoon.util.log;
import org.apache.avalon.framework.CascadingThrowable;
-import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.log.ContextMap;
import org.apache.log.LogEvent;
@@ -97,7 +97,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: XMLCocoonLogFormatter.java,v 1.4 2002/02/04 14:17:59 cziegeler
Exp $
+ * @version CVS $Id: XMLCocoonLogFormatter.java,v 1.5 2002/02/07 08:59:17 cziegeler
Exp $
*/
public class XMLCocoonLogFormatter
implements Formatter {
@@ -237,7 +237,7 @@
Object context = ctxMap.get("objectModel");
if (context != null &&context instanceof Map) {
// Get the request
- Request request =
(Request)((Map)context).get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest((Map)context);
if (request != null) {
result = request.getRequestURI();
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
