You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/06/24 18:59:28 UTC
cvs commit: cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/servlet GarbageServlet.java
cziegeler 2003/06/24 09:59:28
Modified: src/scratchpad/garbage/source/java/org/apache/garbage/tree
Evaluation.java TemplateVar.java Attribute.java
LocatedEvents.java LocatedEvent.java Tree.java
Events.java TemplateIf.java ElementStart.java
TemplateFor.java Event.java
src/scratchpad/garbage/source/java/org/apache/garbage/serializer
AbstractSerializer.java HTMLSerializer.java
XHTMLSerializer.java XMLSerializer.java
EncodingSerializer.java
src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom
FOM_JavaScriptInterpreter.java
FOM_JavaScriptFlowHelper.java FOM_Cocoon.java
src/scratchpad/src/org/apache/cocoon/generation
GarbageGenerator.java
src/java/org/apache/cocoon Main.java
src/scratchpad/garbage/source/java/org/apache/garbage/parser
Parser.java ParserTokenManager.java
src/scratchpad/garbage/source/java/org/apache/garbage
Processor.java
src/scratchpad/garbage/source/java/org/apache/garbage/servlet
GarbageServlet.java
Log:
Proper releasing of sources
Code formatting
Organizing imports
Revision Changes Path
1.2 +2 -2 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Evaluation.java
Index: Evaluation.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Evaluation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Evaluation.java 21 Jun 2003 21:11:53 -0000 1.1
+++ Evaluation.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,8 +47,8 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import org.xml.sax.SAXException;
import org.apache.commons.jxpath.JXPathContext;
+import org.xml.sax.SAXException;
/**
*
1.2 +3 -5 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/TemplateVar.java
Index: TemplateVar.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/TemplateVar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateVar.java 21 Jun 2003 21:11:53 -0000 1.1
+++ TemplateVar.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,12 +47,10 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.JXPathContext;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
/**
*
1.2 +3 -2 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Attribute.java
Index: Attribute.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Attribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Attribute.java 21 Jun 2003 21:11:53 -0000 1.1
+++ Attribute.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,8 +47,9 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import org.apache.commons.jxpath.JXPathContext;
import java.util.Iterator;
+
+import org.apache.commons.jxpath.JXPathContext;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.2 +1 -4 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/LocatedEvents.java
Index: LocatedEvents.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/LocatedEvents.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocatedEvents.java 21 Jun 2003 21:11:53 -0000 1.1
+++ LocatedEvents.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,10 +47,7 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import org.apache.commons.jxpath.JXPathContext;
-import java.util.Iterator;
import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
/**
*
1.2 +1 -2 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/LocatedEvent.java
Index: LocatedEvent.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/LocatedEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocatedEvent.java 21 Jun 2003 21:11:53 -0000 1.1
+++ LocatedEvent.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,7 +47,6 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import org.xml.sax.InputSource;
import org.xml.sax.Locator;
/**
1.2 +1 -3 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Tree.java
Index: Tree.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Tree.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tree.java 21 Jun 2003 21:11:53 -0000 1.1
+++ Tree.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,8 +47,6 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
/**
*
1.2 +1 -2 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Events.java
Index: Events.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Events.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Events.java 21 Jun 2003 21:11:53 -0000 1.1
+++ Events.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -48,7 +48,6 @@
package org.apache.garbage.tree;
import java.util.Iterator;
-import java.util.NoSuchElementException;
/**
*
1.2 +4 -3 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/TemplateIf.java
Index: TemplateIf.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/TemplateIf.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateIf.java 21 Jun 2003 21:11:53 -0000 1.1
+++ TemplateIf.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -49,11 +49,12 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
+
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
/**
*
1.2 +3 -3 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/ElementStart.java
Index: ElementStart.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/ElementStart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementStart.java 21 Jun 2003 21:11:53 -0000 1.1
+++ ElementStart.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,9 +47,9 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import org.apache.commons.jxpath.JXPathContext;
import java.util.ArrayList;
-import java.util.Iterator;
+
+import org.apache.commons.jxpath.JXPathContext;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.2 +4 -4 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/TemplateFor.java
Index: TemplateFor.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/TemplateFor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateFor.java 21 Jun 2003 21:11:53 -0000 1.1
+++ TemplateFor.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,13 +47,13 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import java.util.ArrayList;
import java.util.Iterator;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
+
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
/**
*
1.2 +2 -2 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Event.java
Index: Event.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/tree/Event.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Event.java 21 Jun 2003 21:11:53 -0000 1.1
+++ Event.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,8 +47,8 @@
* ============================================================================ */
package org.apache.garbage.tree;
-import org.xml.sax.SAXException;
import org.apache.commons.jxpath.JXPathContext;
+import org.xml.sax.SAXException;
/**
*
1.2 +1 -3 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/AbstractSerializer.java
Index: AbstractSerializer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/AbstractSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSerializer.java 21 Jun 2003 21:11:48 -0000 1.1
+++ AbstractSerializer.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -56,9 +56,7 @@
import org.apache.garbage.serializer.encoding.Charset;
import org.apache.garbage.serializer.encoding.CharsetFactory;
-import org.apache.garbage.serializer.util.DocType;
import org.apache.garbage.serializer.util.Namespaces;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.2 +1 -11 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/HTMLSerializer.java
Index: HTMLSerializer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/HTMLSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTMLSerializer.java 21 Jun 2003 21:11:48 -0000 1.1
+++ HTMLSerializer.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,17 +47,7 @@
* ============================================================================ */
package org.apache.garbage.serializer;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
import org.apache.garbage.serializer.util.DocType;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.2 +1 -11 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/XHTMLSerializer.java
Index: XHTMLSerializer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/XHTMLSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XHTMLSerializer.java 21 Jun 2003 21:11:48 -0000 1.1
+++ XHTMLSerializer.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,17 +47,7 @@
* ============================================================================ */
package org.apache.garbage.serializer;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
import org.apache.garbage.serializer.util.DocType;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.2 +1 -5 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/XMLSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLSerializer.java 21 Jun 2003 21:11:48 -0000 1.1
+++ XMLSerializer.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -48,15 +48,11 @@
package org.apache.garbage.serializer;
import java.io.CharArrayWriter;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
import org.apache.garbage.serializer.encoding.Encoder;
import org.apache.garbage.serializer.encoding.XMLEncoder;
import org.apache.garbage.serializer.util.DocType;
import org.apache.garbage.serializer.util.Namespaces;
-
import org.xml.sax.SAXException;
/**
1.2 +1 -4 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/EncodingSerializer.java
Index: EncodingSerializer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/serializer/EncodingSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EncodingSerializer.java 21 Jun 2003 21:11:48 -0000 1.1
+++ EncodingSerializer.java 24 Jun 2003 16:59:19 -0000 1.2
@@ -47,9 +47,6 @@
* ============================================================================ */
package org.apache.garbage.serializer;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
import org.apache.garbage.serializer.encoding.DefaultEncoder;
import org.apache.garbage.serializer.encoding.Encoder;
import org.xml.sax.SAXException;
1.4 +13 -23 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Index: FOM_JavaScriptInterpreter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FOM_JavaScriptInterpreter.java 23 Jun 2003 03:37:04 -0000 1.3
+++ FOM_JavaScriptInterpreter.java 24 Jun 2003 16:59:20 -0000 1.4
@@ -1,4 +1,4 @@
-/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/*
============================================================================
The Apache Software License, Version 1.1
@@ -42,14 +42,19 @@
(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 individuals
+ on behalf of the Apache Software Foundation and was originally created by
+ Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
+
*/
package org.apache.cocoon.components.flow.javascript.fom;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.Reader;
import java.io.OutputStream;
+import java.io.Reader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -60,12 +65,15 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.flow.AbstractInterpreter;
import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.flow.InvalidContinuationException;
import org.apache.cocoon.components.flow.WebContinuation;
+import org.apache.cocoon.components.flow.javascript.JSErrorReporter;
+import org.apache.cocoon.components.flow.javascript.ScriptablePointerFactory;
+import org.apache.cocoon.components.flow.javascript.ScriptablePropertyHandler;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -73,28 +81,10 @@
import org.apache.commons.jxpath.JXPathIntrospector;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
import org.apache.excalibur.source.Source;
-
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.EcmaError;
-import org.mozilla.javascript.EvaluatorException;
-import org.mozilla.javascript.Function;
-import org.mozilla.javascript.JavaScriptException;
-import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.PropertyException;
-import org.mozilla.javascript.Script;
-import org.mozilla.javascript.ScriptRuntime;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
-import org.mozilla.javascript.Wrapper;
+import org.mozilla.javascript.*;
import org.mozilla.javascript.continuations.Continuation;
import org.mozilla.javascript.tools.ToolErrorReporter;
import org.mozilla.javascript.tools.shell.Global;
-
-import org.apache.cocoon.components.flow.javascript.JSErrorReporter;
-import org.apache.cocoon.components.flow.javascript.JavaScriptFlow;
-import org.apache.cocoon.components.flow.javascript.ScriptablePointer;
-import org.apache.cocoon.components.flow.javascript.ScriptablePropertyHandler;
-import org.apache.cocoon.components.flow.javascript.ScriptablePointerFactory;
/**
* Interface with the JavaScript interpreter.
*
1.2 +6 -1 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java
Index: FOM_JavaScriptFlowHelper.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FOM_JavaScriptFlowHelper.java 23 Jun 2003 03:37:04 -0000 1.1
+++ FOM_JavaScriptFlowHelper.java 24 Jun 2003 16:59:20 -0000 1.2
@@ -1,4 +1,4 @@
-/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/*
============================================================================
The Apache Software License, Version 1.1
@@ -41,6 +41,11 @@
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 individuals
+ on behalf of the Apache Software Foundation and was originally created by
+ Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.components.flow.javascript.fom;
1.5 +19 -15 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Index: FOM_Cocoon.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FOM_Cocoon.java 23 Jun 2003 03:37:04 -0000 1.4
+++ FOM_Cocoon.java 24 Jun 2003 16:59:20 -0000 1.5
@@ -1,4 +1,4 @@
-/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/*
============================================================================
The Apache Software License, Version 1.1
@@ -42,28 +42,32 @@
(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 individuals
+ on behalf of the Apache Software Foundation and was originally created by
+ Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
+
*/
package org.apache.cocoon.components.flow.javascript.fom;
+import java.io.OutputStream;
+import java.util.Map;
+
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.cocoon.components.flow.ContinuationsManager;
+import org.apache.cocoon.components.flow.WebContinuation;
+import org.apache.cocoon.environment.Cookie;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.Session;
import org.mozilla.javascript.JavaScriptException;
import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.Function;
import org.mozilla.javascript.ScriptableObject;
-import org.mozilla.javascript.Context;
import org.mozilla.javascript.Undefined;
import org.mozilla.javascript.Wrapper;
import org.mozilla.javascript.continuations.Continuation;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.Cookie;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.components.flow.WebContinuation;
-import org.apache.cocoon.components.flow.ContinuationsManager;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.logger.Logger;
-import java.util.Map;
-import java.io.OutputStream;
/**
* Implementation of FOM (Flow Object Model)
*/
1.3 +26 -29 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/GarbageGenerator.java
Index: GarbageGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/GarbageGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GarbageGenerator.java 23 Jun 2003 03:38:24 -0000 1.2
+++ GarbageGenerator.java 24 Jun 2003 16:59:24 -0000 1.3
@@ -1,4 +1,4 @@
-/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/*
============================================================================
The Apache Software License, Version 1.1
@@ -49,50 +49,51 @@
*/
package org.apache.cocoon.generation;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.flow.WebContinuation;
import org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
import org.apache.cocoon.components.source.SourceUtil;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.transformation.AbstractTransformer;
-import org.apache.cocoon.xml.XMLConsumer;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Variables;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.garbage.Processor;
import org.apache.garbage.parser.Parser;
import org.apache.garbage.tree.Tree;
import org.apache.garbage.tree.TreeException;
-import org.apache.garbage.Processor;
-import org.apache.garbage.Processor;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
-import org.apache.cocoon.ProcessingException;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
public class GarbageGenerator extends ComposerGenerator {
- private XMLConsumer consumer;
- private JXPathContext jxpathContext;
- private static Map cache = new HashMap();
- private Source source;
+ // FIXME - We should not use a static variable here: use a component instead
+ protected static Map cache = new HashMap();
+
+ protected JXPathContext jxpathContext;
+ protected Source source;
+ /**
+ * Recyclable
+ */
public void recycle() {
+ if ( this.source != null ) {
+ this.resolver.release( this.source );
+ this.source = null;
+ }
super.recycle();
- consumer = null;
- jxpathContext = null;
- source = null;
+ this.jxpathContext = null;
}
- private static class CacheEntry {
+ protected static class CacheEntry {
Tree tree;
long compileTime;
}
@@ -128,7 +129,7 @@
parameters);
}
- private void setContext(Object contextObject,
+ protected void setContext(Object contextObject,
WebContinuation kont,
Object request,
Object response,
@@ -146,12 +147,8 @@
varScope.declareVariable("parameters", parameters);
}
- public void setConsumer(XMLConsumer consumer) {
- this.consumer = consumer;
- }
-
public void generate()
- throws IOException, SAXException, ProcessingException {
+ throws IOException, SAXException, ProcessingException {
try {
CacheEntry t;
synchronized (cache) {
@@ -168,7 +165,7 @@
cache.put(source.getURI(), t);
}
}
- new Processor(consumer, consumer).process(t.tree, jxpathContext);
+ new Processor(this.xmlConsumer, this.xmlConsumer).process(t.tree, jxpathContext);
} catch (TreeException exc) {
throw new SAXParseException(exc.getMessage(), exc, exc);
}
1.7 +3 -2 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Main.java 24 Jun 2003 16:44:33 -0000 1.6
+++ Main.java 24 Jun 2003 16:59:24 -0000 1.7
@@ -47,7 +47,8 @@
Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
-*/package org.apache.cocoon;
+*/
+package org.apache.cocoon;
import java.io.BufferedReader;
import java.io.FileReader;
1.2 +2 -18 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/parser/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/parser/Parser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Parser.java 21 Jun 2003 21:11:48 -0000 1.1
+++ Parser.java 24 Jun 2003 16:59:24 -0000 1.2
@@ -55,24 +55,8 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
-import java.util.Iterator;
-
-import org.apache.garbage.tree.Attribute;
-import org.apache.garbage.tree.CData;
-import org.apache.garbage.tree.Characters;
-import org.apache.garbage.tree.Comment;
-import org.apache.garbage.tree.DocType;
-import org.apache.garbage.tree.ElementEnd;
-import org.apache.garbage.tree.ElementStart;
-import org.apache.garbage.tree.Events;
-import org.apache.garbage.tree.Expression;
-import org.apache.garbage.tree.ProcessingInstruction;
-import org.apache.garbage.tree.TemplateFor;
-import org.apache.garbage.tree.TemplateIf;
-import org.apache.garbage.tree.TemplateVar;
-import org.apache.garbage.tree.Tree;
-import org.apache.garbage.tree.TreeException;
+import org.apache.garbage.tree.*;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -222,7 +206,7 @@
}
int expected[][] = new int[kind.length][1];
for (int x = 0; x < kind.length; x++) expected[x][0] = kind[x];
- throw new ParseException(prev_token, expected, this.tokenImage);
+ throw new ParseException(prev_token, expected, tokenImage);
}
/**
1.2 +0 -26 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/parser/ParserTokenManager.java
Index: ParserTokenManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/parser/ParserTokenManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParserTokenManager.java 21 Jun 2003 21:11:48 -0000 1.1
+++ ParserTokenManager.java 24 Jun 2003 16:59:24 -0000 1.2
@@ -48,32 +48,6 @@
* ============================================================================ */
package org.apache.garbage.parser;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.util.Iterator;
-import org.apache.garbage.tree.Attribute;
-import org.apache.garbage.tree.CData;
-import org.apache.garbage.tree.Characters;
-import org.apache.garbage.tree.Comment;
-import org.apache.garbage.tree.DocType;
-import org.apache.garbage.tree.ElementEnd;
-import org.apache.garbage.tree.ElementStart;
-import org.apache.garbage.tree.Events;
-import org.apache.garbage.tree.Expression;
-import org.apache.garbage.tree.ProcessingInstruction;
-import org.apache.garbage.tree.TemplateFor;
-import org.apache.garbage.tree.TemplateIf;
-import org.apache.garbage.tree.TemplateVar;
-import org.apache.garbage.tree.Tree;
-import org.apache.garbage.tree.TreeException;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
public class ParserTokenManager implements ParserConstants
{
1.2 +2 -2 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/Processor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Processor.java 21 Jun 2003 21:11:48 -0000 1.1
+++ Processor.java 24 Jun 2003 16:59:27 -0000 1.2
@@ -48,7 +48,7 @@
package org.apache.garbage;
import java.util.Iterator;
-import java.util.List;
+
import org.apache.commons.jxpath.JXPathContext;
import org.apache.garbage.serializer.Serializer;
import org.apache.garbage.tree.Event;
1.2 +2 -2 cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/servlet/GarbageServlet.java
Index: GarbageServlet.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/garbage/source/java/org/apache/garbage/servlet/GarbageServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GarbageServlet.java 21 Jun 2003 21:11:53 -0000 1.1
+++ GarbageServlet.java 24 Jun 2003 16:59:28 -0000 1.2
@@ -108,7 +108,7 @@
if (req.getPathInfo() != null) resource += req.getPathInfo();
URL url = this.getServletContext().getResource(resource);
if (url == null) {
- res.sendError(res.SC_NOT_FOUND, "Unable to locate template \""
+ res.sendError(HttpServletResponse.SC_NOT_FOUND, "Unable to locate template \""
+ resource + "\" in application context.");
return;
}