cziegeler 2003/01/30 08:20:22
Modified: src/java/org/apache/cocoon/transformation Tag:
cocoon_2_0_3_branch AbstractSAXTransformer.java
EncodeURLTransformer.java
src/java/org/apache/cocoon/acting/modular Tag:
cocoon_2_0_3_branch TestAction.java
DatabaseSelectAction.java DatabaseAddAction.java
DatabaseUpdateAction.java DatabaseQueryAction.java
DatabaseDeleteAction.java DatabaseAction.java
src/java/org/apache/cocoon Tag: cocoon_2_0_3_branch
Constants.java Notification.java Processor.java
Main.java ProcessorWrapper.java
src/java/org/apache/cocoon/components/treeprocessor Tag:
cocoon_2_0_3_branch TreeProcessor.java
src/java/org/apache/cocoon/xml Tag: cocoon_2_0_3_branch
LoggingContentHandler.java
src/java/org/apache/cocoon/acting Tag: cocoon_2_0_3_branch
ServerPagesAction.java
SessionInvalidatorAction.java
RequestParamAction.java ScriptAction.java
HelloAction.java RequestParameterExistsAction.java
SessionIsValidAction.java
SessionPropagatorAction.java
ResourceExistsAction.java SessionStateAction.java
src/java/org/apache/cocoon/caching Tag: cocoon_2_0_3_branch
DeltaTimeCacheValidity.java PipelineCacheKey.java
src/java/org/apache/cocoon/components Tag:
cocoon_2_0_3_branch CocoonComponentManager.java
src/java/org/apache/cocoon/xml/dom Tag: cocoon_2_0_3_branch
SVGBuilder.java
src/java/org/apache/cocoon/sitemap Tag: cocoon_2_0_3_branch
Handler.java SitemapManager.java
src/java/org/apache/cocoon/transformation/helpers Tag:
cocoon_2_0_3_branch ParametersRecorder.java
Added: src/java/org/apache/cocoon/components Tag:
cocoon_2_0_3_branch SitemapConfigurable.java
src/java/org/apache/cocoon/xml/dom Tag: cocoon_2_0_3_branch
NodeListImpl.java DOMUtil.java
src/java/org/apache/cocoon/components/xpath Tag:
cocoon_2_0_3_branch XPathUtil.java
Log:
Start backporting new features from 2.1 to 2.0.x
Organizing imports (part)
Revision Changes Path
No revision
No revision
1.2.2.2 +14 -13
xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Index: AbstractSAXTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- AbstractSAXTransformer.java 7 Jun 2002 09:34:24 -0000 1.2.2.1
+++ AbstractSAXTransformer.java 30 Jan 2003 16:20:14 -0000 1.2.2.2
@@ -50,41 +50,42 @@
*/
package org.apache.cocoon.transformation;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Stack;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.excalibur.pool.Recyclable;
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.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.excalibur.pool.Recyclable;
-
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.transformation.helpers.*;
+import org.apache.cocoon.transformation.helpers.ParametersRecorder;
+import org.apache.cocoon.transformation.helpers.TextRecorder;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.dom.DOMBuilder;
-
+import org.apache.excalibur.source.SourceParameters;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
/**
1.1.2.3 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
Index: EncodeURLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EncodeURLTransformer.java 10 Nov 2002 22:53:54 -0000 1.1.2.2
+++ EncodeURLTransformer.java 30 Jan 2003 16:20:14 -0000 1.1.2.3
@@ -52,12 +52,12 @@
import java.io.IOException;
import java.util.Map;
+
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.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.NOPCacheValidity;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -65,7 +65,6 @@
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.transformation.AbstractTransformer;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.xml.sax.Attributes;
No revision
No revision
1.4.2.2 +7 -15
xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/TestAction.java
Index: TestAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/TestAction.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- TestAction.java 17 Nov 2002 19:10:07 -0000 1.4.2.1
+++ TestAction.java 30 Jan 2003 16:20:15 -0000 1.4.2.2
@@ -51,28 +51,20 @@
package org.apache.cocoon.acting.modular;
-import org.apache.avalon.framework.activity.Initializable;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.avalon.framework.component.ComponentSelector;
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.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.component.ComponentSelector;
-
-import org.apache.cocoon.Constants;
import org.apache.cocoon.acting.ComposerAction;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
-
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.components.modules.output.OutputModule;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
/** Demo action that uses componentized input / output layer. In order
* to stop combinatorial explosion of actions, matchers, and selectors
@@ -206,7 +198,7 @@
}
if (getLogger().isDebugEnabled()) getLogger().debug("... end");
}
- return this.EMPTY_MAP;
+ return EMPTY_MAP;
}
}
1.5.2.1 +2 -11
xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseSelectAction.java
Index: DatabaseSelectAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseSelectAction.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- DatabaseSelectAction.java 25 Aug 2002 08:54:29 -0000 1.5
+++ DatabaseSelectAction.java 30 Jan 2003 16:20:15 -0000 1.5.2.1
@@ -51,24 +51,15 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
-import java.sql.Clob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Struct;
-import java.sql.Types;
-
-import java.io.InputStream;
-import java.io.BufferedInputStream;
-
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.cocoon.util.JDBCTypeConversions;
/**
1.5.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseAddAction.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- DatabaseAddAction.java 25 Aug 2002 08:54:29 -0000 1.5
+++ DatabaseAddAction.java 30 Jan 2003 16:20:15 -0000 1.5.2.1
@@ -51,18 +51,16 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.cocoon.util.HashMap;
+import java.sql.Statement;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.cocoon.components.modules.database.AutoIncrementModule;
/**
1.3.2.1 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseUpdateAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- DatabaseUpdateAction.java 28 May 2002 13:42:50 -0000 1.3
+++ DatabaseUpdateAction.java 30 Jan 2003 16:20:15 -0000 1.3.2.1
@@ -51,11 +51,10 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
1.2.2.1 +2 -12
xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseQueryAction.java
Index: DatabaseQueryAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseQueryAction.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- DatabaseQueryAction.java 9 Aug 2002 08:25:29 -0000 1.2
+++ DatabaseQueryAction.java 30 Jan 2003 16:20:15 -0000 1.2.2.1
@@ -51,26 +51,16 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
-import java.sql.Clob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.sql.Struct;
-import java.sql.Types;
-
-import java.io.InputStream;
-import java.io.BufferedInputStream;
-
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import org.apache.cocoon.util.JDBCTypeConversions;
/**
* Executes an arbitrary query. The query is associated with a table
1.3.2.1 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseDeleteAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- DatabaseDeleteAction.java 28 May 2002 13:42:50 -0000 1.3
+++ DatabaseDeleteAction.java 30 Jan 2003 16:20:15 -0000 1.3.2.1
@@ -51,11 +51,10 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
1.8.2.4 +6 -39
xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseAction.java
Index: DatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/Attic/DatabaseAction.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- DatabaseAction.java 20 Jan 2003 17:11:07 -0000 1.8.2.3
+++ DatabaseAction.java 30 Jan 2003 16:20:15 -0000 1.8.2.4
@@ -52,63 +52,30 @@
package org.apache.cocoon.acting.modular;
import java.io.IOException;
-import java.io.InputStream;
-import java.lang.Class;
-import java.net.URL;
import java.sql.Connection;
import java.sql.PreparedStatement;
-import java.sql.Statement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Map;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.ListIterator;
-import java.util.Enumeration;
-import java.util.Collections;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.io.IOException;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
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.ComponentSelector;
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.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.component.DefaultRoleManager;
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-
-
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.classloader.RepositoryClassLoader;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.util.HashMap;
-import org.apache.cocoon.util.JDBCTypeConversions;
-import org.apache.cocoon.selection.Selector;
-
import org.apache.cocoon.acting.AbstractComplementaryConfigurableAction;
import org.apache.cocoon.components.modules.database.AutoIncrementModule;
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.components.modules.output.OutputModule;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.HashMap;
+import org.apache.cocoon.util.JDBCTypeConversions;
/**
* Abstract action for common function needed by database actions.
No revision
No revision
1.11.2.1 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Constants.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- Constants.java 6 Mar 2002 03:11:30 -0000 1.11
+++ Constants.java 30 Jan 2003 16:20:16 -0000 1.11.2.1
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon;
-import java.util.Map;
/**
* The <code>Constants</code> use throughout the core of the Cocoon engine.
1.7.2.2 +1 -9 xml-cocoon2/src/java/org/apache/cocoon/Attic/Notification.java
Index: Notification.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Attic/Notification.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- Notification.java 15 Jul 2002 14:52:58 -0000 1.7.2.1
+++ Notification.java 30 Jan 2003 16:20:16 -0000 1.7.2.2
@@ -52,14 +52,6 @@
import org.apache.cocoon.components.notification.SimpleNotifyingBean;
-import org.apache.avalon.framework.CascadingThrowable;
-import org.xml.sax.SAXException;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Generates an XML representation of the current notification.
1.6.2.1 +9 -1 xml-cocoon2/src/java/org/apache/cocoon/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Processor.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Processor.java 22 Feb 2002 07:03:48 -0000 1.6
+++ Processor.java 30 Jan 2003 16:20:17 -0000 1.6.2.1
@@ -51,6 +51,7 @@
package org.apache.cocoon;
import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
@@ -86,4 +87,11 @@
StreamPipeline pipeline,
EventPipeline eventPipeline)
throws Exception;
+
+ /**
+ * Get the sitemap component configurations
+ * @since 2.0.5
+ */
+ Configuration getComponentConfigurations();
+
}
1.17.2.2 +11 -30 xml-cocoon2/src/java/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -r1.17.2.1 -r1.17.2.2
--- Main.java 7 Jun 2002 09:34:22 -0000 1.17.2.1
+++ Main.java 30 Jan 2003 16:20:17 -0000 1.17.2.2
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon;
+import java.io.*;
+import java.util.*;
+
import org.apache.avalon.excalibur.cli.CLArgsParser;
import org.apache.avalon.excalibur.cli.CLOption;
import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
@@ -69,27 +72,6 @@
import org.apache.log.Logger;
import org.apache.log.Priority;
-import java.io.BufferedReader;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
/**
* Command line entry point.
*
@@ -374,7 +356,6 @@
subcontext.put("context-root", contextDir);
logKitManager.contextualize(subcontext);
logKitManager.configure(logKitConf);
- logKitManager = logKitManager;
if (logger != null) {
log = logKitManager.getLogger(logger);
} else {
@@ -551,7 +532,7 @@
log.info("Warming up...");
log.info(" [Cocoon might need to compile the sitemaps, this might take a
while]");
//cocoon.process(new LinkSamplingEnvironment("/", context, attributes,
null));
- cocoon.generateSitemap(new LinkSamplingEnvironment("/", context,
attributes, null, this.log));
+ cocoon.generateSitemap(new LinkSamplingEnvironment("/", context,
attributes, null, Main.log));
}
/**
@@ -645,7 +626,7 @@
public void processXSP(String uri) throws Exception {
String markupLanguage = "xsp";
String programmingLanguage = "java";
- Environment env = new LinkSamplingEnvironment("/", context, attributes,
null, this.log);
+ Environment env = new LinkSamplingEnvironment("/", context, attributes,
null, Main.log);
cocoon.precompile(uri, env, markupLanguage, programmingLanguage);
}
@@ -658,7 +639,7 @@
public void processXMAP(String uri) throws Exception {
String markupLanguage = "sitemap";
String programmingLanguage = "java";
- Environment env = new LinkSamplingEnvironment("/", context, attributes,
null, this.log);
+ Environment env = new LinkSamplingEnvironment("/", context, attributes,
null, Main.log);
cocoon.precompile(uri, env, markupLanguage, programmingLanguage);
}
@@ -776,7 +757,7 @@
log.info(" [" + type + "]--> " + filename);
}
} catch (ResourceNotFoundException rnfe) {
- this.log.warn("Could not process URI: " + deparameterizedURI);
+ Main.log.warn("Could not process URI: " + deparameterizedURI);
}
return absoluteLinks;
@@ -891,7 +872,7 @@
context,
attributes,
parameters,
- this.log);
+ Main.log);
cocoon.process(env);
return env.getLinks();
}
@@ -913,7 +894,7 @@
parameters,
links,
stream,
- this.log);
+ Main.log);
cocoon.process(env);
return env.getContentType();
}
@@ -941,7 +922,7 @@
parameters,
empty,
new NullOutputStream(),
- this.log);
+ Main.log);
cocoon.process(env);
return env.getContentType();
}
1.6.2.1 +9 -1 xml-cocoon2/src/java/org/apache/cocoon/ProcessorWrapper.java
Index: ProcessorWrapper.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/ProcessorWrapper.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- ProcessorWrapper.java 22 Feb 2002 07:03:48 -0000 1.6
+++ ProcessorWrapper.java 30 Jan 2003 16:20:17 -0000 1.6.2.1
@@ -52,6 +52,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
@@ -93,5 +94,12 @@
EventPipeline eventPipeline)
throws Exception {
return this.processor.process(environment, pipeline, eventPipeline);
+ }
+
+ /**
+ * Get the sitemap component configurations
+ */
+ public Configuration getComponentConfigurations() {
+ return this.processor.getComponentConfigurations();
}
}
No revision
No revision
1.4.2.4 +21 -12
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- TreeProcessor.java 4 Aug 2002 04:11:52 -0000 1.4.2.3
+++ TreeProcessor.java 30 Jan 2003 16:20:18 -0000 1.4.2.4
@@ -50,34 +50,29 @@
*/
package org.apache.cocoon.components.treeprocessor;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.avalon.excalibur.component.RoleManageable;
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.logger.LogKitManageable;
import org.apache.avalon.excalibur.logger.LogKitManager;
-
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-
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.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Recomposable;
-
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.configuration.NamespacedSAXConfigurationHandler;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
-
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.components.ExtendedComponentSelector;
@@ -92,9 +87,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
-import java.io.InputStream;
-import java.util.*;
-
/**
* Interpreted tree-traversal implementation of a pipeline assembly language.
*
@@ -149,6 +141,9 @@
protected SourceHandler sourceHandler;
+ /** component configurations */
+ protected Configuration componentConfigurations;
+
/**
* Create a TreeProcessor.
*/
@@ -334,6 +329,20 @@
CocoonComponentManager.leaveEnvironment();
environment.setSourceHandler(oldSourceHandler);
}
+ }
+
+ /**
+ * Set the sitemap component configurations
+ */
+ public void setComponentConfigurations(Configuration componentConfigurations) {
+ this.componentConfigurations = componentConfigurations;
+ }
+
+ /**
+ * Get the sitemap component configurations
+ */
+ public Configuration getComponentConfigurations() {
+ return this.componentConfigurations;
}
protected synchronized void setupRootNode(Environment env) throws Exception {
No revision
No revision
1.4.2.1 +2 -12
xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingContentHandler.java
Index: LoggingContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingContentHandler.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- LoggingContentHandler.java 22 Feb 2002 07:03:58 -0000 1.4
+++ LoggingContentHandler.java 30 Jan 2003 16:20:18 -0000 1.4.2.1
@@ -50,21 +50,11 @@
*/
package org.apache.cocoon.xml;
-import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.ContentHandler;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Map;
/**
* Logging content handler logs all events going through to the logger.
No revision
No revision
1.6.2.2 +4 -5
xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- ServerPagesAction.java 7 Jun 2002 09:34:23 -0000 1.6.2.1
+++ ServerPagesAction.java 30 Jan 2003 16:20:18 -0000 1.6.2.2
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.acting;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.excalibur.component.ComponentHandler;
import org.apache.avalon.excalibur.logger.LogKitManageable;
import org.apache.avalon.excalibur.logger.LogKitManager;
@@ -58,7 +61,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamFragment;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -67,9 +69,6 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.generation.ServerPagesGenerator;
import org.apache.cocoon.xml.AbstractXMLConsumer;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Allows actions to be written in XSP. This allows to use XSP to produce
1.7.2.1 +3 -6
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- SessionInvalidatorAction.java 22 Feb 2002 06:59:26 -0000 1.7
+++ SessionInvalidatorAction.java 30 Jan 2003 16:20:18 -0000 1.7.2.1
@@ -50,18 +50,15 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* This is the action used to invalidate an HTTP session. The action returns
1.6.2.1 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParamAction.java
Index: RequestParamAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- RequestParamAction.java 22 Feb 2002 06:59:26 -0000 1.6
+++ RequestParamAction.java 30 Jan 2003 16:20:18 -0000 1.6.2.1
@@ -53,17 +53,16 @@
/*
* Standard imports
*/
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
/**
* This action makes some request details available to the sitemap via parameter
1.8.2.1 +8 -11
xml-cocoon2/src/java/org/apache/cocoon/acting/Attic/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/Attic/ScriptAction.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- ScriptAction.java 22 Feb 2002 06:59:26 -0000 1.8
+++ ScriptAction.java 30 Jan 2003 16:20:18 -0000 1.8.2.1
@@ -52,25 +52,22 @@
// Cocoon imports
-import com.ibm.bsf.BSFException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import com.ibm.bsf.BSFManager;
import com.ibm.bsf.util.IOUtils;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.io.FileNotFoundException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* A simple action that executes any script that can be run by the BSF
1.6.2.1 +3 -4 xml-cocoon2/src/java/org/apache/cocoon/acting/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/HelloAction.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- HelloAction.java 22 Feb 2002 06:59:26 -0000 1.6
+++ HelloAction.java 30 Jan 2003 16:20:18 -0000 1.6.2.1
@@ -50,16 +50,15 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
* A simple Action that tracks if a <code>Session</code> object
1.7.2.1 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
Index: RequestParameterExistsAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- RequestParameterExistsAction.java 22 Feb 2002 06:59:26 -0000 1.7
+++ RequestParameterExistsAction.java 30 Jan 2003 16:20:18 -0000 1.7.2.1
@@ -53,11 +53,11 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
-import java.util.Iterator;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
1.7.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java
Index: SessionIsValidAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- SessionIsValidAction.java 21 Mar 2002 04:09:19 -0000 1.7
+++ SessionIsValidAction.java 30 Jan 2003 16:20:18 -0000 1.7.2.1
@@ -50,17 +50,15 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.Map;
/**
1.7.2.2 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- SessionPropagatorAction.java 11 Sep 2002 12:43:58 -0000 1.7.2.1
+++ SessionPropagatorAction.java 30 Jan 2003 16:20:18 -0000 1.7.2.2
@@ -50,20 +50,19 @@
*/
package org.apache.cocoon.acting;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* This is the action used to propagate parameters into session. It
1.5.2.2 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- ResourceExistsAction.java 22 Oct 2002 01:52:23 -0000 1.5.2.1
+++ ResourceExistsAction.java 30 Jan 2003 16:20:19 -0000 1.5.2.2
@@ -50,15 +50,13 @@
*/
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* This action simply checks to see if a given resource exists. It checks
1.6.2.3 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java
Index: SessionStateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- SessionStateAction.java 22 Oct 2002 02:10:56 -0000 1.6.2.2
+++ SessionStateAction.java 30 Jan 2003 16:20:19 -0000 1.6.2.3
@@ -50,19 +50,18 @@
*/
package org.apache.cocoon.acting;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Store the session's current state in a session attribute.
No revision
No revision
1.7.2.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/caching/Attic/DeltaTimeCacheValidity.java
Index: DeltaTimeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/Attic/DeltaTimeCacheValidity.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- DeltaTimeCacheValidity.java 21 Apr 2002 17:29:49 -0000 1.7.2.1
+++ DeltaTimeCacheValidity.java 30 Jan 2003 16:20:19 -0000 1.7.2.2
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.caching;
-import java.util.Date;
-import java.lang.Math;
/**
* A validation object that remains valid for a specified amount of time.
1.5.2.3 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/caching/PipelineCacheKey.java
Index: PipelineCacheKey.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/PipelineCacheKey.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- PipelineCacheKey.java 8 Aug 2002 02:55:22 -0000 1.5.2.2
+++ PipelineCacheKey.java 30 Jan 2003 16:20:19 -0000 1.5.2.3
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.caching;
-import java.util.ArrayList;
-import java.util.List;
/**
* This is the cache key for one pipeline. It consists of one
No revision
No revision
1.13.2.10 +39 -6
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.13.2.9
retrieving revision 1.13.2.10
diff -u -r1.13.2.9 -r1.13.2.10
--- CocoonComponentManager.java 6 Dec 2002 09:20:01 -0000 1.13.2.9
+++ CocoonComponentManager.java 30 Jan 2003 16:20:20 -0000 1.13.2.10
@@ -57,6 +57,7 @@
import java.util.List;
import java.util.Map;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
+import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -86,6 +87,9 @@
extends ExcaliburComponentManager
{
+ /** The {@link RoleManager} */
+ private RoleManager roleManager;
+
/** The key used to store the current process environment */
private static final String PROCESS_KEY =
"org.apache.cocoon.components.CocoonComponentManager";
@@ -132,8 +136,7 @@
EnvironmentDescription desc =
(EnvironmentDescription)objectModel.get(PROCESS_KEY);
if ( null != desc ) {
- // this is only for 2.1
- // desc.addSitemapConfiguration(processor.getComponentConfigurations());
+ desc.addSitemapConfiguration(processor.getComponentConfigurations());
}
}
@@ -146,8 +149,7 @@
final Object[] objects = (Object[])stack.pop();
EnvironmentDescription desc =
(EnvironmentDescription)((Environment)objects[0]).getObjectModel().get(PROCESS_KEY);
if ( null != desc ) {
- // this is only for 2.1
- //desc.removeLastSitemapConfiguration();
+ desc.removeLastSitemapConfiguration();
}
}
}
@@ -207,6 +209,14 @@
}
/**
+ * Configure the RoleManager
+ */
+ public void setRoleManager( final RoleManager roles ) {
+ super.setRoleManager( roles );
+ this.roleManager = roles;
+ }
+
+ /**
* Return an instance of a component based on a Role. The Role is usually the
Interface's
* Fully Qualified Name(FQN)--unless there are multiple Components for the same
Role. In that
* case, the Role's FQN is appended with "Selector", and we return a
ComponentSelector.
@@ -249,7 +259,30 @@
((Recomposable) component).recompose(this);
}
((RequestLifecycleComponent)
component).setup((org.apache.cocoon.environment.SourceResolver)objects[0],
- objectModel);
+ objectModel);
+ if (component instanceof SitemapConfigurable) {
+ List configs = desc.getSitemapConfigurations();
+ for(int i=0; i < configs.size(); i++) {
+ Configuration parent =
(Configuration)configs.get(i);
+ Configuration cc = parent.getChild( role, false );
+ if ( null != cc ) {
+ ((SitemapConfigurable)
component).setSitemapConfiguration(cc);
+ } else if ( null != this.roleManager) {
+
+ // check for hint
+ Configuration[] childs = parent.getChildren();
+ if ( null != childs ) {
+ for(int m = 0; m < childs.length; m++) {
+ final String r =
this.roleManager.getRoleForName(childs[m].getName());
+ if ( role.equals(r) ) {
+ ((SitemapConfigurable)
component).setSitemapConfiguration(childs[m]);
+ m = childs.length;
+ }
+ }
+ }
+ }
+ }
+ }
} catch (Exception local) {
throw new ComponentException(role, "Exception during setup
of RequestLifecycleComponent.", local);
}
No revision
No revision
1.4.2.1 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/components/SitemapConfigurable.java
Index: SitemapConfigurable.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/SitemapConfigurable.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
No revision
No revision
1.4.2.3 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- SVGBuilder.java 21 Sep 2002 17:31:41 -0000 1.4.2.2
+++ SVGBuilder.java 30 Jan 2003 16:20:21 -0000 1.4.2.3
@@ -53,8 +53,6 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.XMLResourceDescriptor;
-
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.log.Logger;
import org.w3c.dom.Document;
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/src/java/org/apache/cocoon/xml/dom/NodeListImpl.java
Index: NodeListImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/NodeListImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.11.2.1 +8 -7 xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java
Index: DOMUtil.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- DOMUtil.java 22 Jan 2003 12:42:24 -0000 1.11
+++ DOMUtil.java 30 Jan 2003 16:20:21 -0000 1.11.2.1
@@ -52,12 +52,12 @@
import org.apache.excalibur.source.SourceParameters;
import org.apache.xpath.XPathAPI;
-import org.apache.excalibur.xml.xpath.XPathProcessor;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.xpath.XPathUtil;
+import org.apache.cocoon.components.xpath.XPathProcessor;
+import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.xml.XMLizable;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.excalibur.xml.sax.SAXParser;
-import org.apache.excalibur.xml.sax.XMLizable;
import org.w3c.dom.*;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -253,7 +253,7 @@
* has more than one root node. This xml is parsed by the
* specified parser instance and a DOM DocumentFragment is created.
*/
- public static DocumentFragment getDocumentFragment(SAXParser parser,
+ public static DocumentFragment getDocumentFragment(Parser parser,
Reader stream)
throws ProcessingException {
DocumentFragment frag = null;
@@ -297,7 +297,8 @@
builder.startElement("", "root", "root", new AttributesImpl());
IncludeXMLConsumer filter = new IncludeXMLConsumer(builder, builder);
- parser.parse(input, filter);
+ parser.setConsumer(filter);
+ parser.parse(input);
builder.endElement("", "root", "root");
builder.endDocument();
No revision
No revision
1.3.2.1 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathUtil.java
Index: XPathUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathUtil.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- XPathUtil.java 30 Jan 2003 16:08:04 -0000 1.3
+++ XPathUtil.java 30 Jan 2003 16:20:21 -0000 1.3.2.1
@@ -90,7 +90,7 @@
* @return The node specified by the path.
* @throws ProcessingException If no path is specified or the XPath engine
fails.
*/
- public static Node getSingleNode(org.apache.excalibur.xml.xpath.XPathProcessor
processor,
+ public static Node getSingleNode(XPathProcessor processor,
Node rootNode,
String path)
throws ProcessingException {
@@ -213,7 +213,7 @@
* @return The first node found that matches the XPath, or null.
*
*/
- public static Node
searchSingleNode(org.apache.excalibur.xml.xpath.XPathProcessor processor,
+ public static Node searchSingleNode(XPathProcessor processor,
Node contextNode,
String str) {
String[] pathComponents = buildPathArray(str);
@@ -233,7 +233,7 @@
* @return A NodeList, should never be null.
*
*/
- public static NodeList
searchNodeList(org.apache.excalibur.xml.xpath.XPathProcessor processor,
+ public static NodeList searchNodeList(XPathProcessor processor,
Node contextNode,
String str) {
String[] pathComponents = buildPathArray(str);
No revision
No revision
1.14.2.4 +10 -1
xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/Handler.java
Index: Handler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/Handler.java,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -r1.14.2.3 -r1.14.2.4
--- Handler.java 21 Sep 2002 03:01:13 -0000 1.14.2.3
+++ Handler.java 30 Jan 2003 16:20:21 -0000 1.14.2.4
@@ -54,6 +54,7 @@
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.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -380,4 +381,12 @@
public void release( final org.apache.excalibur.source.Source source ) {
throw new RuntimeException("Handler.release() is not implemented yet.");
}
+
+ /**
+ * Get the sitemap component configurations
+ */
+ public Configuration getComponentConfigurations() {
+ return null;
+ }
+
}
1.10.2.2 +9 -1
xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/SitemapManager.java
Index: SitemapManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/SitemapManager.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- SitemapManager.java 21 Sep 2002 03:01:13 -0000 1.10.2.1
+++ SitemapManager.java 30 Jan 2003 16:20:21 -0000 1.10.2.2
@@ -168,4 +168,12 @@
this.sitemapHandler = null;
super.dispose();
}
+
+ /**
+ * Get the sitemap component configurations
+ */
+ public Configuration getComponentConfigurations() {
+ return null;
+ }
+
}
No revision
No revision
1.1.2.2 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
Index: ParametersRecorder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ParametersRecorder.java 7 Jun 2002 09:34:24 -0000 1.1.2.1
+++ ParametersRecorder.java 30 Jan 2003 16:20:21 -0000 1.1.2.2
@@ -51,11 +51,9 @@
package org.apache.cocoon.transformation.helpers;
import java.util.Iterator;
-import java.util.Map;
-import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.parameters.Parameters;
-
+import org.apache.excalibur.source.SourceParameters;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
