You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@locus.apache.org on 2000/08/04 23:12:22 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/transformation AbstractTransformer.java LogTransformer.java SQLTransformer.java Transformer.java XIncludeTransformer.java XalanTransformer.java
giacomo 00/08/04 14:12:21
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
Processor.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 ProgramGenerator.java
ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
MarkupLanguage.java
src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPGenerator.java XSPRequestHelper.java
XSPResponseHelper.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 request.xsl response.xsl xsp.xsl
src/org/apache/cocoon/environment Tag: xml-cocoon2
Environment.java
src/org/apache/cocoon/environment/http Tag: xml-cocoon2
HttpEnvironment.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
AbstractGenerator.java AbstractServerPage.java
DirectoryGenerator.java FileGenerator.java
Generator.java PhpGenerator.java
RequestGenerator.java ServerPagesGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2
AuthenticationMatcher.java
FileAuthenticationMatcher.java Matcher.java
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
AbstractReader.java Reader.java ResourceReader.java
src/org/apache/cocoon/selection Tag: xml-cocoon2
Selector.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
AbstractSerializer.java FO2PDFSerializer.java
HTMLSerializer.java ImageSerializer.java
SVGSerializer.java Serializer.java
XMLSerializer.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java ResourcePipeline.java
SitemapHandler.java SitemapManager.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
AbstractTransformer.java LogTransformer.java
SQLTransformer.java Transformer.java
XIncludeTransformer.java XalanTransformer.java
Added: src/org/apache/cocoon/generation Tag: xml-cocoon2
ServletGenerator.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
SitemapModelComponent.java
SitemapOutputComponent.java
Removed: src/org/apache/cocoon/sitemap Tag: xml-cocoon2
SitemapComponent.java
Log:
Changing component API for Generators, Transformers, Readers, Matchers, Selectors and Serializers.
Improving the sitemap with patches from Carten Ziegeler.
Revision Changes Path
No revision
No revision
1.4.2.17 +4 -5 xml-cocoon/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.4.2.16
retrieving revision 1.4.2.17
diff -u -r1.4.2.16 -r1.4.2.17
--- Cocoon.java 2000/07/28 16:20:00 1.4.2.16
+++ Cocoon.java 2000/08/04 21:11:03 1.4.2.17
@@ -40,7 +40,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.4.2.16 $ $Date: 2000/07/28 16:20:00 $
+ * @version CVS $Revision: 1.4.2.17 $ $Date: 2000/08/04 21:11:03 $
*/
public class Cocoon
implements Component, Configurable, ComponentManager, Modifiable,
@@ -168,16 +168,15 @@
}
/**
- * Process the given <code>Environment</code> producing the output to the
- * specified <code>OutputStream</code>.
+ * Process the given <code>Environment</code> producing the output
*/
- public boolean process(Environment environment, OutputStream out)
+ public boolean process(Environment environment)
throws Exception {
String s = environment.resolveEntity(null,this.sitemapFileName).getSystemId();
URL url = new URL (s);
s = url.getFile();
return this.sitemapManager.invoke (environment, "",
- s, true, out);
+ s, true);
}
/** Get a new class */
1.1.2.6 +3 -4 xml-cocoon/src/org/apache/cocoon/Attic/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Processor.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Processor.java 2000/07/27 21:48:31 1.1.2.5
+++ Processor.java 2000/08/04 21:11:04 1.1.2.6
@@ -18,13 +18,12 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/27 21:48:31 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:04 $
*/
public interface Processor {
/**
- * Process the given <code>Environment</code> producing the output to the
- * specified <code>OutputStream</code>.
+ * Process the given <code>Environment</code> producing the output
*/
- public boolean process(Environment environment, OutputStream out)
+ public boolean process(Environment environment)
throws Exception;
}
No revision
No revision
1.1.2.6 +4 -3 xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java
Index: ProgramGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ProgramGenerator.java 2000/07/27 21:48:37 1.1.2.5
+++ ProgramGenerator.java 2000/08/04 21:11:08 1.1.2.6
@@ -9,14 +9,15 @@
import java.io.File;
import org.apache.avalon.Component;
-import org.apache.cocoon.environment.Environment;
+import org.xml.sax.EntityResolver;
+
/**
* This interface defines a loader for programs automatically built from XML
* documents writeen in a <code>MarkupLanguage</code>
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/27 21:48:37 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:08 $
*/
public interface ProgramGenerator extends Component {
/**
@@ -33,6 +34,6 @@
*/
public Object load(
File file, String markupLanguage, String programmingLanguage,
- Environment environment
+ EntityResolver resolver
) throws Exception;
}
1.1.2.7 +4 -5 xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ProgramGeneratorImpl.java 2000/07/27 21:48:37 1.1.2.6
+++ ProgramGeneratorImpl.java 2000/08/04 21:11:09 1.1.2.7
@@ -21,8 +21,6 @@
import org.apache.avalon.utils.Parameters;
-import org.apache.cocoon.environment.Environment;
-
import org.apache.cocoon.components.store.MemoryStore;
import org.apache.cocoon.components.store.FilesystemStore;
@@ -39,6 +37,7 @@
import org.xml.sax.InputSource;
+import org.xml.sax.EntityResolver;
import org.apache.avalon.Component;
import java.io.IOException;
@@ -49,7 +48,7 @@
* The default implementation of <code>ProgramGenerator</code>
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/07/27 21:48:37 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/04 21:11:09 $
*/
public class ProgramGeneratorImpl
implements ProgramGenerator, Composer, Configurable
@@ -113,7 +112,7 @@
*/
public Object load(
File file, String markupLanguageName, String programmingLanguageName,
- Environment environment
+ EntityResolver resolver
) throws Exception {
// Get markup and programming languages
MarkupLanguage markupLanguage = (MarkupLanguage)
@@ -183,7 +182,7 @@
DOMUtils.DOMParse(new InputSource(new FileReader(file)));
String encoding = markupLanguage.getEncoding(document);
String code = markupLanguage.generateCode(
- document, normalizedName, programmingLanguage, environment
+ document, normalizedName, programmingLanguage, resolver
);
// Format source code if applicable
No revision
No revision
1.1.2.5 +6 -9 xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractMarkupLanguage.java 2000/07/27 21:48:40 1.1.2.4
+++ AbstractMarkupLanguage.java 2000/08/04 21:11:12 1.1.2.5
@@ -35,7 +35,6 @@
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.components.store.MemoryStore;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
@@ -50,7 +49,7 @@
* (as opposed to Cocoon2's standard SAX events)
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/27 21:48:40 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/04 21:11:12 $
*/
public abstract class AbstractMarkupLanguage
extends AbstractNamedComponent
@@ -250,7 +249,7 @@
*/
public String generateCode(
Document document, String filename, ProgrammingLanguage programmingLanguage,
- Environment environment
+ EntityResolver resolver
) throws Exception {
String languageName = programmingLanguage.getName();
@@ -272,7 +271,7 @@
// Add user-defined logicsheets
String[] logicsheetNames = this.getLogicsheets(document);
for (int i = 0; i < logicsheetNames.length; i++) {
- this.addLogicsheet(codeGenerator, logicsheetNames[i], document, environment);
+ this.addLogicsheet(codeGenerator, logicsheetNames[i], document, resolver);
}
// Add namespace-mapped logicsheets
@@ -288,13 +287,13 @@
String namedLogicsheetName = language.getNamedLogicsheet(prefix);
if (namedLogicsheetName != null) {
- this.addLogicsheet(codeGenerator, namedLogicsheetName, document, environment);
+ this.addLogicsheet(codeGenerator, namedLogicsheetName, document, resolver);
}
}
}
// Add language-specific logicsheet (always last!)
- this.addLogicsheet(codeGenerator, language.getLogicsheet(), document, environment);
+ this.addLogicsheet(codeGenerator, language.getLogicsheet(), document, resolver);
return codeGenerator.generateCode(document, filename);
}
@@ -313,15 +312,13 @@
LogicsheetCodeGenerator codeGenerator,
String logicsheetLocation,
Document document,
- Environment environemnt
+ EntityResolver entityResolver
) throws MalformedURLException, IOException, SAXException
{
String systemId = null;
InputSource inputSource = null;
if (logicsheetLocation.indexOf(":/") < 0) { // Relative to Cocoon root
- EntityResolver entityResolver =
- (EntityResolver) this.manager.getComponent("cocoon");
inputSource = entityResolver.resolveEntity(null, logicsheetLocation);
systemId = inputSource.getSystemId();
} else { // Fully resolved URL
1.1.2.5 +4 -3 xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java
Index: MarkupLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- MarkupLanguage.java 2000/07/27 21:48:40 1.1.2.4
+++ MarkupLanguage.java 2000/08/04 21:11:12 1.1.2.5
@@ -10,16 +10,17 @@
import org.w3c.dom.Document;
import org.apache.avalon.NamedComponent;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
+import org.xml.sax.EntityResolver;
+
/**
* This interface defines a markup language whose instance documents are to be
* translated into an executable program capable or rebuilding the original
* document augmenting it with dynamic content
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/27 21:48:40 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/04 21:11:12 $
*/
public interface MarkupLanguage extends NamedComponent {
/**
@@ -42,6 +43,6 @@
*/
public String generateCode(
Document document, String filename, ProgrammingLanguage programmingLanguage,
- Environment environment
+ EntityResolver resolver
) throws Exception;
}
No revision
No revision
1.1.2.19 +36 -17 xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- sitemap.xsl 2000/08/02 22:48:28 1.1.2.18
+++ sitemap.xsl 2000/08/04 21:11:14 1.1.2.19
@@ -2,7 +2,7 @@
<!-- Sitemap Core logicsheet for the Java language -->
<!--
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2000/08/02 22:48:28 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2000/08/04 21:11:14 $
-->
<xsl:stylesheet
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.ArrayList;
+ import java.util.Dictionary;
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
@@ -114,7 +115,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:value-of select="java:getClassSource($factory-loader,string($factory),string($matcher-name),string(@pattern),$config)"/>
- private List <xsl:value-of select="$matcher-name"/> (String pattern, Environment environment) {
+ private List <xsl:value-of select="$matcher-name"/> (String pattern, Dictionary objectModel) {
<xsl:value-of select="java:getMethodSource($factory-loader,string($factory),string($matcher-name),string(@pattern),$config)"/>
}
</xsl:for-each>
@@ -134,7 +135,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:value-of select="java:getClassSource($factory-loader,string($factory),string($selector-name),string(@pattern),$config)"/>
- private boolean <xsl:value-of select="$selector-name"/> (String pattern, Environment environment) {
+ private boolean <xsl:value-of select="$selector-name"/> (String pattern, Dictionary objectModel) {
<xsl:value-of select="java:getMethodSource($factory-loader,string($factory),string($selector-name),string(@pattern),$config)"/>
}
</xsl:for-each>
@@ -210,7 +211,7 @@
<xsl:for-each select="/map:sitemap/map:resources/map:resource">
private boolean resource_<xsl:value-of select="translate(@name, '- ', '__')"/> (ResourcePipeline pipeline,
- List listOfLists, Environment environment, OutputStream out)
+ List listOfLists, Environment environment)
throws Exception {
List list = null;
Parameters param = null;
@@ -221,7 +222,7 @@
/**
* Process to producing the output to the specified >code<OutputStream>/code<.
*/
- public boolean process(Environment environment, OutputStream out)
+ public boolean process(Environment environment)
throws Exception {
ResourcePipeline pipeline = new ResourcePipeline ();
pipeline.setComponentManager (this.manager);
@@ -236,7 +237,7 @@
<xsl:choose>
<xsl:when test="(./map:handle-errors)">
try {
- return error_process_<xsl:value-of select="$pipeline-position"/> (environment, out, e);
+ return error_process_<xsl:value-of select="$pipeline-position"/> (environment, e);
} catch (Exception ex) {
System.out.println (ex.toString());
ex.printStackTrace(System.out);
@@ -255,7 +256,7 @@
<xsl:for-each select="/map:sitemap/map:pipelines/map:pipeline">
<xsl:variable name="pipeline-position" select="position()"/>
<xsl:if test="(./map:handle-errors)">
- private boolean error_process_<xsl:value-of select="$pipeline-position"/> (Environment environment, OutputStream out, Exception e)
+ private boolean error_process_<xsl:value-of select="$pipeline-position"/> (Environment environment, Exception e)
throws Exception {
ResourcePipeline pipeline = new ResourcePipeline ();
pipeline.setComponentManager (this.manager);
@@ -309,7 +310,7 @@
</xsl:choose>
</xsl:for-each>
</xsl:variable>
- if ((list = <xsl:value-of select="$matcher-name"/> ("<xsl:value-of select="$pattern-value"/>", environment)) != null) {
+ if ((list = <xsl:value-of select="$matcher-name"/> ("<xsl:value-of select="$pattern-value"/>", environment.getObjectModel())) != null) {
listOfLists.add (list);
<xsl:apply-templates/>
}
@@ -351,7 +352,7 @@
</xsl:choose>
</xsl:for-each>
</xsl:variable>
- if (<xsl:value-of select="$selector-name"/> ("<xsl:value-of select="$test-value"/>", environment)) {
+ if (<xsl:value-of select="$selector-name"/> ("<xsl:value-of select="$test-value"/>", environment.getObjectModel())) {
<xsl:apply-templates/>
}
</xsl:for-each>
@@ -386,7 +387,7 @@
<xsl:with-param name="prefix">serializer</xsl:with-param>
<xsl:with-param name="mime-type" select="@mime-type"/>
</xsl:call-template>
- return pipeline.process (environment, out);
+ return pipeline.process (environment);
</xsl:template> <!-- match="map:serialize" -->
<xsl:template match="map:read">
@@ -396,7 +397,7 @@
<xsl:with-param name="prefix">reader</xsl:with-param>
<xsl:with-param name="mime-type" select="@mime-type"/>
</xsl:call-template>
- return pipeline.process (environment, out);
+ return pipeline.process (environment);
</xsl:template> <!-- match="map:read" -->
<xsl:template match="map:mount">
@@ -419,17 +420,17 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="substring(@uri-prefix,string-length(@uri-prefix))='/'">
- return sitemapManager.invoke (environment, substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>"), substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>, out);
+ return sitemapManager.invoke (environment, substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>"), substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>);
</xsl:when>
<xsl:when test="substring(@uri-prefix,string-length(@uri-prefix))='}'">
String uri_prefix<xsl:value-of select="count(.)"/>=substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>");
if (uri_prefix<xsl:value-of select="count(.)"/>.charAt(uri_prefix<xsl:value-of select="count(.)"/>.length()-1)=='/')
- return sitemapManager.invoke (environment, uri_prefix<xsl:value-of select="count(.)"/>, substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>, out);
+ return sitemapManager.invoke (environment, uri_prefix<xsl:value-of select="count(.)"/>, substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>);
else
- return sitemapManager.invoke (environment, uri_prefix<xsl:value-of select="count(.)"/>+"/", substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>, out);
+ return sitemapManager.invoke (environment, uri_prefix<xsl:value-of select="count(.)"/>+"/", substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>);
</xsl:when>
<xsl:otherwise>
- return sitemapManager.invoke (environment, substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>/"), substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>, out);
+ return sitemapManager.invoke (environment, substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>/"), substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of select="$check-reload"/>);
</xsl:otherwise>
</xsl:choose>
</xsl:template> <!-- match="map:mount" -->
@@ -437,11 +438,11 @@
<xsl:template match="map:redirect-to">
<xsl:choose>
<xsl:when test="@resource">
- return resource_<xsl:value-of select="translate(@resource, '- ', '__')"/>(pipeline, listOfLists, environment, out);
+ return resource_<xsl:value-of select="translate(@resource, '- ', '__')"/>(pipeline, listOfLists, environment);
</xsl:when>
<xsl:when test="@uri">
// request.setUri ("<xsl:value-of select="@uri"/>");
- // this.process(environment, out);
+ // this.process(environment);
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="error">
@@ -473,6 +474,18 @@
<xsl:variable name="ns" select="namespace-uri(.)"/>
<xsl:for-each select="$components">
confBuilder.startDocument ();
+ <xsl:if test="$ns">
+ confBuilder.startPrefixMapping("","<xsl:value-of select="namespace-uri(.)"/>");
+ </xsl:if>
+ <!-- Create root configuration -->
+ attr.clear();
+ <xsl:for-each select="attribute::*[name(.)!=$qname]">
+ attr.addAttribute ("", "<xsl:value-of select="local-name(.)"/>",
+ "<xsl:value-of select="name(.)"/>", "CDATA",
+ "<xsl:value-of select="."/>");
+ </xsl:for-each>
+ confBuilder.startElement ("", "<xsl:value-of select="translate(@name, '- ', '__')"/>",
+ "<xsl:value-of select="translate(@name, '- ', '__')"/>", attr);
<xsl:call-template name="nested-config-components">
<xsl:with-param name="name" select="$name"/>
<xsl:with-param name="config-name"><xsl:value-of select="concat(local-name(.),'/',@name)"/></xsl:with-param>
@@ -481,6 +494,12 @@
<xsl:with-param name="type" select="@name"/>
<xsl:with-param name="ns" select="$ns"/>
</xsl:call-template>
+ <!-- end root configuration -->
+ confBuilder.endElement ("", "<xsl:value-of select="translate(@name, '- ', '__')"/>",
+ "<xsl:value-of select="translate(@name, '- ', '__')"/>");
+ <xsl:if test="$ns">
+ confBuilder.endPrefixMapping("");
+ </xsl:if>
confBuilder.endDocument ();
cconf = confBuilder.getConfiguration();
<xsl:value-of select="$name"/>_config_<xsl:value-of select="translate(@name, '- ', '__')"/> = cconf;
No revision
No revision
1.1.2.7 +3 -3 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- XSPGenerator.java 2000/07/29 18:30:29 1.1.2.6
+++ XSPGenerator.java 2000/08/04 21:11:17 1.1.2.7
@@ -17,11 +17,11 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/07/29 18:30:29 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/04 21:11:17 $
*/
public abstract class XSPGenerator extends AbstractServerPage {
/** The XSP Object Model */
- protected Cocoon cocoon;
+ //protected Cocoon cocoon;
protected Parser parser;
// Request and Response are inherited from AbstractGenerator
@@ -34,7 +34,7 @@
public void setComponentManager(ComponentManager manager) {
super.setComponentManager(manager);
- this.cocoon = (Cocoon) this.manager.getComponent("cocoon");
+ //this.cocoon = (Cocoon) this.manager.getComponent("cocoon");
this.parser = (Parser) this.manager.getComponent("parser");
}
}
1.1.2.4 +20 -20 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XSPRequestHelper.java 2000/07/27 21:48:49 1.1.2.3
+++ XSPRequestHelper.java 2000/08/04 21:11:20 1.1.2.4
@@ -9,7 +9,7 @@
import java.util.Enumeration;
-import org.apache.cocoon.environment.http.HttpRequest;
+import javax.servlet.http.HttpServletRequest;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.AttributesImpl;
@@ -17,10 +17,10 @@
import org.xml.sax.SAXException;
/**
- * The XSP <code>HttpRequest</code> object helper
+ * The <code>HttpServletRequest</code> object helper
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/27 21:48:49 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:20 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -32,14 +32,14 @@
}
/**
- * Output the uri associated with the given <code>HttpRequest</code>
+ * Output the uri associated with the given <code>HttpServletRequest</code>
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getUri(
- HttpRequest request,
+ HttpServletRequest request,
ContentHandler contentHandler
)
throws SAXException
@@ -51,12 +51,12 @@
* Return the given request parameter value or a user-provided default if
* none was specified.
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param name The parameter name
* @param defaultValue Value to substitute in absence of a parameter value
*/
public static String getParameter(
- HttpRequest request,
+ HttpServletRequest request,
String name,
String defaultValue
) {
@@ -73,14 +73,14 @@
* Output the given request parameter value or a user-provided default if
* none was specified.
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param contentHandler The SAX content handler
* @param name The parameter name
* @param defaultValue Value to substitute in absence of a parameter value
* @exception SAXException If a SAX error occurs
*/
public static void getParameter(
- HttpRequest request,
+ HttpServletRequest request,
ContentHandler contentHandler,
String name,
String defaultValue
@@ -101,12 +101,12 @@
/**
* Output the request parameter values for a given name
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getParameterValues(
- HttpRequest request,
+ HttpServletRequest request,
ContentHandler contentHandler,
String name
)
@@ -131,12 +131,12 @@
/**
* Output parameter names for a given request
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getParameterNames(
- HttpRequest request,
+ HttpServletRequest request,
ContentHandler contentHandler
)
throws SAXException
@@ -155,11 +155,11 @@
/**
* Return the request header value for a given name
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param name The parameter name
*/
public static String getHeader(
- HttpRequest request,
+ HttpServletRequest request,
String name
) {
return request.getHeader(name);
@@ -168,13 +168,13 @@
/**
* Output the request header value for a given name
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param contentHandler The SAX content handler
* @param name The parameter name
* @exception SAXException If a SAX error occurs
*/
public static void getHeader(
- HttpRequest request,
+ HttpServletRequest request,
ContentHandler contentHandler,
String name
)
@@ -199,12 +199,12 @@
/**
* Output the header names for a given request
*
- * @param request The Cocoon request
+ * @param request The HttpServletRequest request
* @param contentHandler The SAX content handler
* @exception SAXException If a SAX error occurs
*/
public static void getHeaderNames(
- HttpRequest request,
+ HttpServletRequest request,
ContentHandler contentHandler
)
throws SAXException
1.1.2.4 +6 -6 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java
Index: XSPResponseHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XSPResponseHelper.java 2000/07/27 21:48:49 1.1.2.3
+++ XSPResponseHelper.java 2000/08/04 21:11:21 1.1.2.4
@@ -9,7 +9,7 @@
import java.util.Enumeration;
-import org.apache.cocoon.environment.http.HttpResponse;
+import javax.servlet.http.HttpServletResponse;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.AttributesImpl;
@@ -20,7 +20,7 @@
* The XSP <code>HttpResponse</code> object helper
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/27 21:48:49 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:21 $
*/
public class XSPResponseHelper extends XSPObjectHelper {
/**
@@ -34,21 +34,21 @@
/**
* Set the content header for a given response
*
- * @param response The Cocoon <code>HttpResponse</code>
+ * @param response The <code>HttpServletResponse</code>
* @param name The header name
* @param value The header value
*/
- public static void setHeader(HttpResponse response, String name, String value) {
+ public static void setHeader(HttpServletResponse response, String name, String value) {
response.setHeader(name, value);
}
/**
* Set the content type for a given response
*
- * @param response The Cocoon <code>HttpResponse</code>
+ * @param response The <code>HttpServletResponse</code>
* @param type The content type
*/
- public static void setContentType(HttpResponse response, String type) {
+ public static void setContentType(HttpServletResponse response, String type) {
response.setContentType(type);
}
}
No revision
No revision
1.1.2.4 +9 -9 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/request.xsl
Index: request.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/request.xsl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- request.xsl 2000/07/27 21:48:51 1.1.2.3
+++ request.xsl 2000/08/04 21:11:25 1.1.2.4
@@ -27,13 +27,13 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- (this.environment.getUri())
+ (this.request.getRequestURI())
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:uri> -->
<xsp:logic>
- XSPRequestHelper.getUri(((HttpEnvironment)this.environment).getRequest(), this.contentHandler);
+ XSPRequestHelper.getUri(request, this.contentHandler);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -65,13 +65,13 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- (XSPRequestHelper.getParameter(((HttpEnvironment)this.environment).getRequest(), <xsl:copy-of select="$name"/>, <xsl:copy-of select="$default"/>))
+ (XSPRequestHelper.getParameter(request, <xsl:copy-of select="$name"/>, <xsl:copy-of select="$default"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:uri> -->
<xsp:logic>
- XSPRequestHelper.getParameter(((HttpEnvironment)this.environment).getRequest(), this.contentHandler, <xsl:copy-of select="$name"/>, <xsl:copy-of select="$default"/>);
+ XSPRequestHelper.getParameter(request, this.contentHandler, <xsl:copy-of select="$name"/>, <xsl:copy-of select="$default"/>);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -83,13 +83,13 @@
</xsl:variable>
<xsp:logic>
- XSPRequestHelper.getParameterValues(((HttpEnvironment)this.environment).getRequest(), this.contentHandler, <xsl:copy-of select="$name"/>);
+ XSPRequestHelper.getParameterValues(request, this.contentHandler, <xsl:copy-of select="$name"/>);
</xsp:logic>
</xsl:template>
<xsl:template match="xsp-request:get-parameter-names">
<xsp:logic>
- XSPRequestHelper.getParameterNames(((HttpEnvironment)this.environment).getRequest(), this.contentHandler);
+ XSPRequestHelper.getParameterNames(request, this.contentHandler);
</xsp:logic>
</xsl:template>
@@ -107,13 +107,13 @@
<xsl:choose>
<xsl:when test="$as = 'string'">
<xsp:expr>
- (XSPRequestHelper.getHeader(((HttpEnvironment)this.environment).getRequest(), <xsl:copy-of select="$name"/>))
+ (XSPRequestHelper.getHeader(request, <xsl:copy-of select="$name"/>))
</xsp:expr>
</xsl:when>
<xsl:when test="$as = 'xml'">
<!-- <xsp-request:uri> -->
<xsp:logic>
- XSPRequestHelper.getHeader(((HttpEnvironment)this.environment).getRequest(), this.contentHandler, <xsl:copy-of select="$name"/>);
+ XSPRequestHelper.getHeader(request, this.contentHandler, <xsl:copy-of select="$name"/>);
</xsp:logic>
</xsl:when>
</xsl:choose>
@@ -121,7 +121,7 @@
<xsl:template match="xsp-request:get-header-names">
<xsp:logic>
- XSPRequestHelper.getHeaderNames(((HttpEnvironment)this.environment).getRequest(), this.contentHandler);
+ XSPRequestHelper.getHeaderNames(request, this.contentHandler);
</xsp:logic>
</xsl:template>
1.1.2.4 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl
Index: response.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- response.xsl 2000/07/27 21:48:51 1.1.2.3
+++ response.xsl 2000/08/04 21:11:26 1.1.2.4
@@ -42,7 +42,7 @@
</xsl:variable>
<xsp:logic>
- XSPResponseHelper.setHeader(((HttpEnvironment)environment).getResponse(), <xsl:value-of select="$name"/>, <xsl:value-of select="$value"/>);
+ XSPResponseHelper.setHeader(response, <xsl:value-of select="$name"/>, <xsl:value-of select="$value"/>);
</xsp:logic>
</xsl:template>
@@ -59,7 +59,7 @@
</xsl:variable>
<xsp:logic>
- XSPResponseHelper.setContentType(((HttpEnvironment)environment).getResponse(), <xsl:value-of select="$type"/>);
+ XSPResponseHelper.setContentType(response, <xsl:value-of select="$type"/>);
</xsp:logic>
</xsl:template>
1.1.2.7 +0 -2 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- xsp.xsl 2000/07/27 21:48:52 1.1.2.6
+++ xsp.xsl 2000/08/04 21:11:26 1.1.2.7
@@ -40,8 +40,6 @@
import org.apache.avalon.*;
import org.apache.avalon.utils.*;
import org.apache.cocoon.*;
- import org.apache.cocoon.environment.*;
- import org.apache.cocoon.environment.http.*;
import org.apache.cocoon.generation.*;
import org.apache.cocoon.components.parser.*;
No revision
No revision
1.1.2.6 +21 -4 xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java
Index: Environment.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Environment.java 2000/07/28 16:20:10 1.1.2.5
+++ Environment.java 2000/08/04 21:11:33 1.1.2.6
@@ -8,16 +8,33 @@
package org.apache.cocoon.environment;
import java.io.IOException;
+import java.io.OutputStream;
import java.net.MalformedURLException;
+import java.util.Dictionary;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-
+
+/**
+ * Base interface for an environment abstraction
+ *
+ * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:33 $
+ */
+
public interface Environment extends EntityResolver {
+ // Sitemap methods
+ public String getUri ();
public void changeContext (String uriprefix, String context)
throws MalformedURLException;
+
+ // Request methods
public String getView ();
- public String getUri ();
+
+ // Response methods
public void setContentType (String mimeType);
-}
+ public OutputStream getOutputStream() throws IOException;
+
+ // Object model
+ public Dictionary getObjectModel();
+ }
No revision
No revision
1.1.2.8 +54 -35 xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpEnvironment.java
Index: HttpEnvironment.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpEnvironment.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- HttpEnvironment.java 2000/07/30 19:08:57 1.1.2.7
+++ HttpEnvironment.java 2000/08/04 21:11:36 1.1.2.8
@@ -9,8 +9,11 @@
import java.io.File;
import java.io.IOException;
+import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Dictionary;
+import java.util.Hashtable;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -33,39 +36,62 @@
private String view = "";
/** The HttpServletRequest */
- private HttpRequest req = null;
+ private HttpRequest request = null;
+ private HttpServletRequest servletRequest = null;
-
/** The HttpServletResponse */
- private HttpResponse res = null;
+ private HttpResponse response = null;
+ private HttpServletResponse servletResponse = null;
/** The ServletContext */
private ServletContext servletContext = null;
+ /** The OutputStream */
+ private OutputStream outputStream = null;
+
/** The Context path */
private URL context = null;
+
+ /** The servlet object model */
+ private Hashtable objectModel = null;
/**
* Constructs a HttpEnvironment object from a HttpServletRequest
* and HttpServletResponse objects
*/
- public HttpEnvironment (String uri, HttpServletRequest req,
- HttpServletResponse res,
+ public HttpEnvironment (String uri, HttpServletRequest request,
+ HttpServletResponse response,
ServletContext servletContext)
- throws MalformedURLException {
+ throws MalformedURLException, IOException {
this.uri = uri;
- this.view = req.getHeader("cocoon-view");
- this.req = new HttpRequest (req, this);
- this.res = new HttpResponse (res);
+ this.view = request.getHeader("cocoon-view");
+ this.request = new HttpRequest (request, this);
+ this.servletRequest = request;
+ this.response = new HttpResponse (response);
+ this.servletResponse = response;
this.servletContext = servletContext;
this.context = new URL("file://"+servletContext.getRealPath("/"));
+ this.outputStream = response.getOutputStream();
+ this.objectModel = new Hashtable();
+ this.objectModel.put("request", this.request);
+ this.objectModel.put("response", this.response);
+ this.objectModel.put("context", this.servletContext);
}
+
+ // Sitemap methods
+
/**
+ * Returns the uri in progress. The prefix is stripped off
+ */
+ public String getUri () {
+ return this.uri;
+ }
+
+ /**
* Adds an prefix to the overall stripped off prefix from the request uri
*/
public void changeContext(String prefix, String context)
throws MalformedURLException {
-System.out.print ("HttpEnvironment.changeContext(prefix=\""+prefix+"\",context=\""+context+"\") => ");
if (uri.startsWith (prefix)) {
this.prefix.append (prefix);
uri = uri.substring(prefix.length());
@@ -77,9 +103,10 @@
} else {
//FIXME: should we throw an error here ?
}
-System.out.println ("uri=\""+uri+"\",this.context=\""+this.context+"\"");
}
+ // Request methods
+
/**
* Returns the request view
*/
@@ -87,40 +114,32 @@
return this.view;
}
- /**
- * Returns the uri in progress. The prefix is stripped off
- */
- public String getUri () {
- return this.uri;
- }
-
- /**
- * Returns a wrapped HttpResponse object of the real HttpServletResponse in progress
- */
- public HttpResponse getResponse () {
- return this.res;
- }
-
- /**
- * Returns a wrapped HttpRequest object of the real HttpServletRequest in progress
- */
- public HttpRequest getRequest () {
- return this.req;
- }
+ // Response methods
/**
* Set the ContentType
*/
public void setContentType (String contentType) {
- this.res.setContentType (contentType);
+ this.response.setContentType (contentType);
}
+
+ /**
+ * Get the OutputStream
+ */
+ public OutputStream getOutputStream() throws IOException {
+ return this.outputStream;
+ }
+ // Object model method
+
/**
- * Returns the ServletContext in progress
+ * Returns a Dictionary containing environment specific objects
*/
- public ServletContext getContext () {
- return this.servletContext;
+ public Dictionary getObjectModel () {
+ return this.objectModel;
}
+
+ // EntityResolver method
/**
* Resolve an entity.
No revision
No revision
1.1.2.4 +15 -8 xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractGenerator.java 2000/07/28 16:20:16 1.1.2.3
+++ AbstractGenerator.java 2000/08/04 21:11:40 1.1.2.4
@@ -7,32 +7,39 @@
*****************************************************************************/
package org.apache.cocoon.generation;
+import java.util.Dictionary;
+
import org.apache.avalon.utils.Parameters;
-import org.apache.cocoon.environment.Environment;
+
import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.xml.sax.EntityResolver;
+
/**
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/28 16:20:16 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:40 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
- /** The current <code>Environment</code>. */
- protected Environment environment=null;
+ /** The current <code>EntityResolver</code>. */
+ protected EntityResolver resolver=null;
+ /** The current <code>Dictionary</code> objectModel. */
+ protected Dictionary objectModel=null;
/** The current <code>Parameters</code>. */
protected Parameters parameters=null;
/** The source URI associated with the request or <b>null</b>. */
protected String source=null;
/**
- * Set the <code>Environment</code> and sitemap
- * <code>Parameters</code> used to process the request.
+ * Set the <code>EntityResolver</code>, object model <code>Dictionary</code>,
+ * the source and sitemap <code>Parameters</code> used to process the request.
*/
- public void setup(Environment environment, String src, Parameters par) {
- this.environment=environment;
+ public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters par) {
+ this.resolver=resolver;
+ this.objectModel=objectModel;
this.source=src;
this.parameters=par;
}
1.1.2.5 +4 -5 xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java
Index: AbstractServerPage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractServerPage.java 2000/07/29 18:30:34 1.1.2.4
+++ AbstractServerPage.java 2000/08/04 21:11:41 1.1.2.5
@@ -10,8 +10,7 @@
import org.apache.avalon.Modifiable;
import java.io.File;
-//import org.apache.cocoon.Request;
-import org.apache.cocoon.environment.Environment;
+import javax.servlet.http.HttpServletRequest;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.SAXException;
@@ -21,10 +20,10 @@
* declares variables that must be explicitly initialized by code generators.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/29 18:30:34 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/04 21:11:41 $
*/
public abstract class AbstractServerPage
- extends ComposerGenerator
+ extends ServletGenerator
implements Modifiable
{
/**
@@ -76,7 +75,7 @@
* dynamically generated content has changed
* @return Whether content has changes for this request's data
*/
- public boolean hasContentChanged(Environment environment) {
+ public boolean hasContentChanged(HttpServletRequest request) {
return true;
}
1.1.2.5 +9 -8 xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DirectoryGenerator.java 2000/08/02 22:48:28 1.1.2.4
+++ DirectoryGenerator.java 2000/08/04 21:11:42 1.1.2.5
@@ -12,12 +12,12 @@
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Dictionary;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import org.apache.avalon.utils.Parameters;
-import org.apache.cocoon.environment.Environment;
/**
* Generates an XML directory listing.
@@ -52,7 +52,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/02 22:48:28 $ */
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/04 21:11:42 $ */
public class DirectoryGenerator extends ComposerGenerator {
/** The URI of the namespace of this generator. */
@@ -75,20 +75,23 @@
protected int depth;
protected AttributesImpl attributes = new AttributesImpl();
protected SimpleDateFormat dateFormatter;
+ protected EntityResolver resolver;
/**
* Set the request parameters. Must be called before the generate
* method.
*
- * @param environment
- * the calling environment object
+ * @param resolver
+ * the EntityResolver object
+ * @param objectModel
+ * a <code>Dictionary</code> containing model object
* @param src
* the URI for this request (?)
* @param par
* configuration parameters
*/
- public void setup(Environment environment, String src, Parameters par) {
- super.setup(environment, src, par);
+ public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters par) {
+ super.setup(resolver, objectModel, src, par);
String dateFormatString = par.getParameter("dateFormat", null);
@@ -117,13 +120,11 @@
public void generate()
throws SAXException, IOException {
- EntityResolver resolver;
InputSource input;
URL url;
File path;
- resolver = (EntityResolver)this.environment;
input = resolver.resolveEntity(null,super.source);
url = new URL(input.getSystemId());
path = new File(url.getFile());
1.1.2.6 +2 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FileGenerator.java 2000/07/28 16:20:18 1.1.2.5
+++ FileGenerator.java 2000/08/04 21:11:44 1.1.2.6
@@ -16,7 +16,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/28 16:20:18 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:44 $
*/
public class FileGenerator extends ComposerGenerator {
@@ -28,6 +28,6 @@
Parser parser=(Parser)this.manager.getComponent("parser");
parser.setContentHandler(this.contentHandler);
parser.setLexicalHandler(this.lexicalHandler);
- parser.parse(super.environment.resolveEntity(null,this.source));
+ parser.parse(super.resolver.resolveEntity(null,this.source));
}
}
1.1.2.4 +5 -3 xml-cocoon/src/org/apache/cocoon/generation/Attic/Generator.java
Index: Generator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/Generator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Generator.java 2000/07/27 21:49:00 1.1.2.3
+++ Generator.java 2000/08/04 21:11:44 1.1.2.4
@@ -8,18 +8,20 @@
package org.apache.cocoon.generation;
import java.io.IOException;
+
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.sitemap.SitemapComponent;
+import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLProducer;
+
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/27 21:49:00 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:44 $
*/
-public interface Generator extends XMLProducer, SitemapComponent {
+public interface Generator extends XMLProducer, SitemapModelComponent {
public void generate()
throws IOException, SAXException, ProcessingException;
1.1.2.6 +6 -9 xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PhpGenerator.java 2000/07/30 05:17:48 1.1.2.5
+++ PhpGenerator.java 2000/08/04 21:11:45 1.1.2.6
@@ -15,7 +15,6 @@
import net.php.servlet;
-import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.components.parser.Parser;
import org.xml.sax.InputSource;
@@ -27,9 +26,9 @@
* results into SAX events.
*
* @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/30 05:17:48 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:45 $
*/
-public class PhpGenerator extends ComposerGenerator {
+public class PhpGenerator extends ServletGenerator {
/**
* Stub implementation of Servlet Config
@@ -107,24 +106,22 @@
public void generate() throws IOException, SAXException {
// ensure that we are serving a file...
- InputSource inputSource = environment.resolveEntity(null, this.source);
+ InputSource inputSource = this.resolver.resolveEntity(null, this.source);
String systemId = inputSource.getSystemId();
if (!systemId.startsWith("file:/"))
throw new IOException("protocol not supported: " + systemId);
try {
- HttpEnvironment env = (HttpEnvironment) environment;
-
// construct both ends of the pipe
PipedInputStream input = new PipedInputStream();
// start PHP producing results into the pipe
PhpServlet php = new PhpServlet();
- php.init(new config(env.getContext()));
+ php.init(new config(context));
php.setInput(systemId.substring(6));
php.setOutput(new PipedOutputStream(input));
- php.setRequest(env.getRequest());
- php.setResponse(env.getResponse());
+ php.setRequest(request);
+ php.setResponse(response);
new Thread(php).start();
// pipe the results into the parser
1.1.2.4 +8 -10 xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RequestGenerator.java 2000/07/29 18:30:34 1.1.2.3
+++ RequestGenerator.java 2000/08/04 21:11:45 1.1.2.4
@@ -7,9 +7,6 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.http.HttpEnvironment;
-
import java.util.Enumeration;
import org.xml.sax.SAXException;
@@ -19,9 +16,10 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:34 $
+ * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:45 $
*/
-public class RequestGenerator extends AbstractGenerator {
+public class RequestGenerator extends ServletGenerator {
/** The URI of the namespace of this generator. */
private String URI="http://xml.apache.org/cocoon/2.0/RequestGenerator";
@@ -35,7 +33,7 @@
this.contentHandler.startPrefixMapping("",URI);
AttributesImpl attr=new AttributesImpl();
- this.attribute(attr,"target",this.environment.getUri());
+ this.attribute(attr,"target",this.request.getRequestURI());
this.attribute(attr,"source",this.source);
this.start("request",attr);
this.data("\n");
@@ -44,13 +42,13 @@
this.data(" ");
this.start("requestHeaders",attr);
this.data("\n");
- Enumeration headers=((HttpEnvironment)(super.environment)).getRequest().getHeaderNames();
+ Enumeration headers=this.request.getHeaderNames();
while (headers.hasMoreElements()) {
String header=(String)headers.nextElement();
this.attribute(attr,"name",header);
this.data(" ");
this.start("header",attr);
- this.data(((HttpEnvironment)(super.environment)).getRequest().getHeader(header));
+ this.data(this.request.getHeader(header));
this.end("header");
this.data("\n");
}
@@ -62,14 +60,14 @@
this.data(" ");
this.start("requestParameters",attr);
this.data("\n");
- Enumeration parameters=((HttpEnvironment)(super.environment)).getRequest().getParameterNames();
+ Enumeration parameters=this.request.getParameterNames();
while (parameters.hasMoreElements()) {
String parameter=(String)parameters.nextElement();
this.attribute(attr,"name",parameter);
this.data(" ");
this.start("parameter",attr);
this.data("\n");
- String values[]=((HttpEnvironment)(super.environment)).getRequest().getParameterValues(parameter);
+ String values[]=this.request.getParameterValues(parameter);
if (values!=null) for (int x=0; x<values.length; x++) {
this.data(" ");
this.start("value",attr);
1.1.2.4 +5 -5 xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ServerPagesGenerator.java 2000/07/27 21:49:01 1.1.2.3
+++ ServerPagesGenerator.java 2000/08/04 21:11:46 1.1.2.4
@@ -33,10 +33,10 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/27 21:49:01 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:46 $
*/
public class ServerPagesGenerator
- extends ComposerGenerator
+ extends ServletGenerator
implements ContentHandler, LexicalHandler
{
/**
@@ -92,7 +92,7 @@
* @exception ProcessingException Error during load/execution
*/
public void generate() throws IOException, SAXException, ProcessingException {
- InputSource inputSource = this.environment.resolveEntity(null, this.source);
+ InputSource inputSource = this.resolver.resolveEntity(null, this.source);
String systemId = inputSource.getSystemId();
@@ -118,7 +118,7 @@
try {
generator = (Generator)
- programGenerator.load(file, markupLanguage, programmingLanguage, environment);
+ programGenerator.load(file, markupLanguage, programmingLanguage, resolver);
} catch (Exception e) {
e.printStackTrace();
throw new ProcessingException(e.getMessage());
@@ -131,7 +131,7 @@
generator.setContentHandler(this);
generator.setLexicalHandler(this);
- generator.setup(this.environment, this.source, this.parameters);
+ generator.setup(this.resolver, this.objectModel, this.source, this.parameters);
generator.generate();
No revision
No revision
1.1.2.1 +40 -0 xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
No revision
No revision
1.1.2.5 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/AuthenticationMatcher.java
Index: AuthenticationMatcher.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/AuthenticationMatcher.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AuthenticationMatcher.java 2000/07/29 18:30:35 1.1.2.4
+++ AuthenticationMatcher.java 2000/08/04 21:11:52 1.1.2.5
@@ -1,5 +1,5 @@
package org.apache.cocoon.matching;
-
+/*
import java.util.List;
import java.util.ArrayList;
@@ -22,4 +22,4 @@
abstract boolean match(String username, String password);
-}
+}*/
1.1.2.5 +4 -5 xml-cocoon/src/org/apache/cocoon/matching/Attic/FileAuthenticationMatcher.java
Index: FileAuthenticationMatcher.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/FileAuthenticationMatcher.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FileAuthenticationMatcher.java 2000/07/29 18:30:35 1.1.2.4
+++ FileAuthenticationMatcher.java 2000/08/04 21:11:52 1.1.2.5
@@ -1,5 +1,5 @@
package org.apache.cocoon.matching;
-
+/*
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
@@ -8,7 +8,6 @@
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.cocoon.environment.Environment;
import org.apache.avalon.utils.Parameters;
public class FileAuthenticationMatcher extends AuthenticationMatcher implements Configurable {
@@ -22,10 +21,10 @@
String name = param.getAttribute("name");
String value = param.getAttribute("value");
if (!name.equals("src")) {
- /** load the file indicated by value (relative to what?)
+*/ /** load the file indicated by value (relative to what?)
fill hashtable with users/passwords (plaintext for now)
**/
- }
+/* }
}
}
@@ -47,4 +46,4 @@
public void setup (Environment environment, String src, Parameters param) {
}
-}
+}*/
1.1.2.6 +17 -14 xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java
Index: Matcher.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Matcher.java 2000/07/29 18:30:35 1.1.2.5
+++ Matcher.java 2000/08/04 21:11:53 1.1.2.6
@@ -8,30 +8,33 @@
package org.apache.cocoon.matching;
import java.util.List;
+import java.util.Dictionary;
-import org.apache.cocoon.sitemap.SitemapComponent;
-import org.apache.cocoon.environment.Environment;
+import org.apache.avalon.Component;
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/29 18:30:35 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:53 $
*/
-public interface Matcher extends SitemapComponent {
+public interface Matcher extends Component {
/**
* Matches the pattern against some <code>Request</code> values
* and returns a <code>Map</code> object with replacements
* for wildcards contained in the pattern.
- * @param pattern The pattern to match against. Depending on the
- * implementation the pattern can contain wildcards
- * or regular expressions.
- * @param request The <code>Request</code> object which can be used
- * to select values this matchers matches against.
- * @return Map The returned <code>Map</code> object with
- * replacements for wildcards/regular-expressions
- * contained in the pattern.
- * If the return value is null there was no match.
+ * @param pattern The pattern to match against. Depending on the
+ * implementation the pattern can contain wildcards
+ * or regular expressions.
+ * @param objectModel The <code>Dictionary</code> with object of the
+ * calling environment which can be used
+ * to select values this matchers matches against.
+ * @return Map The returned <code>Map</code> object with
+ * replacements for wildcards/regular-expressions
+ * contained in the pattern.
+ * If the return value is null there was no match.
*/
- public List match (String pattern, Environment environment);
+ public List match (String pattern, Dictionary objectModel);
}
+
+
1.1.2.6 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RegexpURIMatcherFactory.java 2000/07/30 19:08:58 1.1.2.5
+++ RegexpURIMatcherFactory.java 2000/08/04 21:11:53 1.1.2.6
@@ -20,7 +20,7 @@
* for request URIs
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/30 19:08:58 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:53 $
*/
public class RegexpURIMatcherFactory implements MatcherFactory {
@@ -70,7 +70,7 @@
String instructions = name + "PatternInstructions";
String pat = correctPattern (pattern);
sb.append("java.util.ArrayList list = new java.util.ArrayList ();")
- .append("if (").append(name).append("Pattern.match(environment.getUri())) {");
+ .append("if (").append(name).append("Pattern.match(((javax.servlet.http.HttpServletRequest)objectModel.get(\"request\")).getRequestURI())) {");
// Count number of parens
int i = 0;
int j = -1;
1.1.2.8 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- WildcardURIMatcherFactory.java 2000/07/28 16:20:24 1.1.2.7
+++ WildcardURIMatcherFactory.java 2000/08/04 21:11:53 1.1.2.8
@@ -19,7 +19,7 @@
* for request URIs
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/07/28 16:20:24 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/08/04 21:11:53 $
*/
public class WildcardURIMatcherFactory /*extends PatternTranslator*/ implements MatcherFactory {
@@ -42,7 +42,7 @@
throws ConfigurationException {
StringBuffer result = new StringBuffer();
return result.append ("java.util.ArrayList list = new ArrayList();")
- .append ("if (org.apache.cocoon.matching.helpers.WildcardURIMatcher.match (list, environment.getUri(), ")
+ .append ("if (org.apache.cocoon.matching.helpers.WildcardURIMatcher.match (list, ((javax.servlet.http.HttpServletRequest)objectModel.get(\"request\")).getRequestURI(), ")
.append(prefix).append("_expr))")
.append ("return list;")
.append ("else return null;").toString();
No revision
No revision
1.1.2.2 +23 -8 xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractReader.java 2000/07/28 16:20:30 1.1.2.1
+++ AbstractReader.java 2000/08/04 21:11:55 1.1.2.2
@@ -7,30 +7,45 @@
*****************************************************************************/
package org.apache.cocoon.reading;
+import java.io.OutputStream;
+import java.util.Dictionary;
+
import org.apache.avalon.utils.Parameters;
-import org.apache.cocoon.environment.Environment;
+import org.xml.sax.EntityResolver;
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/07/28 16:20:30 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/08/04 21:11:55 $
*/
public abstract class AbstractReader implements Reader {
- /** The current <code>Environment</code>. */
- protected Environment environment=null;
+ /** The current <code>EntityResolver</code>. */
+ protected EntityResolver resolver=null;
+ /** The current <code>Dictionary</code> of the object model. */
+ protected Dictionary objectModel=null;
/** The current <code>Parameters</code>. */
protected Parameters parameters=null;
/** The source URI associated with the request or <b>null</b>. */
protected String source=null;
+ /** The <code>OutputStream</code> to write on. */
+ protected OutputStream out=null;
/**
- * Set the <code>Environment</code> and sitemap
- * <code>Parameters</code> used to process the request.
+ * Set the <code>EntityResolver</code> the object model <code>Dictionary</code>,
+ * the source and sitemap <code>Parameters</code> used to process the request.
*/
- public void setup(Environment environment, String src, Parameters par) {
- this.environment=environment;
+ public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters par) {
+ this.resolver=resolver;
+ this.objectModel=objectModel;
this.source=src;
this.parameters=par;
+ }
+
+ /**
+ * Set the <code>OutputStream</code>
+ */
+ public void setOutputStream(OutputStream out) {
+ this.out=out;
}
}
1.1.2.3 +6 -9 xml-cocoon/src/org/apache/cocoon/reading/Attic/Reader.java
Index: Reader.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/Reader.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Reader.java 2000/07/28 16:20:31 1.1.2.2
+++ Reader.java 2000/08/04 21:11:56 1.1.2.3
@@ -8,23 +8,20 @@
package org.apache.cocoon.reading;
import java.io.IOException;
-import java.io.OutputStream;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.sitemap.SitemapComponent;
+import org.apache.cocoon.sitemap.SitemapModelComponent;
+import org.apache.cocoon.sitemap.SitemapOutputComponent;
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/28 16:20:31 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/08/04 21:11:56 $
*/
-public interface Reader extends SitemapComponent {
+public interface Reader extends SitemapModelComponent, SitemapOutputComponent {
- /**
- * Set the <code>OutputStream</code> where the XML should be serialized.
- */
- public void setOutputStream(OutputStream out);
- public void generate() throws IOException, ProcessingException;
+ public void generate()
+ throws IOException, SAXException, ProcessingException;
}
1.1.2.2 +9 -18 xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ResourceReader.java 2000/07/28 16:20:32 1.1.2.1
+++ ResourceReader.java 2000/08/04 21:11:56 1.1.2.2
@@ -14,43 +14,34 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.util.Hashtable;
+import java.util.Dictionary;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.http.HttpEnvironment;
-import org.apache.cocoon.environment.http.HttpResponse;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.sitemap.SitemapComponent;
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/07/28 16:20:32 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/08/04 21:11:56 $
*/
public class ResourceReader extends AbstractReader {
- /** The OutputStream */
- private OutputStream out;
-
- /**
- * Set the <code>OutputStream</code> where the XML should be serialized.
- */
- public void setOutputStream(OutputStream out) {
- this.out = out;
- }
-
/**
* Generates the requested resource.
*/
public void generate() throws IOException, ProcessingException {
- HttpEnvironment env = (HttpEnvironment)environment;
- HttpResponse res = env.getResponse();
+ HttpServletResponse res = (HttpServletResponse) objectModel.get("response");
+ if (res == null) {
+ throw new ProcessingException ("Missing a Response object in the objectModel");
+ }
String src = null;
File file = null;
URL url = null;
try {
- src = environment.resolveEntity (null,source).getSystemId();
+ src = this.resolver.resolveEntity (null,this.source).getSystemId();
url = new URL (src);
} catch (SAXException se) {
throw new IOException ("ResourceReader: error resolving source \""
No revision
No revision
1.1.2.5 +13 -11 xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java
Index: Selector.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Selector.java 2000/07/29 18:30:36 1.1.2.4
+++ Selector.java 2000/08/04 21:11:59 1.1.2.5
@@ -7,24 +7,26 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.cocoon.sitemap.SitemapComponent;
-import org.apache.cocoon.environment.Environment;
+import java.util.Dictionary;
+import org.apache.avalon.Component;
+
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/29 18:30:36 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/04 21:11:59 $
*/
-public interface Selector extends SitemapComponent {
+public interface Selector extends Component {
/**
- * Selectors test pattern against some <code>Request</code> values
- * and signals success with the returned boolean value
- * @param expression The expression to test.
- * @param request The <code>Request</code> object which can be used
- * to select values to test the expression.
- * @return boolean Signals successfull test.
+ * Selectors test pattern against some objects in a <code>Dictionary</code>
+ * model and signals success with the returned boolean value
+ * @param expression The expression to test.
+ * @param objectModel The <code>Dictionary</code> containing object of the
+ * calling environment which may be used
+ * to select values to test the expression.
+ * @return boolean Signals successfull test.
*/
- public boolean select (String expression, Environment environment);
+ public boolean select (String expression, Dictionary objectModel);
}
No revision
No revision
1.1.2.4 +2 -19 xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java
Index: AbstractSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractSerializer.java 2000/07/29 18:30:37 1.1.2.3
+++ AbstractSerializer.java 2000/08/04 21:12:01 1.1.2.4
@@ -11,36 +11,19 @@
import java.io.IOException;
import java.io.OutputStream;
import org.apache.avalon.utils.Parameters;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.SitemapComponent;
+import org.apache.cocoon.sitemap.SitemapOutputComponent;
import org.apache.cocoon.xml.AbstractXMLConsumer;
/**
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:37 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:01 $
*/
public abstract class AbstractSerializer extends AbstractXMLConsumer
implements Serializer {
/** The current <code>OutputStream</code>. */
protected OutputStream output=null;
- /** The current <code>Environment</code>. */
- protected Environment environment=null;
- /** The current <code>Parameters</code>. */
- protected Parameters parameters=null;
- /** The source URI associated with the request or <b>null</b>. */
- protected String source=null;
-
- /**
- * Set the <code>Environment</code> and sitemap
- * <code>Parameters</code> used to process the request.
- */
- public void setup(Environment environment, String src, Parameters par) {
- this.environment=environment;
- this.source=src;
- this.parameters=par;
- }
/**
* Set the <code>OutputStream</code> where the XML should be serialized.
1.1.2.5 +5 -17 xml-cocoon/src/org/apache/cocoon/serialization/Attic/FO2PDFSerializer.java
Index: FO2PDFSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/FO2PDFSerializer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FO2PDFSerializer.java 2000/07/29 18:30:37 1.1.2.4
+++ FO2PDFSerializer.java 2000/08/04 21:12:01 1.1.2.5
@@ -11,27 +11,23 @@
import java.io.OutputStream;
import java.io.PrintWriter;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.avalon.utils.Parameters;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.xml.util.DocumentHandlerWrapper;
import org.apache.fop.apps.Driver;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Version;
-//import org.xml.sax.Attributes;
-//import org.xml.sax.AttributeList;
import org.xml.sax.DocumentHandler;
-//import org.xml.sax.helpers.AttributeListImpl;
-//import org.xml.sax.Locator;
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/29 18:30:37 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/04 21:12:01 $
*
*/
public class FO2PDFSerializer extends DocumentHandlerWrapper
@@ -43,22 +39,14 @@
private Driver driver = null;
/**
- * Set the <code>Environment</code> and sitemap
- * <code>Parameters</code> used to process the request.
+ * Set the <code>OutputStream</code> where the XML should be serialized.
*/
- public void setup(Environment environment, String src, Parameters par) {
+ public void setOutputStream(OutputStream out) {
driver = new Driver();
driver.setRenderer("org.apache.fop.render.pdf.PDFRenderer", Version.getVersion());
driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
- ((HttpEnvironment)environment).getResponse().setContentType(par.getParameter("contentType","application/pdf"));
this.setDocumentHandler (driver.getDocumentHandler());
- }
-
- /**
- * Set the <code>OutputStream</code> where the XML should be serialized.
- */
- public void setOutputStream(OutputStream out) {
driver.setWriter(new PrintWriter(out));
}
1.1.2.4 +1 -5 xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java
Index: HTMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- HTMLSerializer.java 2000/07/29 18:30:37 1.1.2.3
+++ HTMLSerializer.java 2000/08/04 21:12:01 1.1.2.4
@@ -13,8 +13,6 @@
import java.io.OutputStreamWriter;
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.util.NamespacesTable;
import org.xml.sax.Attributes;
@@ -25,7 +23,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:37 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:01 $
*/
public class HTMLSerializer extends AbstractSerializer implements XMLConsumer {
/** The namespaces table */
@@ -62,8 +60,6 @@
*/
public void startDocument()
throws SAXException {
- String c=super.parameters.getParameter("contentType","text/html");
- ((HttpEnvironment)(super.environment)).getResponse().setContentType(c);
}
/**
1.1.2.4 +1 -20 xml-cocoon/src/org/apache/cocoon/serialization/Attic/ImageSerializer.java
Index: ImageSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/ImageSerializer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ImageSerializer.java 2000/07/29 18:30:37 1.1.2.3
+++ ImageSerializer.java 2000/08/04 21:12:02 1.1.2.4
@@ -9,8 +9,6 @@
import org.apache.avalon.*;
import org.apache.avalon.utils.*;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.*;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.xml.*;
@@ -52,7 +50,7 @@
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author Copyright 1999 © <a href="http://www.apache.org">The Apache
* Software Foundation</a>. All rights reserved.
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:37 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:02 $
*/
public class ImageSerializer extends DOMBuilder implements Serializer, Composer {
@@ -67,12 +65,6 @@
private LexicalHandler lexicalHandler=null;
/** The component manager instance */
private ComponentManager manager=null;
- /** The current <code>Environment</code>. */
- private Environment environment=null;
- /** The current <code>Parameters</code>. */
- private Parameters parameters=null;
- /** The source URI associated with the request or <b>null</b>. */
- private String source=null;
/** The current <code>OutputStream</code>. */
private OutputStream output=null;
@@ -81,16 +73,6 @@
*/
public void setOutputStream(OutputStream out) {
this.output=new BufferedOutputStream(out);
- }
-
- /**
- * Set the <code>Environment</code> and sitemap
- * <code>Parameters</code> used to process the request.
- */
- public void setup(Environment environment, String src, Parameters par) {
- this.environment=environment;
- this.source=src;
- this.parameters=par;
super.factory=(Parser)this.manager.getComponent("parser");
}
@@ -142,7 +124,6 @@
*/
public void notify(Document doc)
throws SAXException {
- ((HttpEnvironment)(this.environment)).getResponse().setContentType("image/jpeg");
try {
this.print(doc,this.output);
} catch(IOException e) {
1.1.2.4 +3 -21 xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SVGSerializer.java 2000/07/29 18:30:37 1.1.2.3
+++ SVGSerializer.java 2000/08/04 21:12:02 1.1.2.4
@@ -10,8 +10,6 @@
import org.apache.avalon.*;
import org.apache.avalon.utils.*;
import org.apache.cocoon.*;
-import org.apache.cocoon.environment.http.HttpEnvironment;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.xml.*;
import org.apache.cocoon.xml.util.*;
@@ -53,7 +51,7 @@
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author Copyright 1999 © <a href="http://www.apache.org">The Apache
* Software Foundation</a>. All rights reserved.
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:37 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:02 $
*/
public class SVGSerializer extends DOMBuilder implements Serializer, Composer {
@@ -68,12 +66,6 @@
private LexicalHandler lexicalHandler=null;
/** The component manager instance */
private ComponentManager manager=null;
- /** The current <code>Environment</code>. */
- private Environment environment=null;
- /** The current <code>Parameters</code>. */
- private Parameters parameters=null;
- /** The source URI associated with the request or <b>null</b>. */
- private String source=null;
/** The current <code>OutputStream</code>. */
private OutputStream output=null;
@@ -82,16 +74,6 @@
*/
public void setOutputStream(OutputStream out) {
this.output=new BufferedOutputStream(out);
- }
-
- /**
- * Set the <code>Environment</code> and sitemap
- * <code>Parameters</code> used to process the request.
- */
- public void setup(Environment environment, String src, Parameters par) {
- this.environment=environment;
- this.source=src;
- this.parameters=par;
super.factory=(Parser)this.manager.getComponent("parser");
}
@@ -143,9 +125,9 @@
*/
public void notify(Document doc)
throws SAXException {
- ((HttpEnvironment)(this.environment)).getResponse().setContentType("image/jpeg");
try {
- BufferedImage img=SvgToAwtConverter.convert(doc,this.source);
+ //FIXME: There is no source anymore for serializers
+ BufferedImage img=SvgToAwtConverter.convert(doc,null/*this.source*/);
OutputStream out=this.output;
// Write out image (highest quality for jpeg data)
JPEGEncodeParam jpar=JPEGCodec.getDefaultJPEGEncodeParam(img);
1.1.2.4 +3 -10 xml-cocoon/src/org/apache/cocoon/serialization/Attic/Serializer.java
Index: Serializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/Serializer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Serializer.java 2000/07/29 18:30:37 1.1.2.3
+++ Serializer.java 2000/08/04 21:12:02 1.1.2.4
@@ -7,21 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.serialization;
-import java.io.IOException;
-import java.io.OutputStream;
-import org.apache.cocoon.sitemap.SitemapComponent;
+import org.apache.cocoon.sitemap.SitemapOutputComponent;
import org.apache.cocoon.xml.XMLConsumer;
/**
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:37 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:02 $
*/
-public interface Serializer extends XMLConsumer, SitemapComponent {
-
- /**
- * Set the <code>OutputStream</code> where the XML should be serialized.
- */
- public void setOutputStream(OutputStream out);
+public interface Serializer extends XMLConsumer, SitemapOutputComponent {
}
1.1.2.4 +3 -4 xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLSerializer.java 2000/07/29 18:30:37 1.1.2.3
+++ XMLSerializer.java 2000/08/04 21:12:03 1.1.2.4
@@ -13,9 +13,10 @@
import java.io.OutputStreamWriter;
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.cocoon.environment.http.HttpEnvironment;
+
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.util.NamespacesTable;
+
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -24,7 +25,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:37 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:03 $
*/
public class XMLSerializer extends AbstractSerializer implements XMLConsumer {
/** The namespaces table */
@@ -65,8 +66,6 @@
*/
public void startDocument()
throws SAXException {
- String c=super.parameters.getParameter("contentType","text/xml");
- ((HttpEnvironment)(super.environment)).getResponse().setContentType(c);
this.print("<?xml version=\"1.0\"?>\n");
}
No revision
No revision
1.1.4.16 +2 -2 xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.15
retrieving revision 1.1.4.16
diff -u -r1.1.4.15 -r1.1.4.16
--- CocoonServlet.java 2000/07/29 18:30:38 1.1.4.15
+++ CocoonServlet.java 2000/08/04 21:12:10 1.1.4.16
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.4.15 $ $Date: 2000/07/29 18:30:38 $
+ * @version CVS $Revision: 1.1.4.16 $ $Date: 2000/08/04 21:12:10 $
*/
public class CocoonServlet extends HttpServlet {
private Cocoon cocoon=null;
@@ -139,7 +139,7 @@
try {
if (uri.charAt(0)=='/') uri=uri.substring(1);
HttpEnvironment env = new HttpEnvironment (uri, req, res, context);
- if (!this.cocoon.process(env,out)) {
+ if (!this.cocoon.process(env)) {
res.setStatus(res.SC_NOT_FOUND);
res.setContentType("text/html");
out.println("<html><head>");
No revision
No revision
1.1.2.4 +10 -8 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractSitemap.java 2000/07/28 16:20:38 1.1.2.3
+++ AbstractSitemap.java 2000/08/04 21:12:11 1.1.2.4
@@ -28,7 +28,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/28 16:20:38 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:11 $
*/
public abstract class AbstractSitemap
implements Sitemap {
@@ -70,10 +70,10 @@
* @param request The request whose data must be inspected to assert whether
* dynamically generated content has changed
* @return Whether content has changes for this request's data
- */
- public boolean hasContentChanged(Environment environment) {
+ *//*
+ public boolean hasContentChanged(HttpServletRequest resuest) {
return true;
- }
+ }*/
/**
* Loads a class specified in a sitemap component definition and
@@ -83,13 +83,16 @@
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
Class cl = this.getClass().getClassLoader().loadClass(classURL);
Object comp = cl.newInstance();
+ if (!(comp instanceof Component)) {
+ throw new IllegalAccessException ("Object "+classURL+" is not a Component");
+ }
if (comp instanceof Composer) {
((Composer)comp).setComponentManager (this.manager);
}
if (comp instanceof Configurable) {
((Configurable)comp).setConfiguration (conf);
}
- return ((SitemapComponent)comp);
+ return ((Component)comp);
}
/**
@@ -140,10 +143,9 @@
}
/**
- * Constructs a resource to the supplied <code>OutputStream</code>
- * for the <code>Request</code> and <code>Response</code> arguments.
+ * Constructs a resource for the <code>Environment</code> arguments.
* This method is supplied by the generated Sitemap.
*/
- public abstract boolean process (Environment environment, OutputStream out)
+ public abstract boolean process (Environment environment)
throws Exception;
}
1.1.2.12 +12 -10 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java
Index: ResourcePipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- ResourcePipeline.java 2000/08/02 22:48:29 1.1.2.11
+++ ResourcePipeline.java 2000/08/04 21:12:11 1.1.2.12
@@ -26,10 +26,11 @@
import org.apache.cocoon.xml.XMLProducer;
import org.xml.sax.SAXException;
+import org.xml.sax.EntityResolver;
/**
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/08/02 22:48:29 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/08/04 21:12:11 $
*/
public class ResourcePipeline implements Composer {
private Generator generator = null;
@@ -108,6 +109,7 @@
((Configurable)this.serializer).setConfiguration (conf);
this.serializerSource = source;
this.serializerParam = param;
+ this.serializerMimeType = mimeType;
}
public void addTransformer (Transformer transformer, String source,
@@ -123,39 +125,39 @@
this.transformerParams.add (param);
}
- public boolean process (Environment environment, OutputStream out)
+ public boolean process (Environment environment)
throws ProcessingException, IOException, SAXException {
if (generator == null) {
if (reader != null) {
if (readerMimeType != null)
environment.setContentType (readerMimeType);
- reader.setup (environment, readerSource, readerParam);
- reader.setOutputStream (out);
+ reader.setup ((EntityResolver)environment, environment.getObjectModel(), readerSource, readerParam);
+ reader.setOutputStream (environment.getOutputStream());
reader.generate();
} else {
- throw new ProcessingException ("Generator/Reader not specified");
+ throw new ProcessingException ("Generator or Reader not specified");
}
} else {
if (serializer == null) {
throw new ProcessingException ("Serializer not specified");
}
- generator.setup (environment, generatorSource, generatorParam);
+ generator.setup ((EntityResolver)environment, environment.getObjectModel(), generatorSource, generatorParam);
Transformer transformer = null;
XMLProducer producer = generator;
int i = transformers.size();
for (int j=0; j < i; j++) {
transformer = (Transformer) transformers.elementAt (j);
- transformer.setup (environment, (String)transformerSources.elementAt (j),
+ transformer.setup ((EntityResolver)environment, environment.getObjectModel(),
+ (String)transformerSources.elementAt (j),
(Parameters)transformerParams.elementAt (j));
producer.setConsumer (transformer);
producer = transformer;
}
if (serializerMimeType != null)
- environment.setContentType (readerMimeType);
- serializer.setup (environment, serializerSource, serializerParam);
- serializer.setOutputStream (out);
+ environment.setContentType (serializerMimeType);
+ serializer.setOutputStream (environment.getOutputStream());
producer.setConsumer (serializer);
generator.generate();
}
1.1.2.7 +3 -3 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapHandler.java
Index: SitemapHandler.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapHandler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SitemapHandler.java 2000/07/28 16:20:42 1.1.2.6
+++ SitemapHandler.java 2000/08/04 21:12:11 1.1.2.7
@@ -28,7 +28,7 @@
* Handles the manageing and stating of one <code>Sitemap</code>
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/07/28 16:20:42 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/04 21:12:11 $
*/
public class SitemapHandler implements Runnable, Configurable, Composer {
@@ -139,10 +139,10 @@
throwError();
}
- public boolean process (Environment environment, OutputStream out)
+ public boolean process (Environment environment)
throws Exception {
this.throwError();
- return sitemap.process (environment, out);
+ return sitemap.process (environment);
}
/** Generate the Sitemap class */
1.1.2.6 +5 -5 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapManager.java
Index: SitemapManager.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapManager.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SitemapManager.java 2000/07/28 16:20:42 1.1.2.5
+++ SitemapManager.java 2000/08/04 21:12:11 1.1.2.6
@@ -31,7 +31,7 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/28 16:20:42 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:12:11 $
*/
public class SitemapManager implements Configurable, Composer {
@@ -56,7 +56,7 @@
}
public boolean invoke (Environment environment, String uri_prefix,
- String source, boolean check_reload, OutputStream out)
+ String source, boolean check_reload)
throws Exception {
SitemapHandler sitemapHandler = (SitemapHandler) sitemaps.get (source);
if (sitemapHandler != null) {
@@ -68,12 +68,12 @@
sitemapHandler.regenerateAsynchroniously(environment);
}
environment.changeContext (uri_prefix, source);
- return sitemapHandler.process (environment, out);
+ return sitemapHandler.process (environment);
} else {
sitemapHandler.regenerate(environment);
}
environment.changeContext (uri_prefix, source);
- return sitemapHandler.process (environment, out);
+ return sitemapHandler.process (environment);
} else {
sitemapHandler = new SitemapHandler(source, check_reload);
if (sitemapHandler instanceof Composer) sitemapHandler.setComponentManager (this.manager);
@@ -81,7 +81,7 @@
sitemaps.put(source, sitemapHandler);
sitemapHandler.regenerate(environment);
environment.changeContext (uri_prefix, source);
- return sitemapHandler.process (environment, out);
+ return sitemapHandler.process (environment);
}
}
No revision
No revision
1.1.2.1 +34 -0 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java
1.1.2.1 +27 -0 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapOutputComponent.java
No revision
No revision
1.1.2.4 +4 -1 xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractTransformer.java
Index: AbstractTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractTransformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractTransformer.java 2000/07/29 18:30:40 1.1.2.3
+++ AbstractTransformer.java 2000/08/04 21:12:13 1.1.2.4
@@ -7,7 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
+import java.util.Dictionary;
+
import org.apache.cocoon.xml.AbstractXMLProducer;
+
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -16,7 +19,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:40 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:13 $
*/
public abstract class AbstractTransformer extends AbstractXMLProducer
implements Transformer {
1.1.2.4 +5 -3 xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LogTransformer.java 2000/07/29 18:30:40 1.1.2.3
+++ LogTransformer.java 2000/08/04 21:12:13 1.1.2.4
@@ -8,17 +8,19 @@
package org.apache.cocoon.transformation;
import org.apache.avalon.utils.Parameters;
+
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+import org.xml.sax.EntityResolver;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Date;
+import java.util.Dictionary;
/**
*
@@ -43,7 +45,7 @@
*
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:40 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:13 $
*
*/
public class LogTransformer extends AbstractTransformer {
@@ -64,7 +66,7 @@
/** BEGIN SitemapComponent methods **/
- public void setup(Environment environment,
+ public void setup(EntityResolver resolver, Dictionary objectModel,
String source, Parameters parameters)
throws ProcessingException, SAXException, IOException {
if (logfile == null) {
1.1.2.4 +16 -13 xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SQLTransformer.java 2000/07/29 18:30:40 1.1.2.3
+++ SQLTransformer.java 2000/08/04 21:12:13 1.1.2.4
@@ -7,34 +7,37 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.Dictionary;
+import java.util.Enumeration;
+
import org.apache.avalon.utils.Parameters;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
+
import org.xml.sax.ContentHandler;
+import org.xml.sax.EntityResolver;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.SAXException;
import org.xml.sax.Locator;
import org.xml.sax.ext.LexicalHandler;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.io.IOException;
-import java.util.Properties;
-import java.util.Vector;
-import java.util.Enumeration;
/**
*
* @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:40 $ $Author: rubys $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:13 $ $Author: giacomo $
*/
public class SQLTransformer extends AbstractTransformer {
@@ -87,7 +90,7 @@
/** BEGIN SitemapComponent methods **/
- public void setup(Environment environment,
+ public void setup(EntityResolver resolver, Dictionary objectModel,
String source, Parameters parameters)
throws ProcessingException, SAXException, IOException {
current_state = STATE_OUTSIDE;
1.1.2.4 +3 -3 xml-cocoon/src/org/apache/cocoon/transformation/Attic/Transformer.java
Index: Transformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/Transformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Transformer.java 2000/07/29 18:30:40 1.1.2.3
+++ Transformer.java 2000/08/04 21:12:14 1.1.2.4
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-import org.apache.cocoon.sitemap.SitemapComponent;
+import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
@@ -15,7 +15,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:40 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:14 $
*/
-public interface Transformer extends XMLProducer, XMLConsumer, SitemapComponent {
+public interface Transformer extends XMLProducer, XMLConsumer, SitemapModelComponent {
}
1.1.2.4 +4 -3 xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XIncludeTransformer.java 2000/07/29 18:30:40 1.1.2.3
+++ XIncludeTransformer.java 2000/08/04 21:12:14 1.1.2.4
@@ -14,16 +14,17 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Stack;
+import java.util.Dictionary;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
+import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.ContentHandler;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
import org.w3c.dom.Document;
-import org.apache.cocoon.environment.Environment;
import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
@@ -41,7 +42,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:40 $ $Author: rubys $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:12:14 $ $Author: giacomo $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composer {
@@ -75,7 +76,7 @@
protected Stack xmlbase_element_name_stack = new Stack();
- public void setup(Environment environment,
+ public void setup(EntityResolver resolver, Dictionary objectModel,
String source, Parameters parameters)
throws ProcessingException, SAXException, IOException {}
/*
1.1.2.6 +16 -9 xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java
Index: XalanTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XalanTransformer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XalanTransformer.java 2000/07/29 18:30:40 1.1.2.5
+++ XalanTransformer.java 2000/08/04 21:12:14 1.1.2.6
@@ -9,16 +9,17 @@
import java.io.IOException;
import java.util.Enumeration;
+import java.util.Dictionary;
import java.text.StringCharacterIterator;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Cocoon;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.xml.XMLConsumer;
@@ -31,6 +32,7 @@
import org.apache.xalan.xslt.XSLTProcessorFactory;
import org.xml.sax.ContentHandler;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
@@ -39,7 +41,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/29 18:30:40 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:12:14 $
*/
public class XalanTransformer extends DocumentHandlerWrapper
implements Transformer, Composer {
@@ -50,13 +52,18 @@
private XSLTProcessor processor=null;
/**
- * Set the <code>Environment</code> and sitemap
+ * Set the <code>EntityResolver</code>, the <code>Dictionary</code> with
+ * the object model, the source and sitemap
* <code>Parameters</code> used to process the request.
*/
- public void setup(Environment environment, String src, Parameters par)
+ public void setup(EntityResolver resolver, Dictionary objectModel, String src, Parameters par)
throws SAXException, ProcessingException, IOException {
-
+ /** The Request object */
+ HttpServletRequest request=(HttpServletRequest)objectModel.get("request");
+ if (request == null) {
+ throw new ProcessingException ("Missing request object in obejctModel");
+ }
// Check the stylesheet uri
// String xsluri=par.getParameter("stylesheet",null);
String xsluri=src;
@@ -67,7 +74,7 @@
StylesheetRoot stylesheet=null;
if (true) {
XSLTProcessor loaderprocessor=XSLTProcessorFactory.getProcessor();
- InputSource xslsrc=environment.resolveEntity(null,xsluri);
+ InputSource xslsrc=resolver.resolveEntity(null,xsluri);
XSLTInputSource style=new XSLTInputSource(xslsrc);
stylesheet=loaderprocessor.processStylesheet(style);
}
@@ -75,11 +82,11 @@
// Create the processor and set it as this documenthandler
this.processor=XSLTProcessorFactory.getProcessor();
this.processor.setStylesheet(stylesheet);
- Enumeration enum = ((HttpEnvironment)environment).getRequest().getParameterNames();
+ Enumeration enum = request.getParameterNames();
while (enum.hasMoreElements()) {
String name = (String)enum.nextElement();
if (isValidXSLTParameterName(name)) {
- String value = ((HttpEnvironment)environment).getRequest().getParameter(name);
+ String value = request.getParameter(name);
processor.setStylesheetParam(name,this.processor.createXString(value));
}
}