cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation JXFormsGenerator.java TraxGenerator.java FlowVelocityGenerator.java JXTemplateGenerator.java
Date Wed, 07 May 2003 11:36:19 GMT
cziegeler    2003/05/07 04:36:19

  Modified:    src/scratchpad/src/org/apache/cocoon/generation
                        JXFormsGenerator.java TraxGenerator.java
                        FlowVelocityGenerator.java JXTemplateGenerator.java
  Log:
  Cleaning up imports
  
  Revision  Changes    Path
  1.15      +1 -2      cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXFormsGenerator.java
  
  Index: JXFormsGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXFormsGenerator.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JXFormsGenerator.java	7 May 2003 04:36:33 -0000	1.14
  +++ JXFormsGenerator.java	7 May 2003 11:36:18 -0000	1.15
  @@ -59,12 +59,11 @@
   
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.flow.Flow;
  +import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.jxforms.validation.Violation;
   import org.apache.cocoon.components.jxforms.xmlform.Form;
   import org.apache.cocoon.components.source.SourceUtil;
  -import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.transformation.AbstractTransformer;
   import org.apache.cocoon.xml.XMLConsumer;
  
  
  
  1.6       +1 -2      cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/TraxGenerator.java
  
  Index: TraxGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/TraxGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TraxGenerator.java	7 May 2003 04:36:34 -0000	1.5
  +++ TraxGenerator.java	7 May 2003 11:36:18 -0000	1.6
  @@ -62,11 +62,10 @@
   
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.flow.Flow;
  +import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.jxdom.DocumentAdapter;
   import org.apache.cocoon.environment.Context;
  -import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
  
  
  
  1.8       +16 -28    cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/FlowVelocityGenerator.java
  
  Index: FlowVelocityGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/FlowVelocityGenerator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FlowVelocityGenerator.java	7 May 2003 04:36:33 -0000	1.7
  +++ FlowVelocityGenerator.java	7 May 2003 11:36:18 -0000	1.8
  @@ -50,6 +50,14 @@
   */
   package org.apache.cocoon.generation;
   
  +import java.beans.PropertyDescriptor;
  +import java.io.BufferedReader;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.StringReader;
  +import java.io.StringWriter;
  +import java.util.*;
  +
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
  @@ -63,52 +71,32 @@
   import org.apache.cocoon.ResourceNotFoundException;
   import org.apache.cocoon.components.flow.Flow;
   import org.apache.cocoon.components.flow.WebContinuation;
  -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.SourceResolver;
   import org.apache.cocoon.environment.Session;
  +import org.apache.cocoon.environment.SourceResolver;
   import org.apache.commons.collections.ExtendedProperties;
   import org.apache.commons.jxpath.DynamicPropertyHandler;
   import org.apache.commons.jxpath.JXPathBeanInfo;
   import org.apache.commons.jxpath.JXPathIntrospector;
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.xml.sax.SAXParser;
  +import org.apache.velocity.VelocityContext;
   import org.apache.velocity.app.Velocity;
   import org.apache.velocity.app.VelocityEngine;
   import org.apache.velocity.context.Context;
  -import org.apache.velocity.VelocityContext;
   import org.apache.velocity.runtime.RuntimeServices;
   import org.apache.velocity.runtime.log.LogSystem;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.SAXParseException;
  -import org.mozilla.javascript.Scriptable;
  -import org.mozilla.javascript.Wrapper;
  -import org.mozilla.javascript.JavaScriptException;
  -import org.mozilla.javascript.ScriptableObject;
  -import org.mozilla.javascript.NativeArray;
  -import org.mozilla.javascript.Undefined;
  -import org.mozilla.javascript.ScriptRuntime;
  +import org.apache.velocity.util.introspection.Info;
   import org.apache.velocity.util.introspection.UberspectImpl;
   import org.apache.velocity.util.introspection.VelMethod;
   import org.apache.velocity.util.introspection.VelPropertyGet;
   import org.apache.velocity.util.introspection.VelPropertySet;
  -import org.apache.velocity.util.introspection.Info;
  -import java.beans.PropertyDescriptor;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.StringReader;
  -import java.io.BufferedReader;
  -import java.io.StringWriter;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Set;
  +import org.mozilla.javascript.*;
  +import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.SAXParseException;
   
   /**
    * <p>Cocoon {@link Generator} that produces dynamic XML SAX events
  
  
  
  1.9       +1 -2      cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXTemplateGenerator.java
  
  Index: JXTemplateGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXTemplateGenerator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JXTemplateGenerator.java	7 May 2003 04:36:34 -0000	1.8
  +++ JXTemplateGenerator.java	7 May 2003 11:36:18 -0000	1.9
  @@ -66,11 +66,10 @@
   
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.flow.Flow;
  +import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.flow.javascript.JavaScriptFlow;
   import org.apache.cocoon.components.source.SourceUtil;
  -import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Response;
  
  
  

Mime
View raw message