vgritsenko 02/01/26 09:13:33
Modified: src/java/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java
LogicsheetCodeGenerator.java
src/java/org/apache/cocoon/components/language/markup/sitemap
SitemapMarkupLanguage.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPMarkupLanguage.java
src/java/org/apache/cocoon/components/language/markup/xsp/java
cookie.xsl
Log:
- Provide filters with instance of logger
- Have cookies with the license
Revision Changes Path
1.4 +9 -8
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractMarkupLanguage.java 26 Jan 2002 02:12:33 -0000 1.3
+++ AbstractMarkupLanguage.java 26 Jan 2002 17:13:33 -0000 1.4
@@ -51,7 +51,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/01/26 02:12:33 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/01/26 17:13:33 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composable, Configurable, Recyclable
@@ -163,8 +163,8 @@
}
/**
- * Abstract out the Logicsheet creation. Handles both Named and regular
logicsheets.
- */
+ * Abstract out the Logicsheet creation. Handles both Named and regular
logicsheets.
+ */
private Logicsheet createLogicsheet(Configuration configuration, boolean named)
throws Exception
{
@@ -218,9 +218,9 @@
* @param resolver the entity resolver
* @return XMLFilter the filter that build on the fly the transformer chain
*/
- protected TransformerChainBuilderFilter getTranformerChainBuilder
- (LogicsheetCodeGenerator logicsheetMarkupGenerator,
- SourceResolver resolver)
+ protected TransformerChainBuilderFilter getTransformerChainBuilder(
+ LogicsheetCodeGenerator logicsheetMarkupGenerator,
+ SourceResolver resolver)
{
return new TransformerChainBuilderFilter(logicsheetMarkupGenerator,
resolver);
@@ -289,7 +289,8 @@
codeGenerator.setLogger(getLogger());
codeGenerator.initialize();
// set the transformer chain builder filter
- TransformerChainBuilderFilter tranBuilder =
getTranformerChainBuilder(codeGenerator, resolver);
+ TransformerChainBuilderFilter tranBuilder =
+ getTransformerChainBuilder(codeGenerator, resolver);
tranBuilder.setLanguageDescriptor(language);
tranBuilder.setParent(preprocessFilter);
return codeGenerator.generateCode(tranBuilder, input, filename);
@@ -334,7 +335,7 @@
protected void addLogicsheetToList(LanguageDescriptor language,
String logicsheetLocation,
SourceResolver resolver)
- throws MalformedURLException, IOException, SAXException, ProcessingException
+ throws IOException, SAXException, ProcessingException
{
Logicsheet logicsheet = (Logicsheet)logicsheetCache.get(CACHE_PREFIX +
logicsheetLocation);
if (logicsheet == null) {
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java
Index: LogicsheetCodeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogicsheetCodeGenerator.java 26 Jan 2002 02:53:06 -0000 1.4
+++ LogicsheetCodeGenerator.java 26 Jan 2002 17:13:33 -0000 1.5
@@ -34,7 +34,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.4 $ $Date: 2002/01/26 02:53:06 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/01/26 17:13:33 $
*/
public class LogicsheetCodeGenerator extends AbstractLoggable implements
MarkupCodeGenerator {
@@ -134,7 +134,7 @@
this.rootReader.parse(input);
return this.writer.toString();
} catch (SAXException e) {
- getLogger().debug("Got SAXException, rethrowing cause exception", e);
+ getLogger().debug("Got SAXException; Rethrowing cause exception", e);
throw e.getException();
}
}
1.3 +15 -7
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java
Index: SitemapMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SitemapMarkupLanguage.java 26 Jan 2002 02:12:34 -0000 1.2
+++ SitemapMarkupLanguage.java 26 Jan 2002 17:13:33 -0000 1.3
@@ -32,7 +32,7 @@
* <a
href="http://xml.apache.org/cocoon2/userdocs/concepts/sitemap.html";>Sitemap</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/01/26 02:12:34 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/01/26 17:13:33 $
*/
public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
@@ -112,6 +112,15 @@
dependencies.add(location);
}
+ // This is required here to avoid IllegalAccessError when
+ // SitemapTransformerChainBuilderFilter invokes the method.
+ protected void addLogicsheetToList(LanguageDescriptor language,
+ String logicsheetLocation,
+ SourceResolver resolver)
+ throws IOException, SAXException, ProcessingException
+ {
+ super.addLogicsheetToList(language, logicsheetLocation, resolver);
+ }
/**
* Returns a filter that chain on the fly the requested transformers
@@ -125,15 +134,14 @@
* @param resolver the entity resolver
* @return XMLFilter the filter that build on the fly the transformer chain
*/
- protected TransformerChainBuilderFilter getTranformerChainBuilder (
+ protected TransformerChainBuilderFilter getTransformerChainBuilder (
LogicsheetCodeGenerator logicsheetMarkupGenerator,
- SourceResolver resolver
- ) {
+ SourceResolver resolver)
+ {
SitemapTransformerChainBuilderFilter filter =
new SitemapTransformerChainBuilderFilter(
- logicsheetMarkupGenerator,
- resolver
- );
+ logicsheetMarkupGenerator, resolver
+ );
filter.setLogger(getLogger());
return filter;
}
1.3 +24 -11
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
Index: XSPMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSPMarkupLanguage.java 26 Jan 2002 02:12:34 -0000 1.2
+++ XSPMarkupLanguage.java 26 Jan 2002 17:13:33 -0000 1.3
@@ -34,7 +34,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Sahuc</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/01/26 02:12:34 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/01/26 17:13:33 $
*/
public class XSPMarkupLanguage extends AbstractMarkupLanguage {
@@ -99,7 +99,9 @@
*/
protected XMLFilter getPreprocessFilter( String filename, ProgrammingLanguage
language )
{
- return new PreProcessFilter(filename, language);
+ PreProcessFilter filter = new PreProcessFilter(filename, language);
+ filter.setLogger(getLogger());
+ return filter;
}
/**
@@ -117,6 +119,15 @@
dependencies.add(location);
}
+ // This is required here to avoid IllegalAccessError when
+ // XSPTransformerChainBuilderFilter invokes the method.
+ protected void addLogicsheetToList(LanguageDescriptor language,
+ String logicsheetLocation,
+ SourceResolver resolver)
+ throws IOException, SAXException, ProcessingException
+ {
+ super.addLogicsheetToList(language, logicsheetLocation, resolver);
+ }
/**
* Returns a filter that chain on the fly the requested transformers for source
@@ -130,14 +141,15 @@
* @param resolver the entity resolver
* @return XMLFilter the filter that build on the fly the transformer chain
*/
- protected TransformerChainBuilderFilter getTranformerChainBuilder (
+ protected TransformerChainBuilderFilter getTransformerChainBuilder(
LogicsheetCodeGenerator logicsheetMarkupGenerator,
- SourceResolver resolver
- ) {
- return new XSPTransformerChainBuilderFilter(
- logicsheetMarkupGenerator,
- resolver
- );
+ SourceResolver resolver)
+ {
+ XSPTransformerChainBuilderFilter filter =
+ new XSPTransformerChainBuilderFilter(
+ logicsheetMarkupGenerator, resolver);
+ filter.setLogger(getLogger());
+ return filter;
}
//
@@ -305,6 +317,7 @@
char quote = data.charAt(start-1);
int end = data.indexOf(quote, start);
String href = data.substring(start, end);
+
try {
XSPMarkupLanguage.this.addLogicsheetToList(
language, href, this.resolver
@@ -354,10 +367,10 @@
// Retrieve logicsheets declared by top-level elements
<xsp:logicsheet ...>
// And do not forward the startElement event
if ("xsp:logicsheet".equals(qName)) {
- String location = atts.getValue("location");
+ String href = atts.getValue("location");
try {
XSPMarkupLanguage.this.addLogicsheetToList(
- language, location, this.resolver
+ language, href, this.resolver
);
} catch (ProcessingException pe) {
log.warn("XSPMarkupLanguage.startElement", pe);
1.2 +16 -7
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl
Index: cookie.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cookie.xsl 3 Jan 2002 12:31:11 -0000 1.1
+++ cookie.xsl 26 Jan 2002 17:13:33 -0000 1.2
@@ -1,19 +1,28 @@
<?xml version="1.0"?>
<!--
- *********************************************************************
- * This logicsheet is intended to be used for setting and extracting *
- * cookies
*
- *********************************************************************
+ *****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * _________________________________________________________________________ *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************
-->
+<!--
+ Logicsheet is intended to be used for setting and extracting
+ cookies
+
+ @author ?
+ @version CVS $Revision: 1.2 $ $Date: 2002/01/26 17:13:33 $
+-->
<!-- XSP Cookie logicsheet for the Java language -->
-<xsl:stylesheet
+<xsl:stylesheet
version="1.0"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-cookie="http://apache.org/xsp/cookie/2.0";
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
->
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="xsp:page">
<xsp:page>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
