cziegeler 2003/01/30 01:01:32
Modified: lib jars.xml
src/webapp/WEB-INF cocoon.xconf
src/blocks/php/java/org/apache/cocoon/generation
PhpGenerator.java
Added: lib/core excalibur-xmlutil-20030130.jar
Removed: lib/core excalibur-xmlutil-20030122.jar
Log:
Updating to latest excalibur source resolve
Revision Changes Path
1.70 +1 -1 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- jars.xml 30 Jan 2003 08:23:39 -0000 1.69
+++ jars.xml 30 Jan 2003 09:01:31 -0000 1.70
@@ -171,7 +171,7 @@
<description>Part of jakarta-avalon, it is a set of classes and patterns that
support high level server development.</description>
<used-by>Cocoon</used-by>
- <lib>core/excalibur-xmlutil-20030122.jar</lib>
+ <lib>core/excalibur-xmlutil-20030130.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
1.57 +2 -0 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cocoon.xconf 22 Jan 2003 05:19:20 -0000 1.56
+++ cocoon.xconf 30 Jan 2003 09:01:31 -0000 1.57
@@ -160,6 +160,8 @@
<component-instance
class="org.apache.cocoon.components.source.impl.SitemapSourceFactory" name="cocoon"/>
<!-- file protocol : this is a WriteableSource -->
<component-instance
class="org.apache.cocoon.components.source.impl.FileSourceFactory" name="file"/>
+ <!-- This is the default factory -->
+ <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory"
name="*"/>
</source-factories>
1.1 xml-cocoon2/lib/core/excalibur-xmlutil-20030130.jar
<<Binary file>>
1.6 +2 -2
xml-cocoon2/src/blocks/php/java/org/apache/cocoon/generation/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/php/java/org/apache/cocoon/generation/PhpGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PhpGenerator.java 22 Jan 2003 05:19:16 -0000 1.5
+++ PhpGenerator.java 30 Jan 2003 09:01:32 -0000 1.6
@@ -181,7 +181,7 @@
SAXParser parser = null;
try {
inputSource = this.resolver.resolveURI(this.source);
- String systemId = inputSource.getSystemId();
+ String systemId = inputSource.getURI();
if (!systemId.startsWith("file:/"))
throw new IOException("protocol not supported: " + systemId);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
