cziegeler 02/04/09 23:57:27
Modified: . build.xml
src/java/org/apache/cocoon cocoon.roles
src/java/org/apache/cocoon/generation StreamGenerator.java
src/webapp/WEB-INF cocoon.xconf
Log:
Added new resource factory and changed version to 2.1-dev
Revision Changes Path
1.197 +2 -2 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- build.xml 28 Mar 2002 15:03:58 -0000 1.196
+++ build.xml 10 Apr 2002 06:57:27 -0000 1.197
@@ -166,8 +166,8 @@
<property name="fullname" value="Apache Cocoon"/>
<property name="Name" value="Cocoon"/>
<property name="name" value="cocoon"/>
- <property name="version" value="2.0.3-dev"/>
- <property name="short.version" value="2.0.3-dev"/>
+ <property name="version" value="2.1-dev"/>
+ <property name="short.version" value="2.1-dev"/>
<property name="year" value="1999-2002"/>
<echo message="--------------------------------------------------------------"/>
1.19 +2 -1 xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cocoon.roles 8 Apr 2002 14:36:34 -0000 1.18
+++ cocoon.roles 10 Apr 2002 06:57:27 -0000 1.19
@@ -112,7 +112,8 @@
<role name="org.apache.avalon.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ </role>
<role name="org.apache.avalon.excalibur.source.SourceResolver"
shorthand="source-resolver"
1.9 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StreamGenerator.java 20 Mar 2002 20:37:48 -0000 1.8
+++ StreamGenerator.java 10 Apr 2002 06:57:27 -0000 1.9
@@ -85,7 +85,7 @@
* number of bytes read is equal to the getContentLength() value.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Kinga Dziembowski</a>
- * @version CVS $Id: StreamGenerator.java,v 1.8 2002/03/20 20:37:48 vgritsenko Exp $
+ * @version CVS $Id: StreamGenerator.java,v 1.9 2002/04/10 06:57:27 cziegeler Exp $
*/
public class StreamGenerator extends ComposerGenerator
{
@@ -123,7 +123,7 @@
HttpServletRequest request = (HttpServletRequest)
objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT);
contentType = request.getContentType();
if (contentType == null) {
- throw new IOException("Requred header ContentType is missing.");
+ throw new IOException("Required header ContentType is missing.");
} else if (contentType.startsWith("application/x-www-form-urlencoded"))
{
String sXml = request.getParameter(parameter);
inputSource = new InputSource(new StringReader(sXml));
1.5 +9 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cocoon.xconf 5 Apr 2002 11:58:09 -0000 1.4
+++ cocoon.xconf 10 Apr 2002 06:57:27 -0000 1.5
@@ -170,6 +170,15 @@
</source-handler>
+ <!-- Source Factories
+ Each source factory adds a special uri protocol to the system.
+ This will replace the source-handler and url-factory components.
+ -->
+ <source-factories>
+ <component-instance
class="org.apache.avalon.excalibur.source.ResourceSourceFactory" name="resource"/>
+ </source-factories>
+
+
<!-- Program Generator:
The ProgamGenerator builds programs from a XML document written in a
MarkupLanguage.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
