Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 37858 invoked by uid 500); 24 Mar 2003 14:33:59 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 37847 invoked by uid 500); 24 Mar 2003 14:33:59 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 37844 invoked from network); 24 Mar 2003 14:33:58 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 24 Mar 2003 14:33:58 -0000 Received: (qmail 61373 invoked by uid 1010); 24 Mar 2003 14:33:58 -0000 Date: 24 Mar 2003 14:33:58 -0000 Message-ID: <20030324143358.61372.qmail@icarus.apache.org> From: stefano@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/components/axis SoapServerImpl.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N stefano 2003/03/24 06:33:58 Modified: src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements Offsets.java Anchors.java Sheet.java src/blocks/slide/java/org/apache/cocoon/components/source/impl SlideSource.java SlideSourceFactory.java JPEGSourceInspector.java src/java/org/apache/cocoon/components/source SourceUtil.java src/blocks/lucene/java/org/apache/cocoon/components/search LuceneIndexContentHandler.java SimpleLuceneCocoonIndexerImpl.java src/java/org/apache/cocoon/components CocoonComponentManager.java src/blocks/xmldb/java/org/apache/cocoon/acting DbXMLAuthenticatorAction.java src/scratchpad/src/org/apache/cocoon/reading DirectoryZipArchiver.java src/scratchpad/src/org/apache/cocoon/transformation/constrained AbstractConstrainedTransformer.java src/java/org/apache/cocoon/components/xmlform Form.java src/blocks/naming/java/org/apache/cocoon/transformation LDAPTransformer.java src/blocks/batik/java/org/apache/cocoon/transformation FragmentExtractorTransformer.java src/java/org/apache/cocoon/i18n XMLResourceBundleFactory.java src/java/org/apache/cocoon/components/treeprocessor/sitemap SitemapLanguage.java GenerateNode.java src/blocks/deli/java/org/apache/cocoon/components/deli DeliImpl.java src/blocks/mail/java/org/apache/cocoon/mail MailContentHandlerDelegate.java src/blocks/jsp/java/org/apache/cocoon/components/jsp JSPEngineImplNamedDispatcherInclude.java src/blocks/velocity/java/org/apache/cocoon/generation JSIntrospector.java src/java/org/apache/cocoon/components/flow/javascript ScriptablePropertyHandler.java JavaScriptInterpreter.java src/blocks/linkrewriter/java/org/apache/cocoon/transformation VariableRewriterTransformer.java LinkRewriterTransformer.java src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting SessionFormAction.java src/blocks/slide/java/org/apache/cocoon/generation SourceDescriptionGenerator.java src/blocks/databases/java/org/apache/cocoon/transformation SQLTransformer.java src/scratchpad/src/org/apache/cocoon/storejanitor StoreJanitorImpl.java src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components DefaultAuthenticationManager.java src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components PortalManager.java src/blocks/databases/java/org/apache/cocoon/acting DatabaseAuthenticatorAction.java DatabaseCookieAuthenticatorAction.java src/java/org/apache/cocoon/components/language/programming/java Jikes.java src/scratchpad/src/org/apache/cocoon/ant CocoonProcessorDelegate.java src/blocks/batik/java/org/apache/cocoon/serialization SVGSerializer.java src/java/org/apache/cocoon/components/validation/schematron SchematronValidator.java src/blocks/slide/java/org/apache/cocoon/components/repository/impl SlidePrincipalProvider.java src/java/org/apache/cocoon/sitemap XSLTFactoryLoader.java src/java/org/apache/cocoon/components/modules/input DateMetaInputModule.java src/java/org/apache/cocoon/util HashUtil.java src/blocks/axis/java/org/apache/cocoon/components/axis SoapServerImpl.java Removed: src/blocks/web3/lib util.concurrent-1.3.1.jar Log: cleaning up imports and removing/commenting-out unused code Revision Changes Path 1.3 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Offsets.java Index: Offsets.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Offsets.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Offsets.java 11 Mar 2003 19:05:02 -0000 1.2 +++ Offsets.java 24 Mar 2003 14:33:53 -0000 1.3 @@ -92,7 +92,6 @@ throw new IOException("cannot process a null offsets string"); } char[] input = value.trim().toCharArray(); - String[] offsets = new String[ _component_count ]; int index = 0; for (int j = 0; j < _component_count; j++) 1.3 +1 -2 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Anchors.java Index: Anchors.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Anchors.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Anchors.java 11 Mar 2003 19:05:01 -0000 1.2 +++ Anchors.java 24 Mar 2003 14:33:53 -0000 1.3 @@ -124,7 +124,6 @@ throw new IOException("cannot process a null anchors string"); } char[] input = value.trim().toCharArray(); - String[] anchors = new String[ _component_count ]; int index = 0; for (int j = 0; j < _component_count; j++) 1.3 +3 -3 cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java Index: Sheet.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Sheet.java 11 Mar 2003 19:05:02 -0000 1.2 +++ Sheet.java 24 Mar 2003 14:33:53 -0000 1.3 @@ -95,7 +95,6 @@ //optimization constant private final static int REGION_CAPACITY = 20; - private final static int DEBUG=0; /** * Constructor Sheet @@ -345,12 +344,13 @@ return ((points >= 0) && (points <= ((Short.MAX_VALUE + 0.5) / 48))); } + /* this method doesn't appear to be used private boolean isValidCharacters(double characters) { return ((characters >= 0) && (characters <= ((Short.MAX_VALUE + 0.5) / 256))); - } + } */ /** * assigns blank cells to regions where no cell is currently allocated. 1.4 +3 -3 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java Index: SlideSource.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SlideSource.java 16 Mar 2003 17:49:07 -0000 1.3 +++ SlideSource.java 24 Mar 2003 14:33:54 -0000 1.4 @@ -176,8 +176,6 @@ private SlideSourceOutputStream outputstream; - private boolean initialized = false; - /** * Create a slide source. * @@ -280,9 +278,11 @@ */ public InputStream getInputStream() throws IOException, SourceException { try { + /* FIXME (SM): the variable object is never used. can we remove it? ObjectNode object = structure.retrieve(this.slideToken, this.config.getFilesPath()+ this.path); + */ return content.retrieve(slideToken, this.revisionDescriptors, this.revisionDescriptor).streamContent(); 1.3 +3 -3 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java Index: SlideSourceFactory.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SlideSourceFactory.java 16 Mar 2003 17:49:07 -0000 1.2 +++ SlideSourceFactory.java 24 Mar 2003 14:33:54 -0000 1.3 @@ -134,8 +134,8 @@ this.getLogger().debug("Source parameters: "+ queryParameters.toString()); - String repositoryname = queryParameters.getParameter("cocoon-repository", - null); + //String repositoryname = queryParameters.getParameter("cocoon-repository", null); + String namespace = queryParameters.getParameter("cocoon-repository-namespace", null); String principal = queryParameters.getParameter("cocoon-source-principal", 1.3 +1 -10 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/JPEGSourceInspector.java Index: JPEGSourceInspector.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/JPEGSourceInspector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JPEGSourceInspector.java 16 Mar 2003 17:49:07 -0000 1.2 +++ JPEGSourceInspector.java 24 Mar 2003 14:33:54 -0000 1.3 @@ -58,13 +58,10 @@ import java.io.BufferedInputStream; import java.io.IOException; -import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.thread.ThreadSafe; - import org.apache.cocoon.components.source.SourceInspector; import org.apache.cocoon.components.source.helpers.SourceProperty; - import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceException; @@ -81,12 +78,6 @@ private String PROPERTY_NS = "http://xml.apache.org/cocoon/JPEGSourceInspector"; private static String IMAGE_WIDTH_PROPERTY_NAME = "width"; private static String IMAGE_HEIGHT_PROPERTY_NAME = "height"; - - private String propertyname = "result"; - private String extension = null; - private String xpath = null; - - private ComponentManager manager = null; public SourceProperty getSourceProperty(Source source, String namespace, String name) throws SourceException { 1.4 +1 -4 cocoon-2.1/src/java/org/apache/cocoon/components/source/SourceUtil.java Index: SourceUtil.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/SourceUtil.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SourceUtil.java 16 Mar 2003 17:49:12 -0000 1.3 +++ SourceUtil.java 24 Mar 2003 14:33:54 -0000 1.4 @@ -174,9 +174,6 @@ Parameters typeParameters, boolean filterDocumentEvent) throws SAXException, IOException, ProcessingException { - ComponentManager manager = CocoonComponentManager.getSitemapComponentManager(); - - // Test for url rewriting if (typeParameters != null && typeParameters.getParameter(URLRewriter.PARAMETER_MODE, null) != null) { 1.3 +2 -3 cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java Index: LuceneIndexContentHandler.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LuceneIndexContentHandler.java 11 Mar 2003 17:44:21 -0000 1.2 +++ LuceneIndexContentHandler.java 24 Mar 2003 14:33:54 -0000 1.3 @@ -301,10 +301,9 @@ if (fieldTags == null) { return false; } - final String s = tag.toString(); Iterator i = fieldTags.iterator(); while (i.hasNext()) { - if (tag.equals(i.next())) { + if (tag.equals(i.next())) { return true; } } 1.3 +1 -2 cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java Index: SimpleLuceneCocoonIndexerImpl.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SimpleLuceneCocoonIndexerImpl.java 11 Mar 2003 17:44:21 -0000 1.2 +++ SimpleLuceneCocoonIndexerImpl.java 24 Mar 2003 14:33:54 -0000 1.3 @@ -136,7 +136,6 @@ Analyzer analyzer; private String analyzerClassnameDefault = ANALYZER_CLASSNAME_DEFAULT; - private String directoryDefault = DIRECTORY_DEFAULT; private int mergeFactor = MERGE_FACTOR_DEFAULT; 1.6 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/CocoonComponentManager.java Index: CocoonComponentManager.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CocoonComponentManager.java 20 Mar 2003 11:45:58 -0000 1.5 +++ CocoonComponentManager.java 24 Mar 2003 14:33:54 -0000 1.6 @@ -160,7 +160,7 @@ */ public static void leaveEnvironment() { final EnvironmentStack stack = (EnvironmentStack)environmentStack.get(); - final Object[] objects = (Object[])stack.pop(); + stack.pop(); } /** 1.3 +2 -6 cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java Index: DbXMLAuthenticatorAction.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DbXMLAuthenticatorAction.java 16 Mar 2003 17:49:10 -0000 1.2 +++ DbXMLAuthenticatorAction.java 24 Mar 2003 14:33:54 -0000 1.3 @@ -214,8 +214,6 @@ private String getAuthQuery ( Configuration conf, Request req ) { - boolean first_constraint = true; - StringBuffer queryBuffer = new StringBuffer ("//"); StringBuffer queryBufferEnd = new StringBuffer (""); @@ -269,7 +267,6 @@ } } else { queryBufferEnd.append (dbcol).append("='").append(request_value).append("']"); - first_constraint = false; } } @@ -376,7 +373,7 @@ Configuration table = conf.getChild ("root"); Configuration[] select = table.getChildren ("select"); - String dbcol, session_param, type; + String session_param, type; HashMap map = new HashMap(); XObject xo; @@ -402,7 +399,6 @@ try { for (int i = 0; i < select.length; i ++) { - dbcol = select[i].getAttribute ("element"); try { session_param = select[i].getAttribute ("to-session"); if (session_param != null && !session_param.trim().equals ("")) 1.3 +1 -2 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/reading/DirectoryZipArchiver.java Index: DirectoryZipArchiver.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/reading/DirectoryZipArchiver.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DirectoryZipArchiver.java 16 Mar 2003 18:03:54 -0000 1.2 +++ DirectoryZipArchiver.java 24 Mar 2003 14:33:54 -0000 1.3 @@ -91,7 +91,6 @@ private Request request; private File directory; - private boolean setContentLength; public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par) throws ProcessingException, SAXException, IOException { 1.3 +1 -3 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java Index: AbstractConstrainedTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractConstrainedTransformer.java 16 Mar 2003 18:03:55 -0000 1.2 +++ AbstractConstrainedTransformer.java 24 Mar 2003 14:33:54 -0000 1.3 @@ -73,8 +73,6 @@ /** The URI of the namespace this class processes */ private String my_uri; - /** The prefix that is used in the XML document to indicate the namespace */ - private String my_prefix = "unknown"; /** * The 'name' of the namespace this class processes. FIXME: Seems to be the * last path element of the URI -- is that correct? 1.4 +1 -4 cocoon-2.1/src/java/org/apache/cocoon/components/xmlform/Form.java Index: Form.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xmlform/Form.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Form.java 18 Mar 2003 01:01:26 -0000 1.3 +++ Form.java 24 Mar 2003 14:33:54 -0000 1.4 @@ -174,7 +174,6 @@ } public void setValue(String xpath, Object[] values) { - Pointer ptr = jxcontext_.getPointer(xpath); // // Dmitri Plotnikov's patch // @@ -295,7 +294,6 @@ if (model_ == null) throw new IllegalStateException("Form model not set"); List nodeset = new LinkedList(); - Pointer ptr = jxcontext_.getPointer(xpathSelector); Iterator iter = jxcontext_.iteratePointers(xpathSelector); while (iter.hasNext()) { Pointer nextPointer = (Pointer) iter.next(); @@ -392,7 +390,6 @@ } catch (JXPathException ex) { Violation v = new Violation(); v.setPath(path); - String message = VIOLATION_MESSAGE_DATA_FORMAT_ERROR; v.setMessage(ex.getMessage()); pviolations.add(v); } 1.2 +1 -5 cocoon-2.1/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java Index: LDAPTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LDAPTransformer.java 9 Mar 2003 00:04:49 -0000 1.1 +++ LDAPTransformer.java 24 Mar 2003 14:33:54 -0000 1.2 @@ -1096,10 +1096,6 @@ current_value.append(ary, start, length); } - private void attribute(AttributesImpl attr, String name, String value) { - attr.addAttribute("", name, name, "CDATA", value); - } - private void start(String name, AttributesImpl attr) throws SAXException { super.contentHandler.startElement("", name, name, attr); attr.clear(); 1.3 +1 -4 cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java Index: FragmentExtractorTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FragmentExtractorTransformer.java 19 Mar 2003 15:42:15 -0000 1.2 +++ FragmentExtractorTransformer.java 24 Mar 2003 14:33:55 -0000 1.3 @@ -109,12 +109,9 @@ private static final String EXTRACT_ELEMENT = "svg"; private static final String FE_URI = "http://apache.org/cocoon/fragmentextractor/2.0"; - private static final String XLINK_URI = "http://www.w3c.org/1999/xlink"; private String extractURI; private String extractElement; - - private static String generatorClass = "org.apache.cocoon.generation.FragmentExtractorGenerator"; /** The component manager instance */ protected ComponentManager manager = null; 1.3 +1 -12 cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java Index: XMLResourceBundleFactory.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XMLResourceBundleFactory.java 16 Mar 2003 17:49:15 -0000 1.2 +++ XMLResourceBundleFactory.java 24 Mar 2003 14:33:55 -0000 1.3 @@ -177,17 +177,6 @@ } /** - * Select a bundle based on bundle name and locale. - * - * @param name bundle name - * @param locale locale - * @return the bundle - */ - private Component _select(String name, Locale loc) { - return _select(name, loc, cacheAtStartup); - } - - /** * Select the parent bundle of the current bundle, based on * bundle name and locale. * 1.2 +1 -3 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java Index: SitemapLanguage.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SitemapLanguage.java 9 Mar 2003 00:09:22 -0000 1.1 +++ SitemapLanguage.java 24 Mar 2003 14:33:55 -0000 1.2 @@ -80,8 +80,6 @@ public class SitemapLanguage extends DefaultTreeBuilder { - private static final String ATTR_PREFIX = "org.apache.cocoon.components.treeprocessor.ViewNodeBuilder"; - // Regexp's for splitting expressions private static final String COMMA_SPLIT_REGEXP = "[\\s]*,[\\s]*"; private static final String EQUALS_SPLIT_REGEXP = "[\\s]*=[\\s]*"; 1.2 +5 -13 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java Index: GenerateNode.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GenerateNode.java 9 Mar 2003 00:09:21 -0000 1.1 +++ GenerateNode.java 24 Mar 2003 14:33:55 -0000 1.2 @@ -50,19 +50,16 @@ */ package org.apache.cocoon.components.treeprocessor.sitemap; -import org.apache.cocoon.environment.Environment; -import org.apache.cocoon.sitemap.PatternException; +import java.util.Map; -import org.apache.cocoon.components.treeprocessor.CategoryNode; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.components.treeprocessor.InvokeContext; import org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode; import org.apache.cocoon.components.treeprocessor.PipelineEventComponentProcessingNode; import org.apache.cocoon.components.treeprocessor.ProcessingNode; import org.apache.cocoon.components.treeprocessor.variables.VariableResolver; - -import org.apache.avalon.framework.parameters.Parameters; - -import java.util.*; +import org.apache.cocoon.environment.Environment; +import org.apache.cocoon.sitemap.PatternException; /** * @@ -78,10 +75,6 @@ private Map parameters; - - /** The category node */ - private CategoryNode viewsNode; - public GenerateNode(String name, VariableResolver source) throws PatternException { this.generatorName = name; this.source = source; @@ -90,7 +83,6 @@ public void setParameters(Map parameterMap) { this.parameters = parameterMap; } - public final boolean invoke(Environment env, InvokeContext context) throws Exception { 1.3 +1 -7 cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/components/deli/DeliImpl.java Index: DeliImpl.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/components/deli/DeliImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DeliImpl.java 11 Mar 2003 17:44:20 -0000 1.2 +++ DeliImpl.java 24 Mar 2003 14:33:55 -0000 1.3 @@ -109,14 +109,8 @@ ThreadSafe, Contextualizable { - /** The path to the Cocoon configuration files */ - private String defaultPath = null; - /** The name of the main DELI configuration file */ private String deliConfig = "resources/deli/config/deliConfig.xml"; - - /** The DELI workspace */ - private Workspace workspace; /** The component manager */ protected ComponentManager manager = null; 1.4 +12 -10 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java Index: MailContentHandlerDelegate.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- MailContentHandlerDelegate.java 12 Mar 2003 09:35:36 -0000 1.3 +++ MailContentHandlerDelegate.java 24 Mar 2003 14:33:56 -0000 1.4 @@ -51,7 +51,7 @@ package org.apache.cocoon.mail; import java.io.IOException; -import java.io.InputStream; +//import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Enumeration; @@ -777,14 +777,15 @@ } - /** + /* * Description of the Method * *@param is Description of Parameter *@exception IOException Description of Exception *@exception SAXException thrown iff generating SAX events fails */ - private void encodeInputStreamForXML(InputStream is) throws IOException, SAXException { + /* FIXME (SM) This method doesn't appear to be used + private void encodeInputStreamForXML(InputStream is) throws IOException, SAXException { int contentLength = is.available(); if (contentLength < 16) { contentLength = 2048; @@ -799,10 +800,10 @@ characters(strContent); } endElement("encoding"); - } + } */ - /** + /* * A simple byte as hex encodeing * *@param bytes Description of Parameter @@ -810,6 +811,7 @@ *@param length Description of Parameter *@return Description of the Returned Value */ + /* FIXME (SM) This method doesn't appear to be used private String encodeBytes(final byte[] bytes, final int offset, final int length) { StringBuffer sb = new StringBuffer(); final String ENCODE_TABLE[] = { @@ -826,7 +828,7 @@ sb.append(" "); } return sb.toString(); - } + } */ /** 1.2 +1 -2 cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java Index: JSPEngineImplNamedDispatcherInclude.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JSPEngineImplNamedDispatcherInclude.java 9 Mar 2003 00:04:13 -0000 1.1 +++ JSPEngineImplNamedDispatcherInclude.java 24 Mar 2003 14:33:56 -0000 1.2 @@ -126,7 +126,6 @@ rd.include( request, response ); response.flushBuffer(); bytes = response.toByteArray(); - ByteArrayInputStream input = new ByteArrayInputStream( bytes ); } else { getLogger().error( "Specify a correct " + CONFIG_SERVLET_NAME + " " + servletName ); } 1.4 +6 -6 cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/JSIntrospector.java Index: JSIntrospector.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/JSIntrospector.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JSIntrospector.java 16 Mar 2003 17:49:09 -0000 1.3 +++ JSIntrospector.java 24 Mar 2003 14:33:56 -0000 1.4 @@ -134,7 +134,7 @@ } public Object invoke(Object thisArg) throws Exception { - Context cx = Context.enter(); + Context.enter(); try { Scriptable thisObj; if (!(thisArg instanceof Scriptable)) { @@ -176,7 +176,7 @@ } public Object invoke(Object thisArg, Object rhs) throws Exception { - Context cx = Context.enter(); + Context.enter(); try { Scriptable thisObj; Object arg = rhs; @@ -223,7 +223,7 @@ } public Object next() { - Context cx = Context.enter(); + Context.enter(); try { Object result = arr.get(index++, arr); if (result == Undefined.instance || @@ -260,7 +260,7 @@ } public Object next() { - Context cx = Context.enter(); + Context.enter(); try { Object result = ScriptableObject.getProperty(scope, @@ -278,7 +278,7 @@ } public void remove() { - Context cx = Context.enter(); + Context.enter(); try { scope.delete(ids[index].toString()); } finally { 1.3 +3 -5 cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java Index: ScriptablePropertyHandler.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ScriptablePropertyHandler.java 16 Mar 2003 17:49:12 -0000 1.2 +++ ScriptablePropertyHandler.java 24 Mar 2003 14:33:56 -0000 1.3 @@ -88,9 +88,8 @@ } public String[] getPropertyNames(Object obj) { - Context cx = null; + Context.enter(); try { - cx = Context.enter(); Object[] ids; if (obj instanceof ScriptableObject) { ids = ((ScriptableObject)obj).getAllIds(); @@ -109,9 +108,8 @@ public void setProperty(Object obj, String propertyName, Object value) { - Context cx = null; + Context.enter(); try { - cx = Context.enter(); if (!(value == null || value instanceof String || value instanceof Number 1.11 +9 -10 cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java Index: JavaScriptInterpreter.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- JavaScriptInterpreter.java 23 Mar 2003 19:42:38 -0000 1.10 +++ JavaScriptInterpreter.java 24 Mar 2003 14:33:56 -0000 1.11 @@ -59,6 +59,7 @@ 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.components.flow.AbstractInterpreter; import org.apache.cocoon.components.flow.Interpreter; import org.apache.cocoon.components.flow.WebContinuation; @@ -66,24 +67,22 @@ import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; -import org.apache.cocoon.ResourceNotFoundException; import org.apache.commons.jxpath.JXPathIntrospector; import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.apache.excalibur.source.Source; -import org.mozilla.javascript.tools.debugger.ScopeProvider; -import org.mozilla.javascript.tools.ToolErrorReporter; -import org.mozilla.javascript.Script; -import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.Context; -import org.mozilla.javascript.ScriptableObject; -import org.mozilla.javascript.PropertyException; import org.mozilla.javascript.EvaluatorException; +import org.mozilla.javascript.Function; import org.mozilla.javascript.JavaScriptException; -import org.mozilla.javascript.ScriptRuntime; import org.mozilla.javascript.NativeArray; -import org.mozilla.javascript.Function; +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.tools.ToolErrorReporter; /** * Interface with the JavaScript interpreter. 1.3 +1 -2 cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/VariableRewriterTransformer.java Index: VariableRewriterTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/VariableRewriterTransformer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VariableRewriterTransformer.java 11 Mar 2003 17:44:21 -0000 1.2 +++ VariableRewriterTransformer.java 24 Mar 2003 14:33:56 -0000 1.3 @@ -176,7 +176,6 @@ { private static String NAMESPACE=""; - private static String lf = System.getProperty("line.separator", "\n"); /** A list of attributes considered 'links' */ private Set linkAttrs; 1.3 +1 -2 cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/LinkRewriterTransformer.java Index: LinkRewriterTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/LinkRewriterTransformer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LinkRewriterTransformer.java 11 Mar 2003 17:44:20 -0000 1.2 +++ LinkRewriterTransformer.java 24 Mar 2003 14:33:56 -0000 1.3 @@ -176,7 +176,6 @@ { private static String NAMESPACE=""; - private static String lf = System.getProperty("line.separator", "\n"); /** A list of attributes considered 'links' */ private Set linkAttrs; 1.2 +4 -2 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java Index: SessionFormAction.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SessionFormAction.java 9 Mar 2003 00:06:07 -0000 1.1 +++ SessionFormAction.java 24 Mar 2003 14:33:56 -0000 1.2 @@ -149,11 +149,13 @@ return null; } + /* FIXME (SM): the code below appears unused. Should we remove it? + // read global parameter settings boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) { reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); - } + }*/ // read local settings try { 1.3 +2 -5 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java Index: SourceDescriptionGenerator.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SourceDescriptionGenerator.java 19 Mar 2003 15:42:14 -0000 1.2 +++ SourceDescriptionGenerator.java 24 Mar 2003 14:33:56 -0000 1.3 @@ -540,10 +540,7 @@ IncludeXMLConsumer consumer = new IncludeXMLConsumer(this.contentHandler); for (int i = 0; iEnvironment. */ - private Environment environment=null; - /** The current Parameters. */ - private Configuration config=null; /** The current OutputStream. */ private OutputStream output=null; /** The current mime-type. */ 1.3 +1 -11 cocoon-2.1/src/java/org/apache/cocoon/components/validation/schematron/SchematronValidator.java Index: SchematronValidator.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/validation/schematron/SchematronValidator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SchematronValidator.java 16 Mar 2003 17:49:13 -0000 1.2 +++ SchematronValidator.java 24 Mar 2003 14:33:57 -0000 1.3 @@ -89,16 +89,6 @@ */ private Map phaseMap_ = new HashMap(); - /** - * the schema name space prefix used in the schema document - */ - private String schemaPrefix_; - - /** - * the default schema name space prefix - */ - private String defaultSchemaPrefix_ = "sch"; - /* * Schematron Phase property */ 1.3 +3 -1 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java Index: SlidePrincipalProvider.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SlidePrincipalProvider.java 16 Mar 2003 17:49:06 -0000 1.2 +++ SlidePrincipalProvider.java 24 Mar 2003 14:33:57 -0000 1.3 @@ -696,12 +696,14 @@ 1); // FIXME the CVS code from slide does only implement getRoles + /* Enumeration roles = this.security.getRoles(userobject); String role = null; if (roles.hasMoreElements()) { role = (String) roles.nextElement(); } + */ NodeRevisionDescriptors revisionDescriptors = content.retrieve(slidetoken, userobject.getUri()); 1.2 +1 -4 cocoon-2.1/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java Index: XSLTFactoryLoader.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XSLTFactoryLoader.java 9 Mar 2003 00:09:38 -0000 1.1 +++ XSLTFactoryLoader.java 24 Mar 2003 14:33:58 -0000 1.2 @@ -52,8 +52,6 @@ import org.w3c.dom.NodeList; -import java.util.HashMap; - /** * This class is used as a XSLT extension class. * @@ -62,7 +60,6 @@ * @version CVS $Id$ */ public class XSLTFactoryLoader { - private HashMap obj = new HashMap(); public String getClassSource(String className, String prefix, String pattern, NodeList conf) throws ClassNotFoundException, InstantiationException, IllegalAccessException, Exception { 1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java Index: DateMetaInputModule.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DateMetaInputModule.java 9 Mar 2003 00:09:02 -0000 1.1 +++ DateMetaInputModule.java 24 Mar 2003 14:33:58 -0000 1.2 @@ -169,7 +169,7 @@ // done reading configuration // setup modules and read values Iterator enum = getNames(objectModel, - this.input, this.defaultInput, this.inputConf, + this.input, this.defaultInput, inputConfig, null, inputName, mConf); return enum; } 1.2 +2 -22 cocoon-2.1/src/java/org/apache/cocoon/util/HashUtil.java Index: HashUtil.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/HashUtil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HashUtil.java 9 Mar 2003 00:09:43 -0000 1.1 +++ HashUtil.java 24 Mar 2003 14:33:58 -0000 1.2 @@ -63,10 +63,8 @@ */ public final class HashUtil { - private static long initial_hash = 0xe12398c6d9ae3b8aL; // initial values - private static long hash_true = 0x851dcaa2656c6af4L; // are arbitrary - private static long hash_false = 0x1af84a6b589285f7L; // 64-bit rands + private static long mix_master[/* 0:255 */] = { /* 000 */ 0x4476081a7043a46fL, 0x45768b8a6e7eac19L, 0xebd556c1cf055952L, /* */ 0x72ed2da1bf010101L, 0x3ff2030b128e8a64L, @@ -171,24 +169,6 @@ /* 250 */ 0x46e87f2664a31712L, 0x8c1dc526c2f6acfaL, 0x7b4826726e560b10L, /* */ 0x2966e0099d8d7ce1L, 0xbb0dd5240d2b2adeL, 0x0d527cc60bbaa936L }; - - - /** - * Move the bits in an integer long into a StringBuffer without - * conversion, then hash the string buffer, returning a long. - */ - private static long lhv (long arg) { - // Hash a long - StringBuffer tmp = new StringBuffer(4); - long aval = arg; - - tmp.setLength(4); - for ( int i=0; i<4; ++i, aval >>>= 16 ) - tmp.setCharAt( i, (char) aval); - - return buzhash( tmp ); - } - /** * This is buzhash the hash function on which most other Hash methods 1.2 +4 -10 cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/components/axis/SoapServerImpl.java Index: SoapServerImpl.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/components/axis/SoapServerImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SoapServerImpl.java 9 Mar 2003 00:02:27 -0000 1.1 +++ SoapServerImpl.java 24 Mar 2003 14:33:58 -0000 1.2 @@ -50,10 +50,8 @@ */ package org.apache.cocoon.components.axis; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStreamReader; -import java.io.OutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -78,11 +76,9 @@ import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.thread.ThreadSafe; - import org.apache.axis.AxisEngine; import org.apache.axis.Constants; import org.apache.axis.EngineConfiguration; -import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.configuration.FileProvider; import org.apache.axis.deployment.wsdd.WSDDDeployment; @@ -94,14 +90,11 @@ import org.apache.axis.transport.http.HTTPTransport; import org.apache.axis.transport.http.ServletEndpointContextImpl; import org.apache.axis.utils.XMLUtils; - import org.apache.cocoon.components.axis.providers.AvalonProvider; import org.apache.cocoon.util.IOUtils; - import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; import org.apache.excalibur.xml.dom.DOMParser; - import org.w3c.dom.Document; import org.xml.sax.InputSource; @@ -628,13 +621,14 @@ return env; } - /** + /* * Helper method to convert a Message structure * into a String. * * @param msg a Message value * @return a String value */ + /* FIXME (SM): this method appears to be unused, should we remove it? private String messageToString(final Message msg) { try @@ -654,5 +648,5 @@ return null; } - } + } */ }