dims 01/06/14 03:47:42
Modified: . build.sh changes.xml
bin antRun
src/org/apache/cocoon Cocoon.java cocoon.roles
src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
CachingEventPipeline.java
CachingStreamPipeline.java
src/org/apache/cocoon/environment/http RequestWrapper22.java
RequestWrapper23.java
src/org/apache/cocoon/sitemap SitemapComponentSelector.java
sitemap.roles
xdocs site-book.xml
Added: bin ant fix-packages.py runant.pl
lib avalon-excalibur.jar avalon-framework.jar
Removed: lib avalon-excalibur-4.0b3.jar
avalon-framework-4.0b3.jar
Log:
Sync with 2.0 Latest code.
Revision Changes Path
1.5 +10 -27 xml-cocoon2/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.sh 2001/06/04 11:27:04 1.4
+++ build.sh 2001/06/14 10:47:23 1.5
@@ -1,34 +1,17 @@
#!/bin/sh
-# -----------------------------------------------------------------------------
-# build.sh - Unix Build Script for Apache Cocoon
-#
-# $Id: build.sh,v 1.4 2001/06/04 11:27:04 dims Exp $
-# -----------------------------------------------------------------------------
-# ----- Verify and Set Required Environment Variables -------------------------
+echo
+echo "Apache Cocoon 2 Build System"
+echo "----------------------------"
-if [ "$ANT_HOME" = "" ] ; then
- ANT_HOME=.
-fi
+chmod u+x ./bin/antRun
+chmod u+x ./bin/ant
-if [ "$JAVA_HOME" = "" ] ; then
- echo You must set JAVA_HOME to point at your Java Development Kit installation
- exit 1
-fi
+unset ANT_HOME
-# ----- Set Up The Runtime Classpath ------------------------------------------
+export CP=$CLASSPATH
+export CLASSPATH=lib/xerces_1_4_0.jar
-CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/ant_1_3.jar:$ANT_HOME/lib/ant_1_3-optional.jar:./lib/xerces_1_4_0.jar:./lib/xalan-2.1.0.jar
-
-# ----- Make sure Ant script is executable ------------------------------------
+$PWD/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@
-if [ ! -x $ANT_HOME/bin/antRun ] ; then
- chmod 0755 $ANT_HOME/bin/antRun
-fi
-
-# ----- Execute The Requested Build -------------------------------------------
-
-$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main
-Djava.home=$JAVA_HOME -Dant.home=$ANT_HOME -logger
org.apache.tools.ant.NoBannerLogger -emacs $*
-
-
-
+export CLASSPATH=$CP
1.5 +31 -5 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 2001/06/12 15:41:26 1.4
+++ changes.xml 2001/06/14 10:47:23 1.5
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.4 2001/06/12 15:41:26 giacomo Exp $
+ $Id: changes.xml,v 1.5 2001/06/14 10:47:23 dims Exp $
-->
<changes title="History of Changes">
@@ -24,19 +24,45 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="BL" type="add">
+ Added support for fine-grained pool size control for Excalibur Component
+ Architecture.
+ </action>
+ <action dev="BL" type="fix">
+ Fixed component release errors in ContentAggregator (thanks to Vadim
+ Gritsenko for the patch). Also fixed potential race conditions in
+ the ComponentManager architecture in Avalon Excalibur.
+ </action>
<action dev="GP" type="add">
Integrated new StreamGenerator from Kinga Dziembowski
<[EMAIL PROTECTED]>
Documentation is available in the webapp/docs/samples/stream/ReadMeAdd.txt (not
yet converted to xdocs)
</action>
<action dev="CZ" type="update">
+ Fixed ClassCastException in CommandLineEnvironment.
+ Added Redirector interface to the CommandLineEnvironment to avoid class cast
exceptions
+ </action>
+ <action dev="CZ" type="update">
+ Fixed NPE in browser detection.
+ Applied patch to the BrowserImpl. from Ovidiu Predescu ([EMAIL PROTECTED]). It
+ fixes a NPE if the browser is not described.
+ </action>
+ <action dev="CZ" type="update">
+ The TraxTransformer resolves now the uri used inside a stylesheet (e.g.
xsl:include).
+ Applied the patch from Rick Tessner ([EMAIL PROTECTED]).
+ </action>
+ <action dev="CZ" type="update">
+ SQLTransformer is now recycled properly.
+ Applied patch from Ovidiu Predescu ([EMAIL PROTECTED]).
+ </action>
+ </release>
+ <release version="Cocoon 2.0b1" date="June 7, 2001">
+ <action dev="CZ" type="update">
Removed setContentHandler and setLexicalHandler from the XMLProducer interface.
</action>
<action dev="CZ" type="add">
The sitemap components now use the new SourceResolver to resolve
resources instead of the old EntityResolver approach.
</action>
- </release>
- <release version="Cocoon 2.0b1" date="June 7, 2001">
<action dev="GP" type="add">
Added a internal-only attribute to the map:pipeline element to protect them
from being accessed by normal user request. The only way to access them by
@@ -126,8 +152,8 @@
<action dev="DM" type="update">
Eliminated dependency on Xerces for the serializers by using TRaX Serializers.
</action>
- </release>
- <release version="Cocoon 2.0a3" date="March 2001">
+</release>
+<release version="Cocoon 2.0a3" date="March 2001">
<action dev="BL" type="update">
Made Cocoon load classpath independent of Servlet Engine Classpath
Attribute.
1.2 +3 -7 xml-cocoon2/bin/antRun
Index: antRun
===================================================================
RCS file: /home/cvs/xml-cocoon2/bin/antRun,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- antRun 2001/05/09 20:50:40 1.1
+++ antRun 2001/06/14 10:47:26 1.2
@@ -1,13 +1,9 @@
#! /bin/sh
# Args: DIR command
-cd $1
-CMD=$2
+cd "$1"
+CMD="$2"
shift
shift
-if test -f $CMD.sh; then
- CMD="sh $CMD.sh"
-fi
-
-echo $CMD $@ | sh
+exec $CMD "$@"
1.2 +107 -0 xml-cocoon2/bin/ant
1.2 +216 -0 xml-cocoon2/bin/fix-packages.py
1.2 +131 -0 xml-cocoon2/bin/runant.pl
1.3 +303 -279 xml-cocoon2/lib/avalon-excalibur.jar
<<Binary file>>
1.3 +115 -105 xml-cocoon2/lib/avalon-framework.jar
<<Binary file>>
1.11 +2 -3 xml-cocoon2/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Cocoon.java 2001/06/08 20:28:11 1.10
+++ Cocoon.java 2001/06/14 10:47:32 1.11
@@ -55,7 +55,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache
Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/06/08 20:28:11 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/06/14 10:47:32 $
*/
public class Cocoon extends AbstractLoggable implements ThreadSafe, Component,
Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
@@ -315,9 +315,8 @@
}
public void dispose() {
- this.disposed = true;
-
this.componentManager.dispose();
+ this.disposed = true;
}
/**
1.8 +0 -4 xml-cocoon2/src/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cocoon.roles 2001/06/08 20:28:12 1.7
+++ cocoon.roles 2001/06/14 10:47:32 1.8
@@ -40,10 +40,6 @@
shorthand="classloader"
default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
- <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
- shorthand="sax-connector"
- default-class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
-
<role name="org.apache.cocoon.components.image.ImageEncoderSelector"
shorthand="image-encoder"/>
1.8 +1 -3
xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractEventPipeline.java 2001/06/08 20:28:16 1.7
+++ AbstractEventPipeline.java 2001/06/14 10:47:35 1.8
@@ -35,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/06/08 20:28:16 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/06/14 10:47:35 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -123,8 +123,6 @@
// execute the pipeline:
try {
this.generator.generate();
- } catch ( ProcessingException e ) {
- throw e;
} catch ( Exception e ) {
throw e;
}
1.10 +2 -4
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CachingEventPipeline.java 2001/06/08 20:28:17 1.9
+++ CachingEventPipeline.java 2001/06/14 10:47:35 1.10
@@ -52,7 +52,7 @@
* does not cache! (If it would cache, the response would be cached twice!)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/06/08 20:28:17 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/06/14 10:47:35 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
@@ -224,8 +224,6 @@
new CachedEventObject(this.validityObjects,
xmlSerializer.getSAXFragment()));
}
- } catch ( ProcessingException e ) {
- throw e;
} catch ( Exception e ) {
throw e;
}
@@ -403,8 +401,8 @@
}
public void dispose() {
- super.dispose();
if(this.eventCache != null)
this.manager.release((Component)this.eventCache);
+ super.dispose();
}
}
1.6 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachingStreamPipeline.java 2001/06/08 20:28:17 1.5
+++ CachingStreamPipeline.java 2001/06/14 10:47:36 1.6
@@ -45,7 +45,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/06/08 20:28:17 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/06/14 10:47:36 $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -65,9 +65,9 @@
}
public void dispose() {
- super.dispose();
if (this.streamCache != null)
this.manager.release((Component)this.streamCache);
+ super.dispose();
}
/** Set the serializer.
1.3 +3 -2
xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java
Index: RequestWrapper22.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestWrapper22.java 2001/06/12 03:40:51 1.2
+++ RequestWrapper22.java 2001/06/14 10:47:38 1.3
@@ -28,8 +28,9 @@
public class RequestWrapper extends MaybeUploadRequestWrapper {
- public RequestWrapper(HttpServletRequest httpservletrequest, boolean
saveUploadedFilesToDisk, File workDir, boolean allowOverwrite, boolean silentlyRename,
int maxBytes) throws Exception {
- super(httpservletrequest, saveUploadedFilesToDisk, workDir, allowOverwrite,
silentlyRename, maxBytes);
+ public RequestWrapper(HttpServletRequest httpservletrequest, File file, boolean
flag, boolean flag1)
+ throws Exception {
+ super(httpservletrequest, file, flag, flag1);
}
}
1.3 +3 -2
xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java
Index: RequestWrapper23.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestWrapper23.java 2001/06/12 03:40:51 1.2
+++ RequestWrapper23.java 2001/06/14 10:47:38 1.3
@@ -28,8 +28,9 @@
public class RequestWrapper extends MaybeUploadRequestWrapper implements
HttpServletRequest {
- public RequestWrapper(HttpServletRequest httpservletrequest, boolean
saveUploadedFilesToDisk, File workDir, boolean allowOverwrite, boolean silentlyRename,
int max) throws Exception {
- super(httpservletrequest, saveUploadedFilesToDisk, workDir, allowOverwrite,
silentlyRename, max);
+ public RequestWrapper(HttpServletRequest httpservletrequest, File file, boolean
flag, boolean flag1)
+ throws Exception {
+ super(httpservletrequest, file, flag, flag1);
}
public java.util.Map getParameterMap() {
1.4 +2 -4
xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java
Index: SitemapComponentSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SitemapComponentSelector.java 2001/06/08 20:28:26 1.3
+++ SitemapComponentSelector.java 2001/06/14 10:47:39 1.4
@@ -23,12 +23,11 @@
/** Default component manager for Cocoon's sitemap components.
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: SitemapComponentSelector.java,v 1.3 2001/06/08 20:28:26
giacomo Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.4 2001/06/14 10:47:39 dims
Exp $
*/
public class SitemapComponentSelector extends ExcaliburComponentSelector {
private Map mime_types;
private ComponentSelector parentSelector;
- private boolean initialized = false;
/** The conctructors (same as the Avalon ComponentManager)
*/
@@ -38,7 +37,7 @@
}
public void setParentSelector(ComponentSelector newSelector) {
- if ((! this.initialized) && this.parentSelector == null) {
+ if (this.parentSelector == null) {
this.parentSelector = newSelector;
}
}
@@ -62,7 +61,6 @@
public void initialize() {
super.initialize();
this.mime_types = Collections.unmodifiableMap(this.mime_types);
- this.initialized = true;
}
public String getMimeTypeForRole(String role) {
1.3 +4 -0 xml-cocoon2/src/org/apache/cocoon/sitemap/sitemap.roles
Index: sitemap.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/sitemap.roles,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.roles 2001/06/08 20:28:29 1.2
+++ sitemap.roles 2001/06/14 10:47:40 1.3
@@ -9,6 +9,10 @@
shorthand="event-pipeline"
default-class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
+ <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
+ shorthand="sax-connector"
+ default-class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
+
<role name="org.apache.cocoon.acting.ActionSelector"
shorthand="action"
default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
1.7 +4 -0 xml-cocoon2/xdocs/site-book.xml
Index: site-book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/site-book.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- site-book.xml 2001/06/08 10:54:43 1.6
+++ site-book.xml 2001/06/14 10:47:41 1.7
@@ -11,6 +11,7 @@
<separator/>
<page id="install" label="Install" source="installing.xml"/>
<separator/>
+ <page id="overview" label="Overview" source="overview.xml"/>
<page id="uc2" label="Concepts" source="uc2.xml"/>
<page id="sitemap" label="Sitemap" source="sitemap.xml"/>
<page id="actions" label="Actions" source="actions.xml"/>
@@ -21,6 +22,9 @@
<page id="i18n" label="Internationalization" source="i18n.xml"/>
<page id="datasources" label="Using Databases" source="datasources.xml"/>
<page id="svg" label="SVG Serializer" source="svg-serializer.xml"/>
+ <page id="extending" label="Extending C2" source="extending.xml"/>
+ <page id="httprequest" label="HttpRequest" source="httprequest.xml"/>
+ <page id="avalon" label="Avalon" source="avalon.xml"/>
<separator/>
<external href="apidocs/index.html" label="API (Javadoc)"/>
<separator/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
