Return-Path: Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org Received: (qmail 11677 invoked from network); 19 Feb 2004 23:39:52 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 19 Feb 2004 23:39:52 -0000 Received: (qmail 86407 invoked by uid 500); 19 Feb 2004 23:39:38 -0000 Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org Received: (qmail 86319 invoked by uid 500); 19 Feb 2004 23:39:38 -0000 Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: forrest-dev@xml.apache.org Delivered-To: mailing list forrest-cvs@xml.apache.org Received: (qmail 86296 invoked from network); 19 Feb 2004 23:39:37 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 19 Feb 2004 23:39:37 -0000 Received: (qmail 11670 invoked by uid 1464); 19 Feb 2004 23:39:51 -0000 Date: 19 Feb 2004 23:39:51 -0000 Message-ID: <20040219233951.11669.qmail@minotaur.apache.org> From: nicolaken@apache.org To: xml-forrest-cvs@apache.org Subject: cvs commit: xml-forrest/src/java/org/apache/forrest/skinconf SkinconfTransformer.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N nicolaken 2004/02/19 15:39:51 Modified: src/java/org/apache/cocoon/components/modules/input AbstractWrappingModule.java AntPropertiesModule.java ForrestWrappingModule.java src/java/org/apache/forrest/search ForrestDocumentSAXParser.java ForrestIndexer.java ForrestSearcher.java ForrestSearchRenderer.java ForrestSearchServlet.java src/java/org/apache/cocoon/transformation IdGeneratorTransformer.java XPathTransformer.java src/java/org/apache/forrest/skinconf SkinconfTransformer.java Log: Clean imports, remove static methods and make static fields be accessed correctly. Revision Changes Path 1.3 +1 -3 xml-forrest/src/java/org/apache/cocoon/components/modules/input/AbstractWrappingModule.java Index: AbstractWrappingModule.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/cocoon/components/modules/input/AbstractWrappingModule.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractWrappingModule.java 28 Jan 2004 14:42:31 -0000 1.2 +++ AbstractWrappingModule.java 19 Feb 2004 23:39:50 -0000 1.3 @@ -64,8 +64,6 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.cocoon.util.HashMap; - /** * @TODO * @author Nicola Ken Barozzi 1.4 +3 -5 xml-forrest/src/java/org/apache/cocoon/components/modules/input/AntPropertiesModule.java Index: AntPropertiesModule.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/cocoon/components/modules/input/AntPropertiesModule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AntPropertiesModule.java 27 Jan 2004 15:01:10 -0000 1.3 +++ AntPropertiesModule.java 19 Feb 2004 23:39:50 -0000 1.4 @@ -50,13 +50,12 @@ */ package org.apache.cocoon.components.modules.input; +import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; -import java.io.BufferedReader; +import java.util.Enumeration; import java.util.Map; import java.util.Properties; -import java.util.Enumeration; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; @@ -65,10 +64,9 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; import org.apache.avalon.framework.thread.ThreadSafe; +import org.apache.commons.lang.StringUtils; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; - -import org.apache.commons.lang.StringUtils; /** * Input module for accessing properties in a properties file 1.2 +1 -12 xml-forrest/src/java/org/apache/cocoon/components/modules/input/ForrestWrappingModule.java Index: ForrestWrappingModule.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/cocoon/components/modules/input/ForrestWrappingModule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ForrestWrappingModule.java 27 Jan 2004 15:22:42 -0000 1.1 +++ ForrestWrappingModule.java 19 Feb 2004 23:39:50 -0000 1.2 @@ -51,17 +51,6 @@ package org.apache.cocoon.components.modules.input; -import java.util.Iterator; -import java.util.Map; - -import org.apache.avalon.framework.activity.Disposable; -import org.apache.avalon.framework.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.logger.AbstractLogEnabled; -import org.apache.avalon.framework.logger.LogEnabled; - -import org.apache.cocoon.util.HashMap; /** * @TODO 1.2 +1 -7 xml-forrest/src/java/org/apache/forrest/search/ForrestDocumentSAXParser.java Index: ForrestDocumentSAXParser.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/forrest/search/ForrestDocumentSAXParser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ForrestDocumentSAXParser.java 20 Oct 2003 09:50:56 -0000 1.1 +++ ForrestDocumentSAXParser.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -57,20 +57,14 @@ package org.apache.forrest.search; import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; - import java.util.HashMap; import java.util.Vector; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; - import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.XMLReaderFactory; 1.2 +1 -7 xml-forrest/src/java/org/apache/forrest/search/ForrestIndexer.java Index: ForrestIndexer.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/forrest/search/ForrestIndexer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ForrestIndexer.java 20 Oct 2003 09:50:56 -0000 1.1 +++ ForrestIndexer.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -58,19 +58,13 @@ import java.io.File; import java.io.IOException; - import java.util.Date; -import org.apache.lucene.analysis.Analyzer; - import org.apache.lucene.analysis.standard.StandardAnalyzer; - import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; - import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; - import org.apache.lucene.util.Arrays; /** 1.2 +3 -14 xml-forrest/src/java/org/apache/forrest/search/ForrestSearcher.java Index: ForrestSearcher.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/forrest/search/ForrestSearcher.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ForrestSearcher.java 20 Oct 2003 09:50:56 -0000 1.1 +++ ForrestSearcher.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -57,31 +57,20 @@ package org.apache.forrest.search; import java.io.IOException; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; - import java.util.Date; import org.apache.commons.lang.StringUtils; - -import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.Hits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; - -import org.apache.xerces.dom.DOMImplementationImpl; - -import org.w3c.dom.Document; -import org.w3c.dom.DocumentType; import org.w3c.dom.DOMException; import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.Text; /** *

Searches the index for a given query string.

1.2 +0 -8 xml-forrest/src/java/org/apache/forrest/search/ForrestSearchRenderer.java Index: ForrestSearchRenderer.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/forrest/search/ForrestSearchRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ForrestSearchRenderer.java 20 Oct 2003 09:50:56 -0000 1.1 +++ ForrestSearchRenderer.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -60,24 +60,16 @@ import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import javax.xml.transform.Result; -import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; - import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; - import org.apache.xerces.dom.DocumentImpl; - import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.Node; /** *

Title:

1.2 +1 -3 xml-forrest/src/java/org/apache/forrest/search/ForrestSearchServlet.java Index: ForrestSearchServlet.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/forrest/search/ForrestSearchServlet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ForrestSearchServlet.java 20 Oct 2003 09:50:56 -0000 1.1 +++ ForrestSearchServlet.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -59,9 +59,7 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletContext; import javax.servlet.ServletException; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 1.2 +11 -21 xml-forrest/src/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java Index: IdGeneratorTransformer.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IdGeneratorTransformer.java 20 Oct 2003 09:50:56 -0000 1.1 +++ IdGeneratorTransformer.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -50,38 +50,28 @@ */ package org.apache.cocoon.transformation; -import org.apache.avalon.framework.configuration.Configurable; +import java.io.IOException; +import java.io.Serializable; +import java.net.URLEncoder; +import java.util.Map; + import org.apache.avalon.framework.activity.Disposable; +import org.apache.avalon.framework.component.ComponentManager; +import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.excalibur.xml.xpath.XPathProcessor; -import org.apache.excalibur.source.SourceValidity; -import org.apache.excalibur.source.impl.validity.NOPValidity; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.caching.CacheableProcessingComponent; -import org.apache.cocoon.xml.XMLUtils; +import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; - +import org.apache.excalibur.source.SourceValidity; +import org.apache.excalibur.source.impl.validity.NOPValidity; +import org.apache.excalibur.xml.xpath.XPathProcessor; import org.w3c.dom.Document; -import org.w3c.dom.Text; import org.w3c.dom.Element; -import org.w3c.dom.Attr; -import org.w3c.dom.DOMException; -import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; import org.xml.sax.SAXException; - -import java.io.*; -import java.net.MalformedURLException; -import java.net.URLEncoder; -import java.util.Map; -import java.util.Stack; /** * A Transformer for adding a URL-encoded 'id' attribute to a node, whose value 1.2 +13 -21 xml-forrest/src/java/org/apache/cocoon/transformation/XPathTransformer.java Index: XPathTransformer.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/cocoon/transformation/XPathTransformer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XPathTransformer.java 20 Oct 2003 09:50:56 -0000 1.1 +++ XPathTransformer.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -50,36 +50,28 @@ */ package org.apache.cocoon.transformation; -import org.apache.excalibur.xml.dom.DOMParser; -import org.apache.excalibur.xml.xpath.XPathProcessor; +import java.io.IOException; +import java.io.Serializable; +import java.util.Map; +import java.util.Stack; + import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.excalibur.source.SourceValidity; -import org.apache.excalibur.source.impl.validity.NOPValidity; - import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.caching.CacheableProcessingComponent; -import org.apache.cocoon.xml.XMLUtils; +import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; - +import org.apache.cocoon.xml.XMLUtils; +import org.apache.excalibur.source.SourceValidity; +import org.apache.excalibur.source.impl.validity.NOPValidity; +import org.apache.excalibur.xml.dom.DOMParser; +import org.apache.excalibur.xml.xpath.XPathProcessor; +import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.Attr; -import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.NamedNodeMap; - -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; import org.xml.sax.SAXException; - -import java.io.*; -import java.net.MalformedURLException; -import java.util.Map; -import java.util.Stack; /** * A transformer that prunes the source tree based on include and 1.2 +5 -11 xml-forrest/src/java/org/apache/forrest/skinconf/SkinconfTransformer.java Index: SkinconfTransformer.java =================================================================== RCS file: /home/cvs/xml-forrest/src/java/org/apache/forrest/skinconf/SkinconfTransformer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SkinconfTransformer.java 19 Jan 2004 18:06:15 -0000 1.1 +++ SkinconfTransformer.java 19 Feb 2004 23:39:51 -0000 1.2 @@ -50,23 +50,17 @@ */ package org.apache.forrest.skinconf; +import java.awt.Color; +import java.io.IOException; +import java.util.Map; + import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; -import org.apache.excalibur.source.Source; -import org.apache.excalibur.source.SourceException; -import org.apache.cocoon.components.source.SourceUtil; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.transformation.AbstractTransformer; import org.xml.sax.Attributes; -import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; - -import java.io.FileWriter; -import java.io.IOException; -import java.util.Date; -import java.util.Map; -import java.awt.Color; /** * @author Nicola Ken Barozzi