cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/url URLFactory.java URLFactoryImpl.java
Date Thu, 05 Dec 2002 10:17:31 GMT
cziegeler    2002/12/05 02:17:31

  Modified:    src/java/org/apache/cocoon/components/validation
                        ZTestBean.java Violation.java SchemaFactory.java
                        ZValidationTest.java
               src/java/org/apache/cocoon/components/source/impl
                        AvalonToCocoonSource.java SitemapSource.java
                        URLFactoryWrapper.java
                        DelayedRefreshSourceWrapper.java FileSource.java
                        SourceFactoryWrapper.java
               src/java/org/apache/cocoon/components/source FileSource.java
                        XMLDBSourceFactory.java SourceUtil.java
                        DelayedRefreshSourceWrapper.java
                        SourceHandlerImpl.java XMLDBSource.java
               src/java/org/apache/cocoon/components/store
                        JispFilesystemStore.java
               src/java/org/apache/cocoon/components/validation/schematron
                        ActivePattern.java ValidationResult.java
                        SchematronFactory.java Rule.java
                        SchematronValidator.java Pattern.java
                        SchematronSchema.java Phase.java
               src/java/org/apache/cocoon/components/treeprocessor
                        AbstractProcessingNode.java
                        AbstractParentProcessingNode.java
                        AbstractParentProcessingNodeBuilder.java
                        AbstractProcessingNodeBuilder.java
               src/java/org/apache/cocoon/components/xslt
                        XSLTProcessorImpl.java
               src/java/org/apache/cocoon/components/url URLFactory.java
                        URLFactoryImpl.java
  Log:
  Removing unused imports
  
  Revision  Changes    Path
  1.2       +0 -1      xml-cocoon2/src/java/org/apache/cocoon/components/validation/ZTestBean.java
  
  Index: ZTestBean.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/ZTestBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ZTestBean.java	20 May 2002 07:19:25 -0000	1.1
  +++ ZTestBean.java	5 Dec 2002 10:17:29 -0000	1.2
  @@ -1,6 +1,5 @@
   package org.apache.cocoon.components.validation;
   
  -import java.util.List;
   import java.util.ArrayList;
   
     /**
  
  
  
  1.2       +4 -4      xml-cocoon2/src/java/org/apache/cocoon/components/validation/Violation.java
  
  Index: Violation.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/Violation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Violation.java	20 May 2002 07:19:25 -0000	1.1
  +++ Violation.java	5 Dec 2002 10:17:29 -0000	1.2
  @@ -69,7 +69,7 @@
    * 
    * @author  ivelin@apache.org
    */
  -public class Violation implements java.lang.Comparable
  +public class Violation implements Comparable
   {
     
       /** 
  
  
  
  1.2       +2 -5      xml-cocoon2/src/java/org/apache/cocoon/components/validation/SchemaFactory.java
  
  Index: SchemaFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/SchemaFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SchemaFactory.java	20 May 2002 07:19:24 -0000	1.1
  +++ SchemaFactory.java	5 Dec 2002 10:17:29 -0000	1.2
  @@ -62,9 +62,6 @@
   
   package org.apache.cocoon.components.validation;
   
  -import java.io.IOException;
  -
  -import org.xml.sax.SAXParseException;
   import org.xml.sax.InputSource;
   
   /**
  
  
  
  1.3       +8 -27     xml-cocoon2/src/java/org/apache/cocoon/components/validation/ZValidationTest.java
  
  Index: ZValidationTest.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/ZValidationTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ZValidationTest.java	2 Jun 2002 03:53:37 -0000	1.2
  +++ ZValidationTest.java	5 Dec 2002 10:17:29 -0000	1.3
  @@ -63,32 +63,13 @@
   
   package org.apache.cocoon.components.validation;
   
  -// Java classes
  -import java.util.Iterator;
  -import java.util.List;
  -import java.io.InputStream;
  -import java.io.FileInputStream;
  -import java.io.File;
  -
  -// XML classes
  -import javax.xml.transform.stream.StreamSource;
  -import javax.xml.transform.TransformerException;
  -
   import org.xml.sax.InputSource;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.NodeList;
  -
  -// java classes 
  -import java.util.Properties;
   
  -import org.apache.cocoon.components.validation.SchemaFactory;
  -import org.apache.cocoon.components.validation.Schema;
  -import org.apache.cocoon.components.validation.Validator;
  -import org.apache.cocoon.components.validation.Violation;
  -
  -
  -
  -import org.apache.cocoon.components.validation.ZTestBean;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.InputStream;
  +import java.util.Iterator;
  +import java.util.List;
   
   /**
    * 
  
  
  
  1.8       +7 -7      xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSource.java
  
  Index: AvalonToCocoonSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/AvalonToCocoonSource.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AvalonToCocoonSource.java	13 Jun 2002 09:28:15 -0000	1.7
  +++ AvalonToCocoonSource.java	5 Dec 2002 10:17:29 -0000	1.8
  @@ -50,19 +50,19 @@
   */
   package org.apache.cocoon.components.source.impl;
   
  -import java.io.IOException;
  -import java.io.InputStream;
  -import org.apache.avalon.excalibur.xml.XMLizable;
  -import org.apache.excalibur.source.*;
  -import org.apache.excalibur.source.impl.validity.FileTimeStampValidity;
  -import org.apache.excalibur.source.impl.validity.TimeStampValidity;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.ModifiableSource;
  +import org.apache.excalibur.source.Source;
  +import org.apache.excalibur.source.SourceException;
  +import org.apache.excalibur.source.SourceResolver;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  +
  +import java.io.IOException;
  +import java.io.InputStream;
   
   /**
    * This source objects wraps an Avalon Excalibur Source to get
  
  
  
  1.28      +2 -2      xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
  
  Index: SitemapSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- SitemapSource.java	4 Dec 2002 11:06:44 -0000	1.27
  +++ SitemapSource.java	5 Dec 2002 10:17:29 -0000	1.28
  @@ -73,10 +73,10 @@
   import org.apache.excalibur.source.impl.validity.AggregatedValidity;
   import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
  -import org.xml.sax.InputSource;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
  +
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
   import java.io.IOException;
  
  
  
  1.4       +10 -16    xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/URLFactoryWrapper.java
  
  Index: URLFactoryWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/URLFactoryWrapper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- URLFactoryWrapper.java	12 Sep 2002 06:16:43 -0000	1.3
  +++ URLFactoryWrapper.java	5 Dec 2002 10:17:29 -0000	1.4
  @@ -50,17 +50,7 @@
   */
   package org.apache.cocoon.components.source.impl;
   
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.net.URL;
  -import java.util.Map;
  -
  -import org.apache.excalibur.source.Source;
  -import org.apache.excalibur.source.SourceFactory;
  -import org.apache.excalibur.source.impl.URLSource;
  -
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -73,12 +63,16 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.CocoonComponentManager;
  -import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.components.url.URLFactory;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.excalibur.source.Source;
  +import org.apache.excalibur.source.SourceFactory;
  +import org.apache.excalibur.source.impl.URLSource;
  +
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.net.URL;
  +import java.util.Map;
   
   /**
    * This class wraps a Cocoon URLFactory and makes it
  
  
  
  1.2       +3 -6      xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/DelayedRefreshSourceWrapper.java
  
  Index: DelayedRefreshSourceWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/DelayedRefreshSourceWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DelayedRefreshSourceWrapper.java	13 Jun 2002 09:28:15 -0000	1.1
  +++ DelayedRefreshSourceWrapper.java	5 Dec 2002 10:17:29 -0000	1.2
  @@ -50,17 +50,14 @@
   */
   package org.apache.cocoon.components.source.impl;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceValidity;
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -import org.apache.cocoon.ProcessingException;
  -import org.xml.sax.InputSource;
  +
   import java.io.IOException;
   import java.io.InputStream;
   import java.util.Iterator;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
   
   /**
    * A wrapper around a <code>Source</code> that reduces the number of calls
to
  
  
  
  1.8       +4 -6      xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/FileSource.java
  
  Index: FileSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/FileSource.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FileSource.java	12 Sep 2002 06:16:43 -0000	1.7
  +++ FileSource.java	5 Dec 2002 10:17:29 -0000	1.8
  @@ -54,17 +54,15 @@
    */
   package org.apache.cocoon.components.source.impl;
   
  +import org.apache.cocoon.components.source.WriteableSource;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.impl.URLSource;
  -import org.apache.cocoon.components.source.WriteableSource;
  +
   import java.io.File;
  -import java.io.FileInputStream;
   import java.io.FileOutputStream;
  -import java.io.FilterOutputStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.io.OutputStream;
  -import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.ConcurrentModificationException;
   import java.util.Map;
  
  
  
  1.6       +7 -10     xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SourceFactoryWrapper.java
  
  Index: SourceFactoryWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SourceFactoryWrapper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SourceFactoryWrapper.java	13 Sep 2002 07:30:51 -0000	1.5
  +++ SourceFactoryWrapper.java	5 Dec 2002 10:17:29 -0000	1.6
  @@ -50,15 +50,7 @@
   */
   package org.apache.cocoon.components.source.impl;
   
  -import java.io.IOException;
  -import java.net.MalformedURLException;
  -import java.util.Map;
  -
  -import org.apache.excalibur.source.Source;
  -import org.apache.excalibur.source.SourceFactory;
  -
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -71,12 +63,17 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -
   import org.apache.cocoon.CascadingIOException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.CocoonComponentManager;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.util.ClassUtils;
  +import org.apache.excalibur.source.Source;
  +import org.apache.excalibur.source.SourceFactory;
  +
  +import java.io.IOException;
  +import java.net.MalformedURLException;
  +import java.util.Map;
   
   /**
    * This class wraps a Cocoon SourceFactory and makes it
  
  
  
  1.6       +2 -12     xml-cocoon2/src/java/org/apache/cocoon/components/source/FileSource.java
  
  Index: FileSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/FileSource.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FileSource.java	21 Sep 2002 02:23:52 -0000	1.5
  +++ FileSource.java	5 Dec 2002 10:17:29 -0000	1.6
  @@ -55,21 +55,11 @@
   package org.apache.cocoon.components.source;
   
   import org.apache.avalon.framework.component.ComponentManager;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
   
  -import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.FileNotFoundException;
  -import java.io.FileOutputStream;
  -import java.io.FilterOutputStream;
  -import java.io.InputStream;
  -import java.io.IOException;
  -import java.io.OutputStream;
  -
  +import java.io.*;
   import java.net.MalformedURLException;
  -
   import java.util.ConcurrentModificationException;
   
   /**
  
  
  
  1.7       +1 -5      xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSourceFactory.java
  
  Index: XMLDBSourceFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSourceFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLDBSourceFactory.java	12 Sep 2002 06:16:43 -0000	1.6
  +++ XMLDBSourceFactory.java	5 Dec 2002 10:17:29 -0000	1.7
  @@ -56,18 +56,14 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.sitemap.Sitemap;
   
   import java.io.IOException;
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
   
   /**
    * This class implements the xmldb:// pseudo-protocol and allows to get XML
  
  
  
  1.10      +1 -6      xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceUtil.java
  
  Index: SourceUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceUtil.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SourceUtil.java	9 Oct 2002 07:18:57 -0000	1.9
  +++ SourceUtil.java	5 Dec 2002 10:17:29 -0000	1.10
  @@ -52,13 +52,9 @@
   
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentSelector;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.environment.ObjectModelHelper;
  -import org.apache.cocoon.environment.Request;
  -import org.apache.cocoon.serialization.Serializer;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
   import org.apache.cocoon.xml.XMLUtils;
   import org.apache.cocoon.xml.dom.DOMBuilder;
  @@ -77,7 +73,6 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.DefaultHandler;
   
  -import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.util.Iterator;
  
  
  
  1.7       +6 -6      xml-cocoon2/src/java/org/apache/cocoon/components/source/DelayedRefreshSourceWrapper.java
  
  Index: DelayedRefreshSourceWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/DelayedRefreshSourceWrapper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DelayedRefreshSourceWrapper.java	6 Jun 2002 14:28:13 -0000	1.6
  +++ DelayedRefreshSourceWrapper.java	5 Dec 2002 10:17:29 -0000	1.7
  @@ -50,16 +50,16 @@
   */
   package org.apache.cocoon.components.source;
   
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.ModifiableSource;
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.environment.ModifiableSource;
  +import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.xml.XMLizable;
  +import org.xml.sax.ContentHandler;
   import org.xml.sax.InputSource;
  +import org.xml.sax.SAXException;
  +
   import java.io.IOException;
   import java.io.InputStream;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
   
   /**
    * A wrapper around a <code>Source</code> that reduces the number of calls
to
  
  
  
  1.12      +1 -4      xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceHandlerImpl.java
  
  Index: SourceHandlerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceHandlerImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SourceHandlerImpl.java	12 Sep 2002 06:16:43 -0000	1.11
  +++ SourceHandlerImpl.java	5 Dec 2002 10:17:29 -0000	1.12
  @@ -51,7 +51,6 @@
   package org.apache.cocoon.components.source;
   
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -63,8 +62,6 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.framework.thread.ThreadSafe;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.url.URLFactory;
   import org.apache.cocoon.environment.Environment;
  
  
  
  1.10      +7 -25     xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java
  
  Index: XMLDBSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XMLDBSource.java	12 Sep 2002 06:16:43 -0000	1.9
  +++ XMLDBSource.java	5 Dec 2002 10:17:29 -0000	1.10
  @@ -50,41 +50,23 @@
   */
   package org.apache.cocoon.components.source;
   
  -import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.logger.Logger;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.xml.IncludeXMLConsumer;
   import org.apache.cocoon.environment.Environment;
  -import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.environment.ModifiableSource;
  -import org.apache.cocoon.serialization.Serializer;
  -
  +import org.apache.cocoon.xml.IncludeXMLConsumer;
  +import org.xml.sax.ContentHandler;
  +import org.xml.sax.SAXException;
  +import org.xml.sax.helpers.AttributesImpl;
   import org.xmldb.api.DatabaseManager;
   import org.xmldb.api.base.Collection;
   import org.xmldb.api.base.Database;
  -import org.xmldb.api.base.ErrorCodes;
  -import org.xmldb.api.base.Resource;
  -import org.xmldb.api.base.Service;
  -import org.xmldb.api.base.XMLDBException;
  -import org.xmldb.api.base.ResourceSet;
   import org.xmldb.api.base.ResourceIterator;
  +import org.xmldb.api.base.ResourceSet;
  +import org.xmldb.api.base.XMLDBException;
   import org.xmldb.api.modules.XMLResource;
   import org.xmldb.api.modules.XPathQueryService;
  -
  -import org.xml.sax.InputSource;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.ByteArrayInputStream;
  -import java.net.MalformedURLException;
  -import java.net.URL;
   
   /**
    * This class implements the xmldb:// pseudo-protocol and allows to get XML
  
  
  
  1.9       +7 -9      xml-cocoon2/src/java/org/apache/cocoon/components/store/JispFilesystemStore.java
  
  Index: JispFilesystemStore.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/JispFilesystemStore.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JispFilesystemStore.java	23 Sep 2002 11:33:20 -0000	1.8
  +++ JispFilesystemStore.java	5 Dec 2002 10:17:30 -0000	1.9
  @@ -50,6 +50,12 @@
   */
   package org.apache.cocoon.components.store;
   
  +import com.coyotegulch.jisp.BTreeIndex;
  +import com.coyotegulch.jisp.BTreeObjectIterator;
  +import com.coyotegulch.jisp.IndexedObjectDatabase;
  +import com.coyotegulch.jisp.KeyNotFound;
  +import com.coyotegulch.jisp.KeyObject;
  +
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  @@ -60,20 +66,12 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.Constants;
  -
   import org.apache.cocoon.util.IOUtils;
   
  -import com.coyotegulch.jisp.BTreeIndex;
  -import com.coyotegulch.jisp.BTreeObjectIterator;
  -import com.coyotegulch.jisp.IndexedObjectDatabase;
  -import com.coyotegulch.jisp.KeyNotFound;
  -import com.coyotegulch.jisp.KeyObject;
  -
   import java.io.File;
   import java.io.IOException;
   import java.io.Serializable;
   import java.util.Enumeration;
  -import java.util.Vector;
   
   /**
    * This store is based on the Jisp library
  
  
  
  1.2       +2 -8      xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/ActivePattern.java
  
  Index: ActivePattern.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/ActivePattern.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ActivePattern.java	20 May 2002 07:19:25 -0000	1.1
  +++ ActivePattern.java	5 Dec 2002 10:17:30 -0000	1.2
  @@ -62,12 +62,6 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.util.List;
  -import java.util.ArrayList;
  -import java.util.Collection;
  -import java.util.Collections;
  -
  -
   /**
    * Represents a Schematron phase 
    * <active pattern="some"> element
  
  
  
  1.4       +7 -9      xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/ValidationResult.java
  
  Index: ValidationResult.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/ValidationResult.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ValidationResult.java	25 Jun 2002 13:35:07 -0000	1.3
  +++ ValidationResult.java	5 Dec 2002 10:17:30 -0000	1.4
  @@ -62,15 +62,13 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.util.Iterator;
  -import java.util.List;
  +import org.apache.cocoon.components.validation.Violation;
  +
   import java.util.ArrayList;
   import java.util.Collection;
  -import java.util.Collections;
  -import java.util.List;
  +import java.util.Iterator;
   import java.util.LinkedList;
  -
  -import org.apache.cocoon.components.validation.Violation;
  +import java.util.List;
   
   /**
    * Represents the result of a Schematron validation process
  
  
  
  1.9       +12 -28    xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/SchematronFactory.java
  
  Index: SchematronFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/SchematronFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SchematronFactory.java	21 Nov 2002 18:18:49 -0000	1.8
  +++ SchematronFactory.java	5 Dec 2002 10:17:30 -0000	1.9
  @@ -62,35 +62,19 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.io.OutputStreamWriter;
  -import java.io.InputStream;
  -
  -// java classes
  -import java.util.Properties;
  -import java.util.List;
  -import java.io.IOException;
  -import java.net.URL;
  -
  -// XML classes
  -import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.parsers.DocumentBuilder;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.Document;
  -import org.xml.sax.InputSource;
  -
  -// logger
  +import org.apache.avalon.framework.CascadingRuntimeException;
  +import org.apache.cocoon.components.validation.Schema;
  +import org.apache.cocoon.components.validation.SchemaFactory;
  +import org.apache.commons.jxpath.JXPathContext;
   import org.apache.log.Hierarchy;
   import org.apache.log.Logger;
   import org.apache.log.Priority;
  +import org.w3c.dom.Document;
  +import org.w3c.dom.Element;
  +import org.xml.sax.InputSource;
   
  -// JXPath classes
  -import org.apache.commons.jxpath.JXPathContext;
  -
  -// Cocoon classes
  -import org.apache.avalon.framework.CascadingRuntimeException;
  -import org.apache.cocoon.components.validation.SchemaFactory;
  -import org.apache.cocoon.components.validation.Schema;
  +import javax.xml.parsers.DocumentBuilder;
  +import javax.xml.parsers.DocumentBuilderFactory;
   
   
   /**
  
  
  
  1.2       +3 -3      xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/Rule.java
  
  Index: Rule.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/Rule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Rule.java	20 May 2002 07:19:25 -0000	1.1
  +++ Rule.java	5 Dec 2002 10:17:30 -0000	1.2
  @@ -62,9 +62,9 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.util.List;
   import java.util.ArrayList;
   import java.util.Collection;
  +import java.util.List;
   
   /**
    * Represents a Schematron rule element 
  
  
  
  1.5       +11 -36    xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/SchematronValidator.java
  
  Index: SchematronValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/SchematronValidator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SchematronValidator.java	20 Nov 2002 12:18:32 -0000	1.4
  +++ SchematronValidator.java	5 Dec 2002 10:17:30 -0000	1.5
  @@ -63,43 +63,18 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.io.OutputStreamWriter;
  -import java.io.InputStream;
  -
  -// java classes
  -import java.util.Properties;
  -import java.util.List;
  -import java.util.ArrayList;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.SortedSet;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.FileInputStream;
  -import java.io.File;
  -import java.net.URL;
  -
  - 
  -// XML classes
  -import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.parsers.DocumentBuilder;
  -import org.w3c.dom.Node;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.Document;
  -import org.xml.sax.InputSource;
  -
  -// logger
  +import org.apache.cocoon.components.validation.Validator;
  +import org.apache.commons.jxpath.JXPathContext;
  +import org.apache.commons.jxpath.Pointer;
   import org.apache.log.Hierarchy;
   import org.apache.log.Logger;
   import org.apache.log.Priority;
   
  -// JXPath classes
  -import org.apache.commons.jxpath.JXPathContext;
  -import org.apache.commons.jxpath.Pointer;
  -
  -// Cocoon classes
  -import org.apache.cocoon.components.validation.Validator;
  +import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
   
   /**
    * An object representing a single Schematron schema, used to validate
  
  
  
  1.2       +3 -4      xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/Pattern.java
  
  Index: Pattern.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/Pattern.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Pattern.java	20 May 2002 07:19:25 -0000	1.1
  +++ Pattern.java	5 Dec 2002 10:17:30 -0000	1.2
  @@ -62,10 +62,9 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.util.List;
   import java.util.ArrayList;
   import java.util.Collection;
  -import java.util.Collections;
  +import java.util.List;
   
   
   /**
  
  
  
  1.2       +7 -7      xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/SchematronSchema.java
  
  Index: SchematronSchema.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/SchematronSchema.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SchematronSchema.java	20 May 2002 07:19:25 -0000	1.1
  +++ SchematronSchema.java	5 Dec 2002 10:17:30 -0000	1.2
  @@ -62,12 +62,12 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.util.List;
  -import java.util.ArrayList;
  -import java.util.Collection;
  -
   import org.apache.cocoon.components.validation.Schema;
   import org.apache.cocoon.components.validation.Validator;
  +
  +import java.util.ArrayList;
  +import java.util.Collection;
  +import java.util.List;
   
   
   /**
  
  
  
  1.2       +3 -4      xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/Phase.java
  
  Index: Phase.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/validation/schematron/Phase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Phase.java	20 May 2002 07:19:25 -0000	1.1
  +++ Phase.java	5 Dec 2002 10:17:30 -0000	1.2
  @@ -62,10 +62,9 @@
   
   package org.apache.cocoon.components.validation.schematron;
   
  -import java.util.List;
   import java.util.ArrayList;
   import java.util.Collection;
  -import java.util.Collections;
  +import java.util.List;
   
   
   /**
  
  
  
  1.3       +1 -2      xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNode.java
  
  Index: AbstractProcessingNode.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNode.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractProcessingNode.java	31 Jul 2002 13:13:26 -0000	1.2
  +++ AbstractProcessingNode.java	5 Dec 2002 10:17:30 -0000	1.3
  @@ -51,7 +51,6 @@
   package org.apache.cocoon.components.treeprocessor;
   
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -
   import org.apache.cocoon.environment.SourceResolver;
   
   import java.util.Map;
  
  
  
  1.6       +1 -2      xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java
  
  Index: AbstractParentProcessingNode.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractParentProcessingNode.java	12 Oct 2002 05:11:39 -0000	1.5
  +++ AbstractParentProcessingNode.java	5 Dec 2002 10:17:30 -0000	1.6
  @@ -52,7 +52,6 @@
   
   import org.apache.cocoon.environment.Environment;
   
  -import java.util.List;
   import java.util.Map;
   
   /**
  
  
  
  1.4       +5 -3      xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNodeBuilder.java
  
  Index: AbstractParentProcessingNodeBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNodeBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractParentProcessingNodeBuilder.java	11 Sep 2002 10:08:36 -0000	1.3
  +++ AbstractParentProcessingNodeBuilder.java	5 Dec 2002 10:17:30 -0000	1.4
  @@ -53,10 +53,12 @@
   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.util.StringUtils;
   
  -import java.util.*;
  +import java.util.ArrayList;
  +import java.util.Arrays;
  +import java.util.Collection;
  +import java.util.List;
   
   /**
    * Base class for parent <code>ProcessingNodeBuilders</code>, providing services
for parsing
  
  
  
  1.8       +5 -10     xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java
  
  Index: AbstractProcessingNodeBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractProcessingNodeBuilder.java	11 Sep 2002 10:08:36 -0000	1.7
  +++ AbstractProcessingNodeBuilder.java	5 Dec 2002 10:17:30 -0000	1.8
  @@ -50,22 +50,17 @@
   */
   package org.apache.cocoon.components.treeprocessor;
   
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -
  -import org.apache.avalon.framework.component.Recomposable;
  -import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.component.Recomposable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -
  -import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
  -
   import org.apache.cocoon.sitemap.PatternException;
   
  -import java.util.Map;
   import java.util.HashMap;
  +import java.util.Map;
   
   /**
    *
  
  
  
  1.27      +10 -19    xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
  
  Index: XSLTProcessorImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- XSLTProcessorImpl.java	27 Sep 2002 16:27:38 -0000	1.26
  +++ XSLTProcessorImpl.java	5 Dec 2002 10:17:31 -0000	1.27
  @@ -50,41 +50,32 @@
   */
   package org.apache.cocoon.components.xslt;
   
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.parameters.Parameterizable;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.parameters.ParameterException;
  +import org.apache.avalon.framework.parameters.Parameterizable;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.util.ClassUtils;
  +import org.apache.cocoon.util.TraxErrorHandler;
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceResolver;
  -
  -import org.apache.cocoon.ResourceNotFoundException;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.excalibur.store.Store;
  -import org.apache.cocoon.util.ClassUtils;
  -import org.apache.cocoon.util.TraxErrorHandler;
  -import org.xml.sax.InputSource;
  -import org.xml.sax.XMLFilter;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
  +import org.xml.sax.XMLFilter;
   
  -import javax.xml.transform.URIResolver;
  -import javax.xml.transform.TransformerException;
  -import javax.xml.transform.TransformerFactory;
  -import javax.xml.transform.Templates;
  -import javax.xml.transform.Result;
  -import javax.xml.transform.Transformer;
  +import javax.xml.transform.*;
   import javax.xml.transform.sax.SAXTransformerFactory;
   import javax.xml.transform.sax.TemplatesHandler;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamSource;
  +
   import java.io.File;
  -import java.io.InputStream;
   import java.io.IOException;
   import java.util.HashMap;
   
  
  
  
  1.5       +1 -2      xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactory.java
  
  Index: URLFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- URLFactory.java	26 Apr 2002 11:01:33 -0000	1.4
  +++ URLFactory.java	5 Dec 2002 10:17:31 -0000	1.5
  @@ -51,7 +51,6 @@
   package org.apache.cocoon.components.url;
   
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.thread.ThreadSafe;
   
   import java.net.MalformedURLException;
   import java.net.URL;
  
  
  
  1.9       +2 -3      xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactoryImpl.java
  
  Index: URLFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactoryImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- URLFactoryImpl.java	31 Jul 2002 13:13:26 -0000	1.8
  +++ URLFactoryImpl.java	5 Dec 2002 10:17:31 -0000	1.9
  @@ -51,7 +51,6 @@
   package org.apache.cocoon.components.url;
   
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -63,9 +62,9 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.LogEnabled;
  +import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.util.ClassUtils;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message