cziegeler 01/10/23 04:16:59
Modified: . Tag: cocoon_20_branch build.xml
documentation Tag: cocoon_20_branch sitemap.xmap
documentation/stylesheets Tag: cocoon_20_branch
book2menu.xsl filterlinks.xsl site2xhtml.xsl
documentation/svg Tag: cocoon_20_branch header.xml label.xml
separator.xml
src/org/apache/cocoon Tag: cocoon_20_branch Main.java
src/org/apache/cocoon/serialization Tag: cocoon_20_branch
SVGSerializer.java
src/org/apache/cocoon/servlet Tag: cocoon_20_branch
CocoonServlet.java
Added: documentation/stylesheets Tag: cocoon_20_branch
script-cli.js script.js
src/META-INF/services Tag: cocoon_20_branch
org.apache.batik.util.ParsedURLProtocolHandler
src/org/apache/cocoon/components/url Tag: cocoon_20_branch
ParsedContextURLProtocolHandler.java
ParsedResourceURLProtocolHandler.java
Log:
Synced doc build system with 2.1
Revision Changes Path
No revision
No revision
1.8.2.49 +10 -9 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.8.2.48
retrieving revision 1.8.2.49
diff -u -r1.8.2.48 -r1.8.2.49
--- build.xml 2001/10/22 09:15:06 1.8.2.48
+++ build.xml 2001/10/23 11:16:58 1.8.2.49
@@ -382,7 +382,8 @@
<fileset dir="${build.src}">
<include name="**/Manifest.mf"/>
<include name="**/*.xsl"/>
- <include name="**/*.roles"/>
+ <include name="**/*.roles"/>
+ <include name="META-INF/**"/>
</fileset>
</copy>
@@ -417,7 +418,11 @@
<!-- =================================================================== -->
<target name="package" depends="compile" description="Generates the jar package">
<jar jarfile="${build.dir}/${name}.jar" manifest="${build.src}/Manifest.mf">
- <fileset dir="${build.dest}" includes="org/**"
excludes="org/apache/cocoon/samples/**"/>
+ <fileset dir="${build.dest}">
+ <include name="org/**"/>
+ <include name="META-INF/**"/>
+ <exclude name="org/apache/cocoon/samples/**"/>
+ </fileset>
</jar>
</target>
@@ -545,13 +550,9 @@
<fileset dir="${build.context}">
</fileset>
</copy>
- <!-- change the image src for xvg -->
- <replace file="${build.war}/documentation/svg/label.xml"
- token="file:images/label-background_b.gif"
- value="file:documentation/images/label-background_b.gif"/>
- <replace file="${build.war}/documentation/svg/separator.xml"
- token="file:images/separator.gif"
- value="file:documentation/images/images/separator.gif"/>
+
+ <!-- correct the image references -->
+ <replace dir="${build.war}/documentation/svg" token="context://images"
value="context://documentation/images"/>
<!-- copy i18n sample webapp-->
<copy todir="${build.war}/i18n" filtering="off">
No revision
No revision
1.14.2.3 +21 -24 xml-cocoon2/documentation/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/sitemap.xmap,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- sitemap.xmap 2001/10/23 07:00:26 1.14.2.2
+++ sitemap.xmap 2001/10/23 11:16:58 1.14.2.3
@@ -27,8 +27,10 @@
</map:serializer>
<map:serializer name="xml" mime-type="text/xml"
src="org.apache.cocoon.serialization.XMLSerializer"/>
<map:serializer name="links"
src="org.apache.cocoon.serialization.LinkSerializer"/>
- <!-- map:serializer name="svg2jpeg" mime-type="image/jpeg"
src="org.apache.cocoon.serialization.SVGSerializer"/>
- <map:serializer name="svg2png" mime-type="image/png"
src="org.apache.cocoon.serialization.SVGSerializer"/ -->
+ <map:serializer name="svg2jpeg" mime-type="image/jpeg"
src="org.apache.cocoon.serialization.SVGSerializer">
+ <parameter name="quality" type="float" value="1.0"/>
+ </map:serializer>
+ <map:serializer name="svg2png" mime-type="image/png"
src="org.apache.cocoon.serialization.SVGSerializer"/>
</map:serializers>
<map:matchers default="wildcard">
@@ -58,9 +60,12 @@
<map:redirect-to uri="index.html"/>
</map:match>
- <map:match pattern="**book.xml">
+ <map:match pattern="**book-**.xml">
<map:generate src="xdocs/{1}book.xml"/>
- <map:transform src="stylesheets/book2menu.xsl"/>
+ <map:transform src="stylesheets/book2menu.xsl">
+ <map:parameter name="use-request-parameters" value="true"/>
+ <map:parameter name="resource" value="{2}.html"/>
+ </map:transform>
<map:serialize type="xml"/>
</map:match>
@@ -93,7 +98,7 @@
<map:match pattern="*.html">
<map:aggregate element="site">
- <map:part src="cocoon:/book.xml"/>
+ <map:part src="cocoon:/book-{1}.xml"/>
<map:part src="cocoon:/body-{1}.xml"/>
</map:aggregate>
<map:transform src="stylesheets/site2xhtml.xsl">
@@ -105,7 +110,7 @@
<map:match pattern="**/*.html">
<map:aggregate element="site">
- <map:part src="cocoon:/{1}/book.xml"/>
+ <map:part src="cocoon:/{1}/book-{1}/{2}.xml"/>
<map:part src="cocoon:/body-{1}/{2}.xml"/>
</map:aggregate>
<map:transform src="stylesheets/site2xhtml.xsl">
@@ -124,6 +129,14 @@
<map:read src="xdocs/{1}.txt" mime-type="text"/>
</map:match>
+ <map:match pattern="**resources/script.js">
+ <map:read src="stylesheets/script-cli.js" mime-type="application/javascript"/>
+ </map:match>
+
+ <map:match pattern="**resources/**.js">
+ <map:read src="stylesheets/{2}.js" mime-type="application/javascript"/>
+ </map:match>
+
<map:match pattern="**.css">
<map:read src="{1}.css" mime-type="text"/>
</map:match>
@@ -140,31 +153,15 @@
<map:read src="images/{2}.gif" mime-type="image/gif"/>
</map:match>
- <!-- map:match pattern="**graphics/**-separator.jpg">
- <map:generate src="svg/separator.xml"/>
- <map:transform src="svg/addlabel.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- <map:parameter name="label" value="{2}"/>
- </map:transform>
- <map:serialize type="svg2jpeg"/>
- </map:match>
- <map:match pattern="**graphics/**-label.jpg">
- <map:generate src="svg/label.xml"/>
+ <map:match pattern="**graphics/**-*.jpg">
+ <map:generate src="svg/{3}.xml"/>
<map:transform src="svg/addlabel.xsl">
<map:parameter name="use-request-parameters" value="true"/>
<map:parameter name="label" value="{2}"/>
</map:transform>
<map:serialize type="svg2jpeg"/>
</map:match>
-
- <map:match pattern="**graphics/**-header.jpg">
- <map:generate src="svg/header.xml"/>
- <map:transform src="svg/addlabel.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- </map:transform>
- <map:serialize type="svg2jpeg"/>
- </map:match -->
</map:pipeline>
</map:pipelines>
No revision
No revision
1.5.2.2 +26 -37 xml-cocoon2/documentation/stylesheets/book2menu.xsl
Index: book2menu.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/stylesheets/book2menu.xsl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- book2menu.xsl 2001/10/05 09:31:11 1.5.2.1
+++ book2menu.xsl 2001/10/23 11:16:58 1.5.2.2
@@ -3,6 +3,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
+ <xsl:param name="resource"/>
+
<xsl:template match="book">
<menu>
<xsl:apply-templates/>
@@ -16,7 +18,6 @@
<xsl:apply-templates/>
</xsl:template>
-<!-- The following templates use svg instead of normal text
<xsl:template match="menu">
<tr>
<td align="left" valign="top">
@@ -33,20 +34,37 @@
<xsl:apply-templates/>
</xsl:template>
+
<xsl:template match="menu-item">
<xsl:if test="not(@type) or @type!='hidden'">
<tr>
<td align="left" valign="top">
- <a href="{@href}">
+ <xsl:choose>
+ <xsl:when test="@href=$resource">
<img alt="{@label}"
- src="graphics/{@label}-label.jpg"
+ src="graphics/{@label}-label_select.jpg"
border="0"
height="12"
width="120"
name="{@label}"
hspace="0"
vspace="0"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{@href}" onMouseOut="rolloverOff('{@label}')"
+ onMouseOver="rolloverOn('{@label}')">
+ <img alt="{@label}"
+ src="graphics/{@label}-label.jpg"
+ border="0"
+ height="12"
+ width="120"
+ name="{@label}"
+ hspace="0"
+ vspace="0"
+ onLoad="rolloverLoad('{@label}',
'graphics/{@label}-label_over.jpg', 'graphics/{@label}-label.jpg');"/>
</a>
+ </xsl:otherwise>
+ </xsl:choose>
</td>
</tr>
</xsl:if>
@@ -56,7 +74,9 @@
<xsl:if test="not(@type) or @type!='hidden'">
<tr>
<td align="left" valign="top">
- <a href="{@href}" target="new">
+ <a href="{@href}" target="new"
+ onMouseOut="rolloverOff('{@label}')"
+ onMouseOver="rolloverOn('{@label}')">
<img alt="{@label}"
src="graphics/{@label}-label.jpg"
border="0"
@@ -64,40 +84,9 @@
hspace="0"
name="{@label}"
vspace="0"
- width="120"/>
+ width="120"
+ onLoad="rolloverLoad('{@label}', 'graphics/{@label}-label_over.jpg',
'graphics/{@label}-label.jpg');"/>
</a>
- </td>
- </tr>
- </xsl:if>
- </xsl:template>
--->
-
- <xsl:template match="menu">
- <tr>
- <td align="left" background="images/separator.gif" valign="top">
- <p style="font-family:arial; font-size:9px;
color:black"> <xsl:value-of select="@label"/></p>
- </td>
- </tr>
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match="menu-item">
- <xsl:if test="not(@type) or @type!='hidden'">
- <tr>
- <td align="left" background="images/label-background_b.gif" valign="top">
- <a style="text-decoration:none; color:#FFFFFF; font-family:Arial;
font-size:11; font-weight:bold"
- href="{@href}">     <xsl:value-of
select="@label"/></a>
- </td>
- </tr>
- </xsl:if>
- </xsl:template>
-
- <xsl:template match="external">
- <xsl:if test="not(@type) or @type!='hidden'">
- <tr>
- <td align="left" background="images/label-background_b.gif" valign="top">
- <a style="text-decoration:none; color:#FFFFFF; font-family:Arial;
font-size:11; font-weight:bold"
- href="{@href}">     <xsl:value-of
select="@label"/></a>
</td>
</tr>
</xsl:if>
1.1.2.2 +18 -1 xml-cocoon2/documentation/stylesheets/filterlinks.xsl
Index: filterlinks.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/stylesheets/filterlinks.xsl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- filterlinks.xsl 2001/10/05 09:31:11 1.1.2.1
+++ filterlinks.xsl 2001/10/23 11:16:58 1.1.2.2
@@ -16,10 +16,27 @@
</xsl:if>
</xsl:template>
+ <!-- This is a hack which makes the javascript images work -->
+ <xsl:template match="img[@onLoad and starts-with(@src, 'graphics')]">
+ <img src="{@src}"/>
+ <img>
+ <xsl:attribute name="src">
+ <xsl:value-of select="substring-before(@src, '.')"/>_over.<xsl:value-of
select="substring-after(@src, '.')"/>
+ </xsl:attribute>
+ </img>
+ </xsl:template>
+
+ <xsl:template match="img[@onLoad and starts-with(@src, 'images') and
contains(@src, '-lo.gif')]">
+ <img src="{@src}"/>
+ <img>
+ <xsl:attribute name="src"><xsl:value-of select="substring-before(@src,
'-lo.gif')"/>-hi.gif</xsl:attribute>
+ </img>
+ </xsl:template>
+
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.6.2.2 +22 -16 xml-cocoon2/documentation/stylesheets/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/stylesheets/site2xhtml.xsl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- site2xhtml.xsl 2001/10/05 09:31:11 1.6.2.1
+++ site2xhtml.xsl 2001/10/23 11:16:58 1.6.2.2
@@ -10,6 +10,7 @@
<html>
<head>
<title><xsl:value-of select="/site/document/title"/></title>
+ <script language="JavaScript" src="resources/script.js"
type="text/javascript"></script>
</head>
<body text="#000000" link="#039acc" vlink="#0086b2" alink="#cc0000"
@@ -29,16 +30,9 @@
</td>
</tr>
<tr>
- <!-- using svg
<td width="100%" height="35" valign="top" align="right" colspan="2"
bgcolor="#0086b2">
<img src="{$header}?label={/site/document/title}" hspace="0"
vspace="0" border="0" alt="{/site/document/title}" align="right"/>
</td>
- -->
- <td width="100%" height="35" valign="top" align="right" colspan="2"
bgcolor="#0086b2">
- <p align="right" style="color:white; font-family:arial;
font-size:30px; font-style:italic">
- <xsl:value-of select="/site/document/title"/>
- </p>
- </td>
</tr>
<tr>
<td width="100%" height="20" valign="top" align="left"
bgcolor="#0086b2" background="images/bottom.gif">
@@ -48,21 +42,33 @@
<table border="0" cellpadding="0" cellspacing="0" width="288">
<tr>
<td width="96" height="20" valign="top" align="left">
- <a href="http://xml.apache.org/"; target="new">
- <img alt="http://xml.apache.org/"; width="96" height="20"
src="images/button-xml-lo.gif"
- name="xml" hspace="0" vspace="0" border="0"/>
+ <a href="http://xml.apache.org/"; target="new"
+ onMouseOut="rolloverOff('xml');"
+ onMouseOver="rolloverOn('xml');">
+ <img alt="http://xml.apache.org/"; width="96" height="20"
+ src="images/button-xml-lo.gif"
+ name="xml" hspace="0" vspace="0" border="0"
+ onLoad="rolloverLoad('xml', 'images/button-xml-hi.gif',
'images/button-xml-lo.gif');"/>
</a>
</td>
<td width="96" height="20" valign="top" align="left">
- <a href="http://www.apache.org/"; target="new">
- <img alt="http://www.apache.org/"; width="96" height="20"
src="images/button-asf-lo.gif"
- name="asf" hspace="0" vspace="0" border="0"/>
+ <a href="http://www.apache.org/"; target="new"
+ onMouseOut="rolloverOff('asf');"
+ onMouseOver="rolloverOn('asf');">
+ <img alt="http://www.apache.org/"; width="96" height="20"
+ src="images/button-asf-lo.gif"
+ name="asf" hspace="0" vspace="0" border="0"
+ onLoad="rolloverLoad('asf', 'images/button-asf-hi.gif',
'images/button-asf-lo.gif');"/>
</a>
</td>
<td width="96" height="20" valign="top" align="left">
- <a href="http://www.w3.org/"; target="new">
- <img alt="http://www.w3.org/"; width="96" height="20"
src="images/button-w3c-lo.gif"
- name="w3c" hspace="0" vspace="0" border="0"/>
+ <a href="http://www.w3.org/"; target="new"
+ onMouseOut="rolloverOff('w3c');"
+ onMouseOver="rolloverOn('w3c');">
+ <img alt="http://www.w3.org/"; width="96" height="20"
+ src="images/button-w3c-lo.gif"
+ name="w3c" hspace="0" vspace="0" border="0"
+ onLoad="rolloverLoad('w3c', 'images/button-w3c-hi.gif',
'images/button-w3c-lo.gif');"/>
</a>
</td>
</tr>
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/documentation/stylesheets/script-cli.js
Index: script-cli.js
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/stylesheets/script-cli.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/documentation/stylesheets/script.js
Index: script.js
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/stylesheets/script.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.2.2.2 +2 -1 xml-cocoon2/documentation/svg/header.xml
Index: header.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/svg/header.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- header.xml 2001/10/05 09:31:12 1.2.2.1
+++ header.xml 2001/10/23 11:16:59 1.2.2.2
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<svg xmlns:xlink="http://www.w3.org/1999/xlink"; height="35" width="500">
<rect width="500" height="35" fill="#0086b2"/>
- <text style="font-family:arial; font-size:30px; font-style:italic"
text-anchor="end" x="494" y="30" fill="white"><label/></text>
+ <text style="font-family:arial; font-size:30px; font-style:italic"
text-anchor="end" x="496" y="28" fill="#034170"><label/></text>
+ <text style="font-family:arial; font-size:30px; font-style:italic"
text-anchor="end" x="494" y="26" fill="white"><label/></text>
</svg>
1.3.2.2 +1 -1 xml-cocoon2/documentation/svg/label.xml
Index: label.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/svg/label.xml,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- label.xml 2001/10/05 09:31:12 1.3.2.1
+++ label.xml 2001/10/23 11:16:59 1.3.2.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<svg xmlns:xlink="http://www.w3.org/1999/xlink"; width="120" height="12">
- <image xlink:href="file:images/label-background_b.gif" width="120" height="12"/>
+ <image xlink:href="context://images/label-background_b.gif" width="120"
height="12"/>
<text style="font-family:arial; font-size:12px; font-style:italic" fill="white"
x="14" y="11"><label/></text>
</svg>
1.1.2.2 +1 -1 xml-cocoon2/documentation/svg/separator.xml
Index: separator.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/svg/separator.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- separator.xml 2001/10/05 09:31:12 1.1.2.1
+++ separator.xml 2001/10/23 11:16:59 1.1.2.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<svg xmlns:xlink="http://www.w3.org/1999/xlink"; width="120" height="20">
- <image xlink:href="file:images/separator.gif" width="120" height="20"/>
+ <image xlink:href="context://images/separator.gif" width="120" height="20"/>
<text style="font-family:arial; font-size:9px" fill="black" text-anchor="start"
x="5" y="12"><label/></text>
</svg>
No revision
No revision
1.2.2.1 +0 -0
xml-cocoon2/src/META-INF/services/org.apache.batik.util.ParsedURLProtocolHandler
Index: org.apache.batik.util.ParsedURLProtocolHandler
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/META-INF/services/org.apache.batik.util.ParsedURLProtocolHandler,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
No revision
No revision
1.4.2.22 +3 -1 xml-cocoon2/src/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
retrieving revision 1.4.2.21
retrieving revision 1.4.2.22
diff -u -r1.4.2.21 -r1.4.2.22
--- Main.java 2001/10/22 09:15:06 1.4.2.21
+++ Main.java 2001/10/23 11:16:59 1.4.2.22
@@ -24,6 +24,7 @@
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.MIMEUtils;
import org.apache.cocoon.util.NetUtils;
+import org.apache.cocoon.components.url.ParsedContextURLProtocolHandler;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import org.apache.log.Priority;
@@ -35,7 +36,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.21 $ $Date: 2001/10/22 09:15:06 $
+ * @version CVS $Revision: 1.4.2.22 $ $Date: 2001/10/23 11:16:59 $
*/
public class Main {
@@ -261,6 +262,7 @@
CommandlineContext clContext = new CommandlineContext(contextDir);
clContext.setLogger(log);
appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, clContext);
+ ParsedContextURLProtocolHandler.setContext(clContext);
DefaultLogKitManager logKitManager = null;
if(logKit != null) {
final FileInputStream fis = new FileInputStream(logKit);
No revision
No revision
1.3.2.1 +1 -1
xml-cocoon2/src/org/apache/cocoon/components/url/ParsedContextURLProtocolHandler.java
Index: ParsedContextURLProtocolHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/ParsedContextURLProtocolHandler.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ParsedContextURLProtocolHandler.java 2001/10/12 13:44:49 1.3
+++ ParsedContextURLProtocolHandler.java 2001/10/23 11:16:59 1.3.2.1
@@ -22,7 +22,7 @@
* an uncontrolled manner (as far as Cocoon is concerned).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version $Id: ParsedContextURLProtocolHandler.java,v 1.3 2001/10/12 13:44:49
bloritsch Exp $
+ * @version $Id: ParsedContextURLProtocolHandler.java,v 1.3.2.1 2001/10/23 11:16:59
cziegeler Exp $
*/
public class ParsedContextURLProtocolHandler extends
AbstractParsedURLProtocolHandler {
private static Context context = null;
1.1.2.1 +1 -1
xml-cocoon2/src/org/apache/cocoon/components/url/ParsedResourceURLProtocolHandler.java
Index: ParsedResourceURLProtocolHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/ParsedResourceURLProtocolHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ParsedResourceURLProtocolHandler.java 2001/10/12 13:44:49 1.1
+++ ParsedResourceURLProtocolHandler.java 2001/10/23 11:16:59 1.1.2.1
@@ -17,7 +17,7 @@
* It is safe to use this URL with multiple Cocoon webapps running.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version $Id: ParsedResourceURLProtocolHandler.java,v 1.1 2001/10/12 13:44:49
bloritsch Exp $
+ * @version $Id: ParsedResourceURLProtocolHandler.java,v 1.1.2.1 2001/10/23
11:16:59 cziegeler Exp $
*/
public class ParsedResourceURLProtocolHandler extends
AbstractParsedURLProtocolHandler {
No revision
No revision
1.1.1.1.2.5 +10 -1
xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- SVGSerializer.java 2001/10/11 08:56:14 1.1.1.1.2.4
+++ SVGSerializer.java 2001/10/23 11:16:59 1.1.1.1.2.5
@@ -18,11 +18,14 @@
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.TranscodingHints;
+import org.apache.batik.util.ParsedURL;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
import org.apache.cocoon.components.transcoder.ExtendableTranscoderFactory;
import org.apache.cocoon.components.transcoder.TranscoderFactory;
+import org.apache.cocoon.components.url.ParsedContextURLProtocolHandler;
+import org.apache.cocoon.components.url.ParsedResourceURLProtocolHandler;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.xml.XMLConsumer;
@@ -41,10 +44,16 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ross Burton</a>
- * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:14 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/23 11:16:59 $
*/
public class SVGSerializer extends SVGBuilder
implements Composable, Serializer, Configurable, Poolable, Cacheable {
+
+ // add cocoon specific protocols
+ static {
+ ParsedURL.registerHandler(new ParsedContextURLProtocolHandler());
+ ParsedURL.registerHandler(new ParsedResourceURLProtocolHandler());
+ }
/** The <code>ContentHandler</code> receiving SAX events. */
private ContentHandler contentHandler=null;
No revision
No revision
1.13.2.29 +5 -2 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.13.2.28
retrieving revision 1.13.2.29
diff -u -r1.13.2.28 -r1.13.2.29
--- CocoonServlet.java 2001/10/11 09:11:02 1.13.2.28
+++ CocoonServlet.java 2001/10/23 11:16:59 1.13.2.29
@@ -17,6 +17,7 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.*;
import org.apache.cocoon.components.classloader.RepositoryClassLoader;
+import org.apache.cocoon.components.url.ParsedContextURLProtocolHandler;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.http.HttpContext;
import org.apache.cocoon.environment.http.HttpEnvironment;
@@ -58,7 +59,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Revision: 1.13.2.28 $ $Date: 2001/10/11 09:11:02 $
+ * @version CVS $Revision: 1.13.2.29 $ $Date: 2001/10/23 11:16:59 $
*/
public class CocoonServlet extends HttpServlet {
@@ -123,7 +124,9 @@
String value;
this.servletContext = conf.getServletContext();
- this.appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, new
HttpContext(this.servletContext));
+ HttpContext envContext = new HttpContext(this.servletContext);
+ this.appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, envContext);
+ ParsedContextURLProtocolHandler.setContext(envContext);
this.initLogger();
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
