cvs commit: cocoon-2.1/tools/targets init-build.xml
antonio 2004/03/07 17:56:59
Modified:tools/targets init-build.xml
Log:
Adding support for JSDK 1.5
Revision ChangesPath
1.9 +7 -1 cocoon-2.1/tools/targets/init-build.xml
Index: init-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/init-build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- init-build.xml22 Feb 2004 21:09:24 - 1.8
+++ init-build.xml8 Mar 2004 01:56:59 - 1.9
@@ -14,12 +14,18 @@
property file=src/java/org/apache/cocoon/cocoon.properties/
!-- Detecting the current jvm --
+condition property=target.vm value=1.5
+ equals arg1=1.5 arg2=${ant.java.version}/
+/condition
condition property=target.vm value=1.4
equals arg1=1.4 arg2=${ant.java.version}/
/condition
condition property=target.vm value=1.3
not
-equals arg1=1.4 arg2=${ant.java.version}/
+or
+ equals arg1=1.4 arg2=${ant.java.version}/
+ equals arg1=1.5 arg2=${ant.java.version}/
+/or
/not
/condition
cvs commit: cocoon-2.1 LICENSE.txt
vgritsenko2004/03/07 18:05:58 Modified:.LICENSE.txt Log: IIUC, license should be included verbatim. Moreover, first section has reference to Appendix anyway. Revision ChangesPath 1.3 +26 -1 cocoon-2.1/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/cocoon-2.1/LICENSE.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LICENSE.txt 7 Mar 2004 18:36:37 - 1.2 +++ LICENSE.txt 8 Mar 2004 02:05:58 - 1.3 @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -174,3 +173,29 @@ incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets [] + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same printed page as the copyright notice for easier + identification within third-party archives. + + Copyright [] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.
cvs commit: cocoon-2.1/tools/ide/eclipse make-classpath.xsl classpath-tmpl.xml
antonio 2004/03/07 22:07:15 Modified:.build.bat cocoon.sh announcement.xml mount-table.xml.sample build.xml gump.xml cocoon.bat forrest.properties build.properties build.sh cli.xconf status.xml blocks.properties tools/src/schematron RNG2Schtrn.xsl tools/targets instrumentation-build.xml samples-build.xml compile-build.xml forrest-build.xml validate-build.xml test-build.xml standalone-demo-build.xml init-build.xml webapp-build.xml dist-build.xml ide-build.xml docs-build.xml admin-build.xml tools/src check-jars.xsl blocks-build.xsl gump2blocks.properties.xsl src/blocks/woody/samples/resources mattkruse-lib.js tools/ide/eclipse make-classpath.xsl classpath-tmpl.xml Log: Adding Apache License 2.0 (manually). Revision ChangesPath 1.10 +15 -1 cocoon-2.1/build.bat Index: build.bat === RCS file: /home/cvs//cocoon-2.1/build.bat,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- build.bat 5 Mar 2004 00:44:50 - 1.9 +++ build.bat 8 Mar 2004 06:07:14 - 1.10 @@ -1,4 +1,18 @@ @echo off +rem Copyright 1999-2004 The Apache Software Foundation +rem +rem Licensed under the Apache License, Version 2.0 (the License); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an AS IS BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem rem rem build.bat - Win32 Build Script for Apache Cocoon rem 1.12 +15 -1 cocoon-2.1/cocoon.sh Index: cocoon.sh === RCS file: /home/cvs//cocoon-2.1/cocoon.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cocoon.sh 5 Mar 2004 02:24:26 - 1.11 +++ cocoon.sh 8 Mar 2004 06:07:14 - 1.12 @@ -1,4 +1,18 @@ #!/bin/sh +# Copyright 1999-2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # - # Cocoon Unix Shell Script # 1.5 +15 -1 cocoon-2.1/announcement.xml Index: announcement.xml === RCS file: /home/cvs//cocoon-2.1/announcement.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- announcement.xml 5 Aug 2003 09:49:57 - 1.4 +++ announcement.xml 8 Mar 2004 06:07:14 - 1.5 @@ -1,5 +1,19 @@ ?xml version=1.0? +!-- + Copyright 1999-2004 The Apache Software Foundation + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- !-- Release Announcement Template CVS $Id$ 1.4 +15 -0 cocoon-2.1/mount-table.xml.sample Index: mount-table.xml.sample === RCS file: /home/cvs//cocoon-2.1/mount-table.xml.sample,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mount-table.xml.sample3 Mar 2004 12:35:20 - 1.3 +++
cvs commit: cocoon-2.1/src/java Manifest.mf
antonio 2004/03/07 22:43:26 Modified:src/java Manifest.mf Log: Specifying vendor Revision ChangesPath 1.2 +2 -0 cocoon-2.1/src/java/Manifest.mf Index: Manifest.mf === RCS file: /home/cvs//cocoon-2.1/src/java/Manifest.mf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Manifest.mf 9 Mar 2003 00:08:35 - 1.1 +++ Manifest.mf 8 Mar 2004 06:43:25 - 1.2 @@ -1,2 +1,4 @@ Manifest-Version: 1.0 Main-Class: org.apache.cocoon.Main +Specification-Vendor: The Apache Software Fundation +Implementation-Vendor: The Apache Software Fundation
cvs commit: cocoon-2.1/tools/src/anttasks ManifestToolTask.java XConfToolTask.java
antonio 2004/03/07 23:57:06
Modified:tools/src/anttasks ManifestToolTask.java XConfToolTask.java
Log:
Adding Apache License 2.0 + formatting code
Revision ChangesPath
1.2 +32 -28cocoon-2.1/tools/src/anttasks/ManifestToolTask.java
Index: ManifestToolTask.java
===
RCS file: /home/cvs//cocoon-2.1/tools/src/anttasks/ManifestToolTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ManifestToolTask.java 9 Mar 2003 00:11:45 - 1.1
+++ ManifestToolTask.java 8 Mar 2004 07:57:06 - 1.2
@@ -1,16 +1,25 @@
-/*
- * 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.
*
-
*/
-
-import java.io.*;
-import java.util.*;
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.types.*;
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
/**
* Creates Manifest file with the all the JARs and modification dates
@@ -52,9 +61,8 @@
/**
* Scan recursive
*/
-private void process(final File directoryFile,
- final String manifest)
-throws IOException, BuildException {
+private void process(final File directoryFile, final String manifest)
+throws IOException, BuildException {
System.out.println(Writing: + manifest);
FileWriter w = new FileWriter(this.project.resolveFile(manifest));
@@ -64,25 +72,21 @@
w.write(Cocoon-Libs: );
final File[] files = directoryFile.listFiles();
-for(int i = 0; i files.length; i++) {
+for (int i = 0; i files.length; i++) {
if (files[i].getName().endsWith(.jar)) {
-w.write(files[i].getName());
-w.write( );
+w.write(files[i].getName() + );
}
}
w.write(\n);
-for(int i = 0; i files.length; i++) {
+for (int i = 0; i files.length; i++) {
if (files[i].getName().endsWith(.jar)) {
-w.write(Cocoon-Lib-);
-String s = files[i].getName().replace('.', '_');
-w.write(s);
-w.write(: );
-w.write(String.valueOf(files[i].lastModified()));
-w.write(\n);
+w.write(Cocoon-Lib- +
+files[i].getName().replace('.', '_') +
+: + String.valueOf(files[i].lastModified()) +
+\n);
}
}
-
}
w.close();
}
1.16 +32 -39cocoon-2.1/tools/src/anttasks/XConfToolTask.java
Index: XConfToolTask.java
===
RCS file: /home/cvs//cocoon-2.1/tools/src/anttasks/XConfToolTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XConfToolTask.java5 Mar 2004 13:21:22 - 1.15
+++ XConfToolTask.java8 Mar 2004 07:57:06 - 1.16
@@ -69,7 +69,7 @@
private static final String NL=System.getProperty(line.separator);
private static final String FSEP=System.getProperty(file.separator);
private File file;
-private File directory;
+//private File directory;
private File srcdir;
private boolean addComments;
/** for resolving entities such as dtds */
@@ -98,8 +98,7 @@
*
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store AbstractJCSStore.java
unico 2004/03/08 00:53:54
Modified:src/blocks/scratchpad/java/org/apache/cocoon/components/store
AbstractJCSStore.java
Log:
No need to use AbstractReadWriteStore
Revision ChangesPath
1.8 +10 -10
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/AbstractJCSStore.java
Index: AbstractJCSStore.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/AbstractJCSStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractJCSStore.java 7 Mar 2004 22:34:58 - 1.7
+++ AbstractJCSStore.java 8 Mar 2004 08:53:54 - 1.8
@@ -21,13 +21,13 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.excalibur.store.Store;
-import org.apache.excalibur.store.impl.AbstractReadWriteStore;
import org.apache.jcs.access.GroupCacheAccess;
import org.apache.jcs.access.exception.CacheException;
import org.apache.jcs.engine.control.CompositeCache;
@@ -40,7 +40,7 @@
* @author a href=mailto:[EMAIL PROTECTED]Corin Moss/a
* @author a href=mailto:[EMAIL PROTECTED]Carsten Ziegeler/a
*/
-public abstract class AbstractJCSStore extends AbstractReadWriteStore
+public abstract class AbstractJCSStore extends AbstractLogEnabled
implements Store, Parameterizable, Initializable, Disposable, ThreadSafe
{
/** The JCS configuration properties */
@@ -113,7 +113,7 @@
* @param key the Key object
* @return the Object associated with Key Object
*/
-protected Object doGet(Object key)
+public Object get(Object key)
{
Object value = null;
@@ -140,7 +140,7 @@
* @param value the value object
* @exception IOException
*/
-protected void doStore(Object key, Object value)
+public void store(Object key, Object value)
throws IOException
{
@@ -163,13 +163,13 @@
* Frees some values of the store.
* TODO: implementation?
*/
-protected void doFree() {
+public void free() {
}
/**
* Clear the Store of all elements
*/
-protected void doClear()
+public void clear()
{
if (getLogger().isDebugEnabled())
@@ -192,7 +192,7 @@
*
* @param key the key object
*/
-protected void doRemove(Object key)
+public void remove(Object key)
{
if (getLogger().isDebugEnabled())
{
@@ -215,7 +215,7 @@
* @param key the key object
* @return true if Key exists and false if not
*/
-protected boolean doContainsKey(Object key)
+public boolean containsKey(Object key)
{
return m_JCS.get(key) != null;
}
@@ -224,12 +224,12 @@
/**
* Return all existing keys.
*/
-protected Enumeration doGetKeys()
+public Enumeration keys()
{
return new IteratorEnumeration(this.m_JCS.getGroupKeys().iterator());
}
-protected int doGetSize()
+public int size()
{
return m_JCS.getSize();
}
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
antonio 2004/03/08 02:06:58
Modified:tools/targets docs-build.xml
src/blocks/scratchpad/garbage build.xml
src/documentation/xdocs/userdocs/concepts modules-ref.xml
src/documentation/xdocs/faq faq-debugging.xml
tools/src blocks-build.xsl
Log:
Update links to javadoc 1.4.2
(Javadoc 1.4.1 reached End of Life)
Revision ChangesPath
1.7 +1 -1 cocoon-2.1/tools/targets/docs-build.xml
Index: docs-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/docs-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- docs-build.xml8 Mar 2004 06:07:15 - 1.6
+++ docs-build.xml8 Mar 2004 10:06:58 - 1.7
@@ -205,7 +205,7 @@
link offline=true href=http://avalon.apache.org/api;
packagelistloc=${resources.javadoc}/avalon/
link offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api;
packagelistloc=${resources.javadoc}/xerces/
link offline=true href=http://xml.apache.org/xalan-j/apidocs;
packagelistloc=${resources.javadoc}/xalan/
- link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${resources.javadoc}/j2se/
+ link offline=true href=http://java.sun.com/j2se/1.4.2/docs/api;
packagelistloc=${resources.javadoc}/j2se/
link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${resources.javadoc}/j2ee/
packageset dir=${java}
1.3 +2 -2 cocoon-2.1/src/blocks/scratchpad/garbage/build.xml
Index: build.xml
===
RCS file: /home/cvs//cocoon-2.1/src/blocks/scratchpad/garbage/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 6 Mar 2004 02:26:17 - 1.2
+++ build.xml 8 Mar 2004 10:06:58 - 1.3
@@ -247,10 +247,10 @@
version=true
!--
- | Links to other JavaDocs on the web (J2SDK 1.4.1 and JXPATH).
+ | Links to other JavaDocs on the web (J2SDK 1.4.2 and JXPATH).
+--
link href=http://jakarta.apache.org/commons/jxpath/apidocs//
- link href=http://java.sun.com/j2se/1.4.1/docs/api/
+ link href=http://java.sun.com/j2se/1.4.2/docs/api/
!--
| Visual extravaganza...
1.3 +1 -1
cocoon-2.1/src/documentation/xdocs/userdocs/concepts/modules-ref.xml
Index: modules-ref.xml
===
RCS file:
/home/cvs//cocoon-2.1/src/documentation/xdocs/userdocs/concepts/modules-ref.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modules-ref.xml 6 Mar 2004 02:25:50 - 1.2
+++ modules-ref.xml 8 Mar 2004 10:06:58 - 1.3
@@ -111,7 +111,7 @@
codelt;format/gt;/code tags work fine./note
noteSee also:
-link
href=http://java.sun.com/j2se/1.4.1/docs/api/java/text/SimpleDateFormat.html;Java
+link
href=http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html;Java
Date Format/link./note
/section
1.4 +1 -1 cocoon-2.1/src/documentation/xdocs/faq/faq-debugging.xml
Index: faq-debugging.xml
===
RCS file:
/home/cvs//cocoon-2.1/src/documentation/xdocs/faq/faq-debugging.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- faq-debugging.xml 6 Mar 2004 02:25:57 - 1.3
+++ faq-debugging.xml 8 Mar 2004 10:06:58 - 1.4
@@ -84,7 +84,7 @@
codejdb -connect com.sun.jdi.SocketAttach:port=8000/code
instead.
br/
More information on this can be found in the
-link
href=http://java.sun.com/j2se/1.4.1/docs/guide/jpda/conninv.html;
+link
href=http://java.sun.com/j2se/1.4.2/docs/guide/jpda/conninv.html;
JPDA documentation/link.
/p
note
1.48 +2 -2 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs//cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- blocks-build.xsl 8 Mar 2004 06:07:15 - 1.47
+++ blocks-build.xsl 8 Mar 2004 10:06:58 - 1.48
@@ -173,7 +173,7 @@
splitindex=true
windowtitle={string('${Name}')} API {string('${version}')}
[{string('${TODAY}')}]
doctitle={string('${Name}')} API {string('${version}')}
- bottom=Copyright #169; {string('${year}')} Apache
cvs commit: cocoon-2.1/src/java/org/apache/cocoon Constants.java
cziegeler2004/03/08 04:07:40
Modified:src/java/org/apache/cocoon/components/treeprocessor
DefaultTreeBuilder.java
AbstractProcessingNodeBuilder.java
src/java/org/apache/cocoon/sitemap SitemapParameters.java
src/java/org/apache/cocoon/matching
AbstractWildcardMatcher.java
AbstractRegexpMatcher.java
src/java/org/apache/cocoon/components/treeprocessor/variables
VariableResolver.java
src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
src/java/org/apache/cocoon Constants.java
Log:
Move sitemap location out of the Parameters object again.
First solution for bug 27432
Revision ChangesPath
1.8 +5 -7
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
Index: DefaultTreeBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultTreeBuilder.java 5 Mar 2004 13:02:51 - 1.7
+++ DefaultTreeBuilder.java 8 Mar 2004 12:07:39 - 1.8
@@ -34,18 +34,16 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.ExtendedComponentSelector;
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.source.SourceUtil;
-import
org.apache.cocoon.components.treeprocessor.variables.NOPVariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.sitemap.PatternException;
+import org.apache.cocoon.sitemap.SitemapParameters;
import org.apache.excalibur.source.Source;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -471,11 +469,11 @@
if (children.length == 0) {
// Parameters are only the component's location
-return Collections.singletonMap(new
NOPVariableResolver(Constants.SITEMAP_PARAMETERS_LOCATION), new
NOPVariableResolver(config.getLocation()));
+// TODO Optimize this
+return new SitemapParameters.ExtendedHashMap(config);
}
-Map params = new HashMap();
-params.put(new
NOPVariableResolver(Constants.SITEMAP_PARAMETERS_LOCATION), new
NOPVariableResolver(config.getLocation()));
+Map params = new SitemapParameters.ExtendedHashMap(config,
children.length+1);
for (int i = 0; i children.length; i++) {
Configuration child = children[i];
if (true) { // FIXME : check namespace
1.4 +5 -8
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java
Index: AbstractProcessingNodeBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractProcessingNodeBuilder.java5 Mar 2004 13:02:51 -
1.3
+++ AbstractProcessingNodeBuilder.java8 Mar 2004 12:07:39 -
1.4
@@ -21,12 +21,10 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.cocoon.Constants;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.sitemap.PatternException;
+import org.apache.cocoon.sitemap.SitemapParameters;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -75,12 +73,11 @@
if (children.length == 0) {
// Parameters are only the component's location
-return
Collections.singletonMap(Constants.SITEMAP_PARAMETERS_LOCATION,
config.getLocation());
+// TODO Optimize this
+return new SitemapParameters.ExtendedHashMap(config);
}
-Map params = new HashMap(children.length+1);
-// Add the location information as a parameter
-params.put(Constants.SITEMAP_PARAMETERS_LOCATION,
config.getLocation());
+Map params = new
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/xml SaxBuffer.java
cziegeler2004/03/08 05:38:18
Modified:src/java/org/apache/cocoon/xml SaxBuffer.java
Log:
Make SAXBuffer serializable (to store it somewhere)
Revision ChangesPath
1.4 +34 -68cocoon-2.2/src/java/org/apache/cocoon/xml/SaxBuffer.java
Index: SaxBuffer.java
===
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/SaxBuffer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaxBuffer.java1 Mar 2004 08:24:59 - 1.3
+++ SaxBuffer.java8 Mar 2004 13:38:18 - 1.4
@@ -1,53 +1,18 @@
/*
-
-
- The Apache Software License, Version 1.1
-
-
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment: This product includes software
-developed by the Apache Software Foundation (http://www.apache.org/).
-Alternately, this acknowledgment may appear in the software itself, if
-and wherever such third-party acknowledgments normally appear.
-
- 4. The names Apache Cocoon and Apache Software Foundation must not be
-used to endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-[EMAIL PROTECTED]
-
- 5. Products derived from this software may not be called Apache, nor may
-Apache appear in their name, without prior written permission of the
-Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation and was originally created by
- Stefano Mazzocchi [EMAIL PROTECTED]. For more information on the Apache
- Software Foundation, please see http://www.apache.org/.
-
-*/
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cocoon.xml;
import org.xml.sax.ContentHandler;
@@ -58,6 +23,7 @@
import org.apache.excalibur.xml.sax.XMLizable;
import org.apache.avalon.excalibur.pool.Recyclable;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -79,7 +45,7 @@
* @author a href=mailto:dev@cocoon.apache.org;Apache Cocoon Team/a
* @version CVS $Id$
*/
-public class SaxBuffer implements XMLConsumer, XMLizable, Recyclable {
+public class SaxBuffer implements XMLConsumer, XMLizable, Recyclable,
Serializable {
/**
* Stores list of [EMAIL PROTECTED] SaxBit} objects.
@@ -224,21 +190,21 @@
public void send(ContentHandler contentHandler) throws SAXException;
}
-final static class StartDocument implements SaxBit {
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/xml SaxBuffer.java
cziegeler2004/03/08 05:38:20
Modified:src/java/org/apache/cocoon/xml SaxBuffer.java
Log:
Make SAXBuffer serializable (to store it somewhere)
Revision ChangesPath
1.11 +20 -19cocoon-2.1/src/java/org/apache/cocoon/xml/SaxBuffer.java
Index: SaxBuffer.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/SaxBuffer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SaxBuffer.java5 Mar 2004 13:03:01 - 1.10
+++ SaxBuffer.java8 Mar 2004 13:38:20 - 1.11
@@ -23,6 +23,7 @@
import org.apache.excalibur.xml.sax.XMLizable;
import org.apache.avalon.excalibur.pool.Recyclable;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -44,7 +45,7 @@
* @author a href=mailto:dev@cocoon.apache.org;Apache Cocoon Team/a
* @version CVS $Id$
*/
-public class SaxBuffer implements XMLConsumer, XMLizable, Recyclable {
+public class SaxBuffer implements XMLConsumer, XMLizable, Recyclable,
Serializable {
/**
* Stores list of [EMAIL PROTECTED] SaxBit} objects.
@@ -189,21 +190,21 @@
public void send(ContentHandler contentHandler) throws SAXException;
}
-final static class StartDocument implements SaxBit {
+final static class StartDocument implements SaxBit, Serializable {
static public final StartDocument SINGLETON = new StartDocument();
public void send(ContentHandler contentHandler) throws SAXException {
contentHandler.startDocument();
}
}
-final static class EndDocument implements SaxBit {
+final static class EndDocument implements SaxBit, Serializable {
static public final EndDocument SINGLETON = new EndDocument();
public void send(ContentHandler contentHandler) throws SAXException {
contentHandler.endDocument();
}
}
-final static class PI implements SaxBit {
+final static class PI implements SaxBit, Serializable {
private final String target;
private final String data;
@@ -217,7 +218,7 @@
}
}
-final static class StartDTD implements SaxBit {
+final static class StartDTD implements SaxBit, Serializable {
private final String name;
private final String publicId;
private final String systemId;
@@ -234,7 +235,7 @@
}
}
-final static class EndDTD implements SaxBit {
+final static class EndDTD implements SaxBit, Serializable {
static public final EndDTD SINGLETON = new EndDTD();
public void send(ContentHandler contentHandler) throws SAXException {
if (contentHandler instanceof LexicalHandler)
@@ -242,7 +243,7 @@
}
}
-final static class StartEntity implements SaxBit {
+final static class StartEntity implements SaxBit, Serializable {
private final String name;
public StartEntity(String name) {
@@ -255,7 +256,7 @@
}
}
-final static class EndEntity implements SaxBit {
+final static class EndEntity implements SaxBit, Serializable {
private final String name;
public EndEntity(String name) {
@@ -268,7 +269,7 @@
}
}
-final static class SkippedEntity implements SaxBit {
+final static class SkippedEntity implements SaxBit, Serializable {
private final String name;
public SkippedEntity(String name) {
@@ -280,7 +281,7 @@
}
}
-final static class StartPrefixMapping implements SaxBit {
+final static class StartPrefixMapping implements SaxBit, Serializable {
private final String prefix;
private final String uri;
@@ -294,7 +295,7 @@
}
}
-final static class EndPrefixMapping implements SaxBit {
+final static class EndPrefixMapping implements SaxBit, Serializable {
private final String prefix;
public EndPrefixMapping(String prefix) {
@@ -306,7 +307,7 @@
}
}
-final static class StartElement implements SaxBit {
+final static class StartElement implements SaxBit, Serializable {
private final String namespaceURI;
private final String localName;
private final String qName;
@@ -324,7 +325,7 @@
}
}
-final static class EndElement implements SaxBit {
+final static class EndElement implements SaxBit, Serializable {
private final String namespaceURI;
private final String localName;
private final String qName;
@@ -340,7 +341,7 @@
}
}
-final static class
cvs commit: cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron QuartzJobScheduler.java JobScheduler.java
unico 2004/03/08 05:43:42
Modified:src/blocks/cron/java/org/apache/cocoon/components/cron
QuartzJobScheduler.java JobScheduler.java
Log:
add method to schedule a periodic job directly
Revision ChangesPath
1.10 +33 -2
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
Index: QuartzJobScheduler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- QuartzJobScheduler.java 5 Mar 2004 13:01:49 - 1.9
+++ QuartzJobScheduler.java 8 Mar 2004 13:43:42 - 1.10
@@ -224,6 +224,36 @@
addJob(name, jobDataMap, timeEntry, canRunConcurrently, params,
objects);
}
+
+/**
+ * Schedule a periodic job. The job is started the first time when the
period has passed. Note that if a job with
+ * the same name has already beed added it is overwritten.
+ *
+ * @param name the name of the job
+ * @param job The job object itself. It must implement either CronJob,
Runnable or might also be an implementation
+ *specific class (i.e. org.quartz.Job)
+ * @param period Every period seconds this job is started
+ * @param canRunConcurrently whether this job can run even previous
scheduled runs are still running
+ * @param params Additional Parameters to setup CronJob
+ * @param objects A Map with additional object to setup CronJob
+ */
+public void addPeriodicJob(String name, Object job, long period, boolean
canRunConcurrently, Parameters params,
+ Map objects)
+throws CascadingException {
+if (!(job instanceof CronJob) !(job instanceof Runnable) !(job
instanceof Job)) {
+throw new CascadingException(Job object is neither an instance
of + CronJob.class.getName() + , +
+ Runnable.class.getName() + nor
+ Job.class.getName());
+}
+final JobDataMap jobDataMap = new JobDataMap();
+jobDataMap.put(DATA_MAP_OBJECT, job);
+
+final long ms = period * 1000;
+final SimpleTrigger timeEntry =
+new SimpleTrigger(name, DEFAULT_QUARTZ_JOB_GROUP, new
Date(System.currentTimeMillis() + ms), null,
+ SimpleTrigger.REPEAT_INDEFINITELY, ms);
+
+addJob(name, jobDataMap, timeEntry, canRunConcurrently, params,
objects);
+}
/* (non-Javadoc)
* @see
org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
@@ -743,5 +773,6 @@
}
}
}
+
}
1.7 +17 -1
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/JobScheduler.java
Index: JobScheduler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/JobScheduler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JobScheduler.java 5 Mar 2004 13:01:49 - 1.6
+++ JobScheduler.java 8 Mar 2004 13:43:42 - 1.7
@@ -113,6 +113,22 @@
void addPeriodicJob(String name, String jobrole, long period, boolean
canRunConcurrently, Parameters params,
Map objects)
throws CascadingException;
+
+/**
+ * Schedule a periodic job. The job is started the first time when the
period has passed. Note that if a job with
+ * the same name has already beed added it is overwritten.
+ *
+ * @param name the name of the job
+ * @param job The job object itself. It must implement either CronJob,
Runnable or might also be an implementation
+ *specific class (i.e. org.quartz.Job)
+ * @param period Every period seconds this job is started
+ * @param canRunConcurrently whether this job can run even previous
scheduled runs are still running
+ * @param params Additional Parameters to setup CronJob
+ * @param objects A Map with additional object to setup CronJob
+ */
+void addPeriodicJob(String name, Object job, long period, boolean
canRunConcurrently, Parameters params,
+Map objects)
+throws CascadingException;
/**
* Fire a job once immediately
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/crawler SimpleCocoonCrawlerImpl.java CocoonCrawler.java
cziegeler2004/03/08 05:57:40 Modified:src/java/org/apache/cocoon CascadingIOException.java ResourceNotFoundException.java Modifiable.java CompilingProcessor.java ConnectionResetException.java ProcessingException.java Processor.java ProcessorWrapper.java Constants.java Main.java Cocoon.java src/java/org/apache/cocoon/acting RequestParamAction.java AbstractValidatorAction.java SessionInvalidatorAction.java AbstractConfigurableAction.java SessionIsValidAction.java HelloAction.java ServerPagesAction.java SetCharacterEncodingAction.java ValidatorActionHelper.java ClearCacheAction.java AbstractComplementaryConfigurableAction.java AbstractAction.java FormValidatorAction.java SessionPropagatorAction.java HttpHeaderAction.java ClearPersistentStoreAction.java SessionStateAction.java ResourceExistsAction.java ServiceableAction.java RequestParameterExistsAction.java SessionValidatorAction.java ConfigurableServiceableAction.java ConfigurationHelper.java LocaleAction.java Action.java CopySourceAction.java AbstractMultiAction.java InputModuleAction.java ValidatorActionResult.java src/java/org/apache/cocoon/components/flow FlowHelper.java ContinuationsManagerImpl.java CompilingInterpreter.java ContinuationsManager.java AbstractInterpreter.java ContinuationsDisposer.java InvalidContinuationException.java Interpreter.java WebContinuation.java src/java/org/apache/cocoon/components LifecycleHelper.java SitemapConfigurable.java ContextHelper.java SitemapConfigurationHolder.java ChainedConfiguration.java src/java/org/apache/cocoon/components/cprocessor/variables VariableResolverFactory.java NOPVariableResolver.java VariableResolver.java PreparedVariableResolver.java src/java/org/apache/cocoon/components/classloader ClassLoaderManagerImpl.java ClassLoaderManager.java NonStaticClassLoaderManager.java RepositoryClassLoader.java src/java/org/apache/cocoon/components/cprocessor/sitemap FlowNode.java ViewNode.java ComponentNode.java AbstractComponentNode.java ViewablePipelineComponentNode.java AbstractPipelineComponentNode.java src/java/org/apache/cocoon/components/container ComponentContext.java DefaultSitemapConfigurationHolder.java SitemapConfigurableCreator.java CocoonContainer.java src/java/org/apache/cocoon/bean Target.java CocoonBean.java OldCocoonWrapper.java OldCocoonBean.java BeanListener.java CocoonCommandFailureHandler.java ProcessorBean.java BatchProcessorBean.java src/java/org/apache/cocoon/components/cprocessor/sitemap/impl RedirectToURINode.java GeneratorNode.java ActionSetNode.java PipelineNode.java ReadNode.java PipelinesNode.java MatchNode.java SelectNode.java GenerateNode.java HandleErrorsNode.java AggregateNode.java ActNode.java TransformNode.java ViewNodeImpl.java CallFunctionNode.java SerializerNode.java MountNode.java SerializeNode.java ReaderNode.java CallResourceNode.java ErrorHandlerHelper.java TransformerNode.java FlowNodeImpl.java src/java/org/apache/cocoon/components/flow/javascript/fom PageLocalScope.java PageLocalScopeHolder.java FOM_Cocoon.java PageLocalScopeImpl.java PageLocalImpl.java PageLocal.java FOM_WebContinuation.java FOM_JavaScriptFlowHelper.java FOM_JavaScriptInterpreter.java CompilingClassLoader.java
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/flow/util PipelineUtil.java
cziegeler2004/03/08 05:58:32 Modified:src/java/org/apache/cocoon/components/modules/input RandomNumberModule.java IteratorHelper.java XMLMetaModule.java RequestModule.java ChainMetaModule.java NullInputModule.java SessionModule.java RawRequestParameterModule.java BaseLinkModule.java PropertiesFileModule.java DefaultsModule.java MapMetaModule.java LocateResource.java DefaultsMetaModule.java SitemapVariableHolder.java RequestParameterModule.java RequestURIModule.java XMLFileModule.java DigestMetaModule.java DateMetaInputModule.java InputModule.java SimpleMappingMetaModule.java AbstractJXPathModule.java StringConstantModule.java DateInputModule.java AbstractInputModule.java RequestAttributeModule.java SessionAttributeModule.java JXPathMetaModule.java RealPathModule.java HeaderAttributeModule.java AbstractMetaModule.java GlobalInputModule.java src/java/org/apache/cocoon/components/language/markup/xsp SOAPHelper.java XSLTExtension.java XSPMarkupLanguage.java XSPGenerator.java XSPSessionHelper.java JSGenerator.java XSPModuleHelper.java XSPFormValidatorHelper.java XSPCookieHelper.java XSPResponseHelper.java XSPObjectHelper.java XSPRequestHelper.java XSPUtil.java src/java/org/apache/cocoon/components/language/markup Logicsheet.java MarkupLanguage.java CocoonMarkupLanguage.java LogicsheetCodeGenerator.java NamedLogicsheet.java AbstractMarkupLanguage.java MarkupCodeGenerator.java src/java/org/apache/cocoon/components/language/generator CompiledComponent.java ProgramGenerator.java ProgramGeneratorImpl.java src/java/org/apache/cocoon/components/notification SimpleNotifyingBean.java Notifier.java NotifyingBuilder.java DefaultNotifyingBuilder.java NotifyingCascadingRuntimeException.java Notifying.java src/java/org/apache/cocoon/components/language/programming CompiledProgrammingLanguage.java Program.java CodeFormatter.java CompilerError.java AbstractProgrammingLanguage.java ProgrammingLanguage.java LanguageCompiler.java src/java/org/apache/cocoon/components/language/programming/java NullFormatter.java JstyleFormatter.java AbstractJavaCompiler.java JavaLanguage.java JavaProgram.java Jikes.java Pizza.java EclipseJavaCompiler.java Javac.java src/java/org/apache/cocoon/components/modules/output RequestAttributeOutputModule.java AbstractOutputModule.java OutputModule.java SessionAttributeOutputModule.java RequestAttributeMap.java src/java/org/apache/cocoon/components/language/programming/javascript JavascriptProgram.java JavascriptLanguage.java CompiledJavascriptLanguage.java src/java/org/apache/cocoon/components/language LanguageException.java src/java/org/apache/cocoon/components/flow/util PipelineUtil.java Log: Updating licenses Revision ChangesPath 1.3 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java.diff?r1=1.2r2=1.3 1.4 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java.diff?r1=1.3r2=1.4 1.4 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java.diff?r1=1.3r2=1.4 1.4 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/RequestModule.java
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/source/helpers SourceCredential.java
cziegeler2004/03/08 06:01:58 Modified:src/java/org/apache/cocoon/components/store/impl FilesystemStore.java DefaultStore.java DefaultPersistentStore.java DefaultTransientStore.java src/java/org/apache/cocoon/components/xscript XScriptManager.java XScriptObjectResult.java XScriptManagerImpl.java XScriptVariableScope.java StringBufferContentHandler.java XScriptObject.java XScriptObjectFromURL.java XScriptObjectInlineXML.java src/java/org/apache/cocoon/components/source/impl DelayedRefreshSourceWrapper.java SitemapSourceFactory.java SourceDeferredValidity.java SitemapSource.java SitemapSourceInfo.java ContextSourceFactory.java src/java/org/apache/cocoon/components/xpointer/parser XPointerFrameworkParserTokenManager.java XPointerFrameworkParserConstants.java TokenMgrError.java xpointer-fw.jj XPointerFrameworkParser.java SimpleCharStream.java ParseException.java Token.java src/java/org/apache/cocoon/components/xpointer PointerPart.java ShorthandPart.java XPointerPart.java XPointerContext.java XPointer.java XmlnsPart.java ElementPathPart.java UnsupportedPart.java src/java/org/apache/cocoon/components/sax XMLSerializer.java XMLDeserializer.java XMLByteStreamFragment.java XMLByteStreamInterpreter.java XMLTeePipe.java XMLByteStreamCompiler.java src/java/org/apache/cocoon/components/persistence RequestDataStoreImpl.java RequestDataStore.java src/java/org/apache/cocoon/components/pipeline/impl CachingProcessingPipeline.java CachingPointProcessingPipeline.java NonCachingProcessingPipeline.java AbstractCachingProcessingPipeline.java BaseCachingProcessingPipeline.java src/java/org/apache/cocoon/components/source CocoonSourceResolver.java SourceUtil.java URLRewriter.java src/java/org/apache/cocoon/components/pipeline OutputComponentSelector.java ProcessingPipeline.java AbstractProcessingPipeline.java src/java/org/apache/cocoon/components/resolver DefaultResolver.java src/java/org/apache/cocoon/components/source/helpers SourceCredential.java Log: Updating licenses Revision ChangesPath 1.5 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/FilesystemStore.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/FilesystemStore.java.diff?r1=1.4r2=1.5 1.11 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java.diff?r1=1.10r2=1.11 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultPersistentStore.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultPersistentStore.java.diff?r1=1.1r2=1.2 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultTransientStore.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultTransientStore.java.diff?r1=1.1r2=1.2 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptManager.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptManager.java.diff?r1=1.1r2=1.2 1.3 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptObjectResult.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptObjectResult.java.diff?r1=1.2r2=1.3 1.4 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java.diff?r1=1.3r2=1.4 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptVariableScope.java
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/environment/commandline CommandLineRequest.java AbstractCommandLineEnvironment.java CommandLineSession.java CommandLineContext.java FileSavingEnvironment.java CommandLineResponse.java LinkSamplingEnvironment.java
cziegeler2004/03/08 06:02:49 Modified:src/java/org/apache/cocoon/environment/http HttpSession.java HttpContext.java HttpEnvironment.java HttpCookie.java HttpResponse.java HttpRequest.java src/java/org/apache/cocoon/matching RegexpParameterMatcher.java SessionAttributeMatcher.java WildcardRequestParameterMatcher.java RegexpSessionAttributeMatcher.java RequestParameterMatcher.java AbstractRegexpMatcher.java WildcardParameterMatcher.java WildcardHeaderMatcher.java RequestAttributeMatcher.java MountTableMatcher.java CookieMatcher.java RegexpHeaderMatcher.java WildcardRequestAttributeMatcher.java WildcardSessionAttributeMatcher.java AbstractWildcardMatcher.java ParameterMatcher.java Matcher.java PreparableMatcher.java RegexpHostMatcher.java RegexpURIMatcher.java RegexpRequestAttributeMatcher.java WildcardHostMatcher.java AbstractPreparableMatcher.java HeaderMatcher.java RegexpRequestParameterMatcher.java WildcardURIMatcher.java src/java/org/apache/cocoon/matching/helpers WildcardHelper.java src/java/org/apache/cocoon/environment ObjectModelHelper.java Response.java Redirector.java AbstractEnvironment.java Request.java Cookie.java PermanentRedirector.java SourceResolver.java ForwardRedirector.java Session.java Environment.java Context.java src/java/org/apache/cocoon/generation ServletGenerator.java StatusGenerator.java ImageDirectoryGenerator.java AbstractGenerator.java RequestGenerator.java ServerPagesGenerator.java XPathDirectoryGenerator.java LinkStatusGenerator.java JXTemplateGenerator.java Generator.java MP3DirectoryGenerator.java FileGenerator.java AbstractServerPage.java StreamGenerator.java SessionAttributeGenerator.java ServiceableGenerator.java DirectoryGenerator.java src/java/org/apache/cocoon/environment/wrapper MutableEnvironmentFacade.java EnvironmentWrapper.java RequestWrapper.java RequestParameters.java src/java/org/apache/cocoon/environment/internal EnvironmentStack.java EnvironmentInfo.java EnvironmentHelper.java src/java/org/apache/cocoon/i18n I18nUtils.java Bundle.java XMLResourceBundleFactory.java BundleFactory.java XMLResourceBundle.java src/java/org/apache/cocoon/environment/commandline CommandLineRequest.java AbstractCommandLineEnvironment.java CommandLineSession.java CommandLineContext.java FileSavingEnvironment.java CommandLineResponse.java LinkSamplingEnvironment.java Log: Updating licenses Revision ChangesPath 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpSession.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpSession.java.diff?r1=1.1r2=1.2 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpContext.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpContext.java.diff?r1=1.1r2=1.2 1.18 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java.diff?r1=1.17r2=1.18 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpCookie.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpCookie.java.diff?r1=1.1r2=1.2 1.4 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpResponse.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpResponse.java.diff?r1=1.3r2=1.4 1.7 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpRequest.java
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/matching/modular CachingRegexpMatcher.java CachingWildcardMatcher.java WildcardMatcher.java
cziegeler2004/03/08 06:03:32 Modified:src/java/org/apache/cocoon/servlet CocoonServlet.java ParanoidCocoonServlet.java BootstrapServlet.java ParanoidClassLoader.java src/java/org/apache/cocoon/selection ExceptionSelector.java Selector.java RequestMethodSelector.java RequestParameterSelector.java NamedPatternsSelector.java ParameterSelector.java SessionAttributeSelector.java HeaderSelector.java AbstractSwitchSelector.java ResourceExistsSelector.java RequestAttributeSelector.java CookieSelector.java SimpleSelector.java SwitchSelector.java XPathExceptionSelector.java BrowserSelector.java HostSelector.java src/java/org/apache/cocoon/sitemap LinkTranslator.java SitemapOutputComponent.java NotifyingGenerator.java SitemapComponentSelector.java ContentAggregator.java PatternException.java SitemapModelComponent.java LinkGatherer.java src/java/org/apache/cocoon/servlet/multipart TokenStream.java RequestFactory.java MultipartException.java MultipartParser.java MultipartHttpServletRequest.java PartOnDisk.java Part.java PartInMemory.java src/java/org/apache/cocoon/util StringUtils.java ImageUtils.java ClassUtils.java MRUBucketMap.java FileFormatException.java HashMap.java PostInputStream.java MIMEUtils.java ByteRange.java HashUtil.java ImageProperties.java ResizableContainer.java NetUtils.java BufferedOutputStream.java IOUtils.java JavaArchiveFilter.java Tokenizer.java TraxErrorHandler.java src/java/org/apache/cocoon/transformation ReadDOMSessionTransformer.java JPathTransformer.java SimpleFormTransformer.java TraxTransformer.java I18nTransformer.java RoleFilterTransformer.java SourceWritingTransformer.java Transformer.java EncodeURLTransformer.java FilterTransformer.java WriteDOMSessionTransformer.java LogTransformer.java AbstractExtractionTransformer.java AbstractDOMTransformer.java AbstractTransformer.java AbstractSAXTransformer.java ServiceableTransformer.java XIncludeTransformer.java CIncludeTransformer.java SimpleFormInstanceExtractionTransformer.java src/java/org/apache/cocoon/transformation/pagination Pagesheet.java Paginator.java ItemGroup.java PageRules.java src/java/org/apache/cocoon/transformation/helpers DefaultIncludeCacheManager.java IncludeCacheManager.java EventRecorder.java NOPRecorder.java IncludeCacheStorageProxy.java TextRecorder.java StoreIncludeCacheStorageProxy.java ModifiableSourceIncludeCacheStorageProxy.java ParametersRecorder.java PreemptiveLoader.java PreemptiveLoaderAction.java IncludeCacheManagerSession.java src/java/org/apache/cocoon/serialization ZipArchiveSerializer.java TextSerializer.java HTMLSerializer.java LinkSerializer.java Serializer.java AbstractSerializer.java AbstractTextSerializer.java XMLSerializer.java src/java/org/apache/cocoon/reading Reader.java ResourceReader.java ImageReader.java AbstractReader.java ServiceableReader.java src/java/org/apache/cocoon/matching/modular CachingRegexpMatcher.java CachingWildcardMatcher.java WildcardMatcher.java Log: Updating licenses Revision ChangesPath 1.28 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java.diff?r1=1.27r2=1.28 1.10 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
cvs commit: cocoon-2.2/src/test/org/apache/cocoon AbstractCompositeTestCase.java
cziegeler2004/03/08 06:04:02 Modified:src/java/org/apache/cocoon/xml XMLUtils.java AttributesImpl.java XMLMulticaster.java XMLBaseSupport.java DocumentHandlerWrapper.java AbstractXMLPipe.java LoggingEntityResolver.java IncludeXMLConsumer.java AbstractXMLProducer.java DocumentHandlerAdapter.java ParamSaxBuffer.java LocationAugmentationPipe.java XMLConsumer.java AttributeTypes.java EmbeddedXMLPipe.java XMLFragment.java ContentHandlerWrapper.java LoggingContentHandler.java NamespacesTable.java AbstractSAXFragment.java AbstractDOMFragment.java XMLProducer.java XMLPipe.java AbstractXMLConsumer.java src/java/org/apache/cocoon/util/jxpath DOMFactory.java src/java/org/apache/cocoon/xml/xlink XLinkPipe.java ExtendedXLinkPipe.java XLinkHandler.java src/java/org/apache/cocoon/util/log CocoonStreamTargetFactory.java CocoonTargetFactory.java XMLCocoonLogFormatter.java CocoonLogFormatter.java ExtensiblePatternFormatter.java src/mocks/sun/tools/javac Main.java src/java/org/apache/cocoon/xml/dom DOMStreamer.java DocumentWrapper.java DOMBuilder.java DOMUtil.java DOMFactory.java src/test/org/apache/cocoon AbstractCompositeTestCase.java Log: Updating licenses Revision ChangesPath 1.5 +15 -50cocoon-2.2/src/java/org/apache/cocoon/xml/XMLUtils.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/XMLUtils.java.diff?r1=1.4r2=1.5 1.4 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/AttributesImpl.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/AttributesImpl.java.diff?r1=1.3r2=1.4 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/XMLMulticaster.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/XMLMulticaster.java.diff?r1=1.1r2=1.2 1.5 +14 -49 cocoon-2.2/src/java/org/apache/cocoon/xml/XMLBaseSupport.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/XMLBaseSupport.java.diff?r1=1.4r2=1.5 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java.diff?r1=1.1r2=1.2 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLPipe.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLPipe.java.diff?r1=1.1r2=1.2 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/LoggingEntityResolver.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/LoggingEntityResolver.java.diff?r1=1.1r2=1.2 1.3 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/IncludeXMLConsumer.java.diff?r1=1.2r2=1.3 1.4 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java.diff?r1=1.3r2=1.4 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java.diff?r1=1.1r2=1.2 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java.diff?r1=1.1r2=1.2 1.3 +14 -49 cocoon-2.2/src/java/org/apache/cocoon/xml/LocationAugmentationPipe.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/LocationAugmentationPipe.java.diff?r1=1.2r2=1.3 1.3 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/XMLConsumer.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/XMLConsumer.java.diff?r1=1.2r2=1.3 1.3 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/AttributeTypes.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/AttributeTypes.java.diff?r1=1.2r2=1.3 1.2 +15 -50 cocoon-2.2/src/java/org/apache/cocoon/xml/EmbeddedXMLPipe.java http://cvs.apache.org/viewcvs/cocoon-2.2/src/java/org/apache/cocoon/xml/EmbeddedXMLPipe.java.diff?r1=1.1r2=1.2 1.2 +15 -50
cvs commit: cocoon-2.2/src/test/org/apache/cocoon/transformation TraxTransformerTestCase.java AbstractTransformerTestCase.java
cziegeler2004/03/08 06:04:20 Modified:tools/src/anttasks ManifestToolTask.java XConfToolTask.java src/test/org/apache/cocoon/components/source SourceResolverAdapter.java src/test/org/apache/cocoon/acting ResourceExistsActionTestCase.java RequestParamActionTestCase.java AbstractActionTestCase.java src/test/org/apache/cocoon/generation PauseGenerator.java FileGeneratorTestCase.java AbstractGeneratorTestCase.java src/test/org/apache/cocoon/bean CocoonBeanTestCase.java src/test/org/apache/cocoon/util/test NetUtilsTestCase.java IOUtilsTestCase.java MIMEUtilsTestCase.java src/test/org/apache/cocoon/environment/mock MockSession.java MockEnvironment.java MockRequest.java MockResponse.java MockContext.java MockRedirector.java MockCookie.java src/test/org/apache/cocoon/xml/dom DOMBuilderStreamerTestCase.java src/test/org/apache/cocoon/serialization AbstractSerializerTestCase.java src/test/org/apache/cocoon/environment/commandline/test CommandLineContextTestCase.java tools/src/loader Loader.java src/test/org/apache/cocoon/xml WhitespaceFilter.java src/test/org/apache/cocoon/transformation TraxTransformerTestCase.java AbstractTransformerTestCase.java Log: Updating licenses Revision ChangesPath 1.2 +16 -9 cocoon-2.2/tools/src/anttasks/ManifestToolTask.java Index: ManifestToolTask.java === RCS file: /home/cvs/cocoon-2.2/tools/src/anttasks/ManifestToolTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ManifestToolTask.java 9 Mar 2003 00:11:45 - 1.1 +++ ManifestToolTask.java 8 Mar 2004 14:04:19 - 1.2 @@ -1,11 +1,18 @@ -/* - * 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. * - */ - +/* + * Copyright 1999-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import java.io.*; import java.util.*; import org.apache.tools.ant.*; 1.10 +15 -51cocoon-2.2/tools/src/anttasks/XConfToolTask.java Index: XConfToolTask.java === RCS file: /home/cvs/cocoon-2.2/tools/src/anttasks/XConfToolTask.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- XConfToolTask.java26 Nov 2003 06:47:58 - 1.9 +++ XConfToolTask.java8 Mar 2004 14:04:19 - 1.10 @@ -1,54 +1,18 @@ /* - - - The Apache Software License, Version 1.1 - - - Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any,
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store JCSDefaultStore.java
joerg 2004/03/08 11:34:11
Modified:src/blocks/scratchpad/java/org/apache/cocoon/components/store
JCSDefaultStore.java
Log:
fixed javadoc
Revision ChangesPath
1.3 +1 -1
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/JCSDefaultStore.java
Index: JCSDefaultStore.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/JCSDefaultStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JCSDefaultStore.java 7 Mar 2004 22:34:58 - 1.2
+++ JCSDefaultStore.java 8 Mar 2004 19:34:11 - 1.3
@@ -54,7 +54,7 @@
/**
* TODO: describe options
*
- * @param params the configuration parameters
+ * @param parameters the configuration parameters
* @exception ParameterException
*/
public void parameterize(Parameters parameters) throws
ParameterException {
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/generation LinkStatusGenerator.java
joerg 2004/03/08 13:21:10
Modified:.status.xml
src/java/org/apache/cocoon/generation
LinkStatusGenerator.java
Log:
fixed bug 26851, thanks to Marco Rolappe: LinkStatusGenerator now handles
also links with a specified charset.
Revision ChangesPath
1.186 +4 -1 cocoon-2.2/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.2/status.xml,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- status.xml6 Mar 2004 14:34:40 - 1.185
+++ status.xml8 Mar 2004 21:21:10 - 1.186
@@ -189,6 +189,9 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=fix fixes-bug=26851 due-to=Marco Rolappe
due-to-email=[EMAIL PROTECTED]
+ LinkStatusGenerator now handles also links with a specified charset.
+ /action
action dev=JH type=fix fixes-bug=25594 due-to=Gernot Koller
due-to-email=[EMAIL PROTECTED]
Allow streaming of uploaded files into a pipeline using StreamGenerator.
/action
1.10 +3 -2
cocoon-2.2/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java
Index: LinkStatusGenerator.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LinkStatusGenerator.java 8 Mar 2004 14:02:44 - 1.9
+++ LinkStatusGenerator.java 8 Mar 2004 21:21:10 - 1.10
@@ -448,7 +448,8 @@
getLogger().debug(Content-type: + content_type);
}
-if (content_type.equals(linkContentType)) {
+if (content_type.equals(linkContentType) ||
+content_type.startsWith(linkContentType + ;)) {
url_links = new ArrayList();
InputStream is = conn.getInputStream();
cvs commit: cocoon-2.1 status.xml
joerg 2004/03/08 13:21:20
Modified:src/java/org/apache/cocoon/generation
LinkStatusGenerator.java
.status.xml
Log:
fixed bug 26851, thanks to Marco Rolappe: LinkStatusGenerator now handles
also links with a specified charset.
Revision ChangesPath
1.8 +3 -2
cocoon-2.1/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java
Index: LinkStatusGenerator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LinkStatusGenerator.java 5 Mar 2004 13:02:55 - 1.7
+++ LinkStatusGenerator.java 8 Mar 2004 21:21:19 - 1.8
@@ -447,7 +447,8 @@
getLogger().debug(Content-type: + content_type);
}
-if (content_type.equals(linkContentType)) {
+if (content_type.equals(linkContentType) ||
+content_type.startsWith(linkContentType + ;)) {
url_links = new ArrayList();
InputStream is = conn.getInputStream();
1.264 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- status.xml8 Mar 2004 06:07:14 - 1.263
+++ status.xml8 Mar 2004 21:21:19 - 1.264
@@ -211,6 +211,9 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=fix fixes-bug=26851 due-to=Marco Rolappe
due-to-email=[EMAIL PROTECTED]
+ LinkStatusGenerator now handles also links with a specified charset.
+ /action
action dev=JH type=fix fixes-bug=25934 due-to=Philipp Matthias
Hahn due-to-email=[EMAIL PROTECTED]
Avoid CLOBs when indexing XML without superfluous whitespace (Lucene).
/action
cvs commit: cocoon-2.1/legal ehcache-0.7.jar.license.txt
unico 2004/03/08 13:36:26
Added: src/blocks/scratchpad/lib ehcache-0.7.jar
src/blocks/scratchpad/java/org/apache/cocoon/components/store
EHStore.java
legalehcache-0.7.jar.license.txt
Log:
start new experimental store implementation based on ehcache
(http://ehcache.sourceforge.net/)
Revision ChangesPath
1.1 cocoon-2.1/src/blocks/scratchpad/lib/ehcache-0.7.jar
Binary file
1.1
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/EHStore.java
Index: EHStore.java
===
/*
* Copyright 2004,2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.cocoon.components.store;
import java.io.IOException;
import java.io.Serializable;
import java.util.Collections;
import java.util.Enumeration;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheException;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.excalibur.store.Store;
/**
* Store implementation based on EHCache.
* (http://ehcache.sourceforge.net/)
*/
public class EHStore extends AbstractLogEnabled implements Store,
Parameterizable {
private Cache m_cache;
private CacheManager m_cacheManager;
private String m_cacheName;
private int m_maximumSize;
public EHStore() {
}
public void parameterize(Parameters parameters) throws ParameterException
{
m_cacheName = parameters.getParameter(cache-name,main);
m_maximumSize = parameters.getParameterAsInteger(max-objects,100);
}
public void initialize() throws Exception {
m_cacheManager = CacheManager.create();
m_cache = new Cache(m_cacheName,m_maximumSize,true,false,0,0);
m_cacheManager.addCache(m_cache);
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#free()
*/
public Object get(Object key) {
try {
return m_cache.get((Serializable) key);
}
catch (CacheException e) {
getLogger().error(Failure retrieving object from store, e);
}
return null;
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#free()
*/
public void store(Object key, Object value) throws IOException {
final Element element = new Element((Serializable) key,
(Serializable) value);
m_cache.put(element);
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#free()
*/
public void free() {
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#remove(java.lang.Object)
*/
public void remove(Object key) {
m_cache.remove((Serializable) key);
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#clear()
*/
public void clear() {
try {
m_cache.removeAll();
}
catch (IOException e) {
getLogger().error(Failure to clearing store, e);
}
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#containsKey(java.lang.Object)
*/
public boolean containsKey(Object key) {
try {
return m_cache.get((Serializable) key) != null;
}
catch (CacheException e) {
getLogger().error(Failure retrieving object from store,e);
}
return false;
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#keys()
*/
public Enumeration keys() {
return Collections.enumeration(m_cache.getKeys());
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#size()
*/
public int size() {
return m_cache.getSize();
}
}
1.1 cocoon-2.1/legal/ehcache-0.7.jar.license.txt
Index: ehcache-0.7.jar.license.txt
cvs commit: cocoon-2.1/lib jars.xml
unico 2004/03/08 13:41:20 Modified:lib jars.xml Log: jar entry for ehcache dependency Revision ChangesPath 1.183 +9 -1 cocoon-2.1/lib/jars.xml Index: jars.xml === RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- jars.xml 4 Mar 2004 07:01:56 - 1.182 +++ jars.xml 8 Mar 2004 21:41:19 - 1.183 @@ -513,6 +513,14 @@ /file file +titleEHCache/title +descriptionEasy Hibernate Cache/description +used-byEHCache Store/used-by +libscratchpad/lib/ehcache-0.7.jar/lib +homepagehttp://ehcache.sourceforge.net//homepage + /file + + file titleJava Formatter/title description This program formats Java code with consistent indentation and so
cvs commit: cocoon-2.1 gump.xml
unico 2004/03/08 13:42:08 Modified:.gump.xml Log: add scratchpad dependency on JCS Revision ChangesPath 1.117 +2 -1 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- gump.xml 8 Mar 2004 06:07:14 - 1.116 +++ gump.xml 8 Mar 2004 21:42:08 - 1.117 @@ -140,6 +140,7 @@ depend project=commons-beanutils inherit=all/ depend project=commons-digester inherit=all/ depend project=jakarta-velocity inherit=all/ +depend project=jakarta-turbine-jcs/ depend project=jakarta-servletapi-4/ depend project=cocoon-block-velocity/ depend project=cocoon-block-cron/
cvs commit: cocoon-2.1/src/blocks/scratchpad/conf jcs-store.xconf
unico 2004/03/08 14:42:58 Modified:src/blocks/scratchpad/conf jcs-store.xconf Log: comment jcs store configuration Revision ChangesPath 1.6 +3 -1 cocoon-2.1/src/blocks/scratchpad/conf/jcs-store.xconf Index: jcs-store.xconf === RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/conf/jcs-store.xconf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jcs-store.xconf 6 Mar 2004 15:18:46 - 1.5 +++ jcs-store.xconf 8 Mar 2004 22:42:58 - 1.6 @@ -15,9 +15,10 @@ limitations under the License. -- -xconf xpath=/cocoon unless=[EMAIL PROTECTED]'org.apache.cocoon.components.store.JCSDefaultStore'] +xconf xpath=/cocoon unless=comment()[contains(.,'Experimental JCS Store implementation')] !-- Experimental JCS Store implementation -- + !-- store class=org.apache.cocoon.components.store.JCSDefaultStore logger=core.store parameter name=maxobjects value=100/ @@ -28,5 +29,6 @@ logger=core.store.transient parameter name=maxobjects value=100/ /transient-store + -- /xconf
cvs commit: cocoon-2.1/src/blocks/scratchpad/conf ehstore.xconf
unico 2004/03/08 14:43:32 Added: src/blocks/scratchpad/conf ehstore.xconf Log: example configuration for EHStore Revision ChangesPath 1.1 cocoon-2.1/src/blocks/scratchpad/conf/ehstore.xconf Index: ehstore.xconf === ?xml version=1.0? !-- Copyright 1999-2004 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -- xconf xpath=/cocoon unless=comment()[contains(.,'Experimental EHCache Store implementation')] !-- Experimental EHCache Store implementation -- !-- store class=org.apache.cocoon.components.store.EHStore logger=core.store parameter name=maxobjects value=100/ /store transient-store class=org.apache.cocoon.components.store.EHStore logger=core.store.transient parameter name=maxobjects value=100/ parameter name=overflow-to-disk value=false/ /transient-store -- /xconf
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store EHStore.java
unico 2004/03/08 14:44:51
Modified:src/blocks/scratchpad/java/org/apache/cocoon/components/store
EHStore.java
Log:
- implement more lifecycle stages
- add debug logging
- addTODO message
Revision ChangesPath
1.2 +41 -5
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/EHStore.java
Index: EHStore.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/EHStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EHStore.java 8 Mar 2004 21:36:26 - 1.1
+++ EHStore.java 8 Mar 2004 22:44:51 - 1.2
@@ -25,55 +25,85 @@
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.store.Store;
/**
* Store implementation based on EHCache.
* (http://ehcache.sourceforge.net/)
+ *
+ * TODO: CacheManager expects to be a singleton. So configuring
+ * multiple EHStore intances could lead to errors.
*/
-public class EHStore extends AbstractLogEnabled implements Store,
Parameterizable {
+public class EHStore extends AbstractLogEnabled
+implements Store, Parameterizable, Initializable, Disposable, ThreadSafe {
private Cache m_cache;
private CacheManager m_cacheManager;
private String m_cacheName;
private int m_maximumSize;
+private boolean m_overflowToDisk;
public EHStore() {
}
public void parameterize(Parameters parameters) throws
ParameterException {
m_cacheName = parameters.getParameter(cache-name,main);
-m_maximumSize = parameters.getParameterAsInteger(max-objects,100);
+m_maximumSize = parameters.getParameterAsInteger(maxobjects,100);
+m_overflowToDisk =
parameters.getParameterAsBoolean(overflow-to-disk,true);
}
public void initialize() throws Exception {
m_cacheManager = CacheManager.create();
-m_cache = new Cache(m_cacheName,m_maximumSize,true,false,0,0);
+m_cache = new
Cache(m_cacheName,m_maximumSize,m_overflowToDisk,true,0,0);
m_cacheManager.addCache(m_cache);
}
+public void dispose() {
+m_cacheManager.shutdown();
+m_cacheManager = null;
+m_cache = null;
+}
+
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#free()
*/
public Object get(Object key) {
+Object value = null;
try {
-return m_cache.get((Serializable) key);
+final Element element = m_cache.get((Serializable) key);
+if (element != null) {
+value = element.getValue();
+}
}
catch (CacheException e) {
getLogger().error(Failure retrieving object from store, e);
}
-return null;
+if (getLogger().isDebugEnabled()) {
+if (value != null) {
+getLogger().debug(Found key: + key);
+}
+else {
+getLogger().debug(NOT Found key: + key);
+}
+}
+return value;
}
/* (non-Javadoc)
* @see org.apache.excalibur.store.Store#free()
*/
public void store(Object key, Object value) throws IOException {
+if (getLogger().isDebugEnabled()) {
+getLogger().debug(Store object + value + with key + key);
+}
final Element element = new Element((Serializable) key,
(Serializable) value);
m_cache.put(element);
}
@@ -88,6 +118,9 @@
* @see org.apache.excalibur.store.Store#remove(java.lang.Object)
*/
public void remove(Object key) {
+if (getLogger().isDebugEnabled()) {
+getLogger().debug(Removing item + key);
+}
m_cache.remove((Serializable) key);
}
@@ -95,6 +128,9 @@
* @see org.apache.excalibur.store.Store#clear()
*/
public void clear() {
+if (getLogger().isDebugEnabled()) {
+getLogger().debug(Clearing the store);
+}
try {
m_cache.removeAll();
}
cvs commit: cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/woody/datatype - New directory
reinhard04/03/08 13:35:05 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/woody/datatype - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/FullPage - New directory
reinhard04/03/08 13:34:56 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/FullPage - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker/img - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker/img - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/ContextMenu - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/ContextMenu - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/TableOperations/img - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/TableOperations/img - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/lang - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/mattkruse-lib - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/forms/resources/mattkruse-lib - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/FullPage/popups - New directory
reinhard04/03/08 13:34:59 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/FullPage/popups - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/lang - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/CSS - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/CSS - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/SpellChecker/img - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/SpellChecker/img - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/resources - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/TableOperations - New directory
reinhard04/03/08 13:35:02 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/TableOperations - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/xsl - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/forms/xsl - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/popups - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/popups - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/ContextMenu/lang - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/ContextMenu/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker/lang - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/images - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/images - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/xsl - New directory
reinhard04/03/08 13:35:04 cocoon-2.1/src/blocks/forms/samples/xsl - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/v2 - New directory
reinhard04/03/08 13:35:04 cocoon-2.1/src/blocks/forms/samples/v2 - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/popups - New directory
reinhard04/03/08 13:35:03 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/popups - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins - New directory
cvs commit: cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/woody/datatype/convertor - New directory
reinhard04/03/08 13:35:05 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/woody/datatype/convertor - New directory
cvs commit: cocoon-2.1/src/blocks/forms/test/org - New directory
reinhard04/03/08 13:35:05 cocoon-2.1/src/blocks/forms/test/org - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/img - New directory
reinhard04/03/08 13:35:01 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/img - New directory
cvs commit: cocoon-2.1/src/blocks/forms/tools/upgrade - New directory
reinhard04/03/08 13:35:05 cocoon-2.1/src/blocks/forms/tools/upgrade - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/FullPage/lang - New directory
reinhard04/03/08 13:34:59 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/FullPage/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/test/org/apache/cocoon - New directory
reinhard04/03/08 13:35:05 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon - New directory
cvs commit: cocoon-2.1/src/blocks/forms/tools - New directory
reinhard04/03/08 13:35:05 cocoon-2.1/src/blocks/forms/tools - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/TableOperations/lang - New directory
reinhard04/03/08 13:35:03 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/plugins/TableOperations/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/woody - New directory
reinhard04/03/08 13:35:05 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/woody - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/messages - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/messages - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/TableOperations - New directory
reinhard04/03/08 13:35:00 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/TableOperations - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/forms - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/forms - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/ContextMenu/lang - New directory
reinhard04/03/08 13:34:56 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/ContextMenu/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/messages - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/messages - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/CSS/lang - New directory
reinhard04/03/08 13:34:56 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/CSS/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms - New directory
reinhard04/03/08 13:34:54 cocoon-2.1/src/blocks/forms/samples/forms - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/ContextMenu - New directory
reinhard04/03/08 13:34:56 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/ContextMenu - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/forms/binding - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/forms/binding - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/flow - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/flow - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/resources - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/binding - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/binding - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/CSS - New directory
reinhard04/03/08 13:34:56 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/plugins/CSS - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/images - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/images - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation - New directory
reinhard04/03/08 13:34:48 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples - New directory
reinhard04/03/08 13:34:53 cocoon-2.1/src/blocks/forms/samples - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/lang - New directory
reinhard04/03/08 13:34:55 cocoon-2.1/src/blocks/forms/samples/forms/resources/htmlarea/lang - New directory
cvs commit: cocoon-2.1/src/blocks/forms/lib - New directory
reinhard04/03/08 13:34:53 cocoon-2.1/src/blocks/forms/lib - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/aggregate - New directory
reinhard04/03/08 13:34:53 cocoon-2.1/src/blocks/forms/samples/aggregate - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation - New directory
reinhard04/03/08 13:34:47 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl - New directory
reinhard04/03/08 13:34:48 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel - New directory
reinhard04/03/08 13:34:44 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/acting - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/acting - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings - New directory
reinhard04/03/08 13:34:47 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings - New directory
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/aggregate - New directory
reinhard04/03/08 13:34:54 cocoon-2.1/src/blocks/forms/samples/forms/aggregate - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/expression - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/expression - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2 - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2 - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/event/impl - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/event/impl - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org - New directory
reinhard04/03/08 13:34:42 cocoon-2.1/src/blocks/forms/java/org - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/generation - New directory
reinhard04/03/08 13:34:44 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/generation - New directory
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding - New directory
reinhard04/03/08 13:34:43 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding - New directory
