cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/offline - New directory
upayavira2003/08/07 03:38:57 cocoon-2.1/src/documentation/xdocs/userdocs/offline - New directory
cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/concepts aggregation.xml book.xml
upayavira2003/08/09 06:12:04 Modified:src/documentation/xdocs/userdocs/concepts book.xml Added: src/documentation/xdocs/userdocs/concepts aggregation.xml Log: Couldn't find any documentation on map:aggregate, so here's some basic docs, just in time for final release. Please improve on these Revision ChangesPath 1.6 +1 -0 cocoon-2.1/src/documentation/xdocs/userdocs/concepts/book.xml Index: book.xml === RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/concepts/book.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- book.xml 2 Jul 2003 06:05:17 - 1.5 +++ book.xml 9 Aug 2003 13:12:04 - 1.6 @@ -17,6 +17,7 @@ menu-item label=Caching href=caching.html/ menu-item label=Actions href=actions.html/ menu-item label=Matchers and Selectors href=matchers_selectors.html/ +menu-item label=Aggregation href=aggregation.html/ menu-item label=Entity Catalogs href=catalog.html/ menu-item label=MRUMemoryStore href=mrustore.html/ menu-item label=Persistence href=persistence.html/ 1.1 cocoon-2.1/src/documentation/xdocs/userdocs/concepts/aggregation.xml Index: aggregation.xml === ?xml version=1.0 encoding=UTF-8? !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.0//EN ../../dtd/document-v10.dtd document header titleAggregation/title authors person name=Upayavira email=[EMAIL PROTECTED]/ /authors /header body s1 title=Introduction p Aggregation allows content from a number of sources to be combined into a single XML stream. An aggregator takes the place of the generator in a pipeline. /p p To merge content from codefile1.html/code to codefile2.html/code, you can use something like the following in your sitemap: /p source ![CDATA[ map:match pattern=page.html map:aggregate element=data map:part src=file1.xml/ map:part src=file2.xml/ /map:aggregate map:transform .../ ... map:serialize/ /map:match ]] /source pAll of the contents of the sources referenced by a codelt;map:partgt;/code element will be wrapped by another element as specified in the codeelement/code attribute of codelt;map:aggregategt;/code./p pAll sources referred to by the codesrc/code attribute are standard Cocoon sources, and thus can refer to files, to HTTP URLs, to the codecocoon:/code protocol, or any other protocol available to Cocoon./p /s1 s1 title=When to Use Aggregation pYou can use aggregation when you have a fixed number of static sources that need to be merged. In such a case, you can name each source within your sitemap, as shown above./p pIf you need to merge a variable number of sources, or sources who's details aren't known at design time (and can't be calculated with wildcards), then you should use either an link href=../transformers/xinclude-transformer.htmlXInclude Transformer/link or an link href=../transformers/cinclude-transformer.htmlCInclude Transformer/link./p /s1 /body /document
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/environment/commandline LinkSamplingEnvironment.java
upayavira2003/08/10 12:58:09
Modified:src/java/org/apache/cocoon/environment/commandline
LinkSamplingEnvironment.java
Log:
Make the CLI only report unique link count in a page (previously it reported
every link, including repeated links, when using link view)
Should mean that link view and linkGathering both report the same number of
links in a page
Revision ChangesPath
1.3 +4 -2
cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java
Index: LinkSamplingEnvironment.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LinkSamplingEnvironment.java 12 May 2003 13:26:17 - 1.2
+++ LinkSamplingEnvironment.java 10 Aug 2003 19:58:09 - 1.3
@@ -114,7 +114,9 @@
String line = buffer.readLine();
if (line == null)
break;
-list.add(line);
+if (!list.contains(line)) {
+list.add(line);
+}
}
} finally {
// explictly close the input
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean Target.java CocoonBean.java CocoonWrapper.java
upayavira2003/08/27 12:18:18
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean CocoonBean.java
CocoonWrapper.java
Added: src/java/org/apache/cocoon/bean Target.java
Log:
Moved Target into a separate class (ready for holding more complex URI
arithmetic that I will extract from the CocoonBean)
Moved error detection to correct place in Main from Wrapper
Revision ChangesPath
1.12 +17 -3 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Main.java 21 Jul 2003 09:37:40 - 1.11
+++ Main.java 27 Aug 2003 19:18:18 - 1.12
@@ -325,10 +325,24 @@
}
if (line.hasOption(WORK_DIR_OPT)) {
-cocoon.setWorkDir(line.getOptionValue(WORK_DIR_OPT));
+String workDir = line.getOptionValue(WORK_DIR_OPT);
+if (workDir.equals()) {
+listener.messageGenerated(
+Careful, you must specify a work dir when using the
-w/--workDir argument);
+System.exit(1);
+} else {
+cocoon.setWorkDir(line.getOptionValue(WORK_DIR_OPT));
+}
}
if (line.hasOption(CONTEXT_DIR_OPT)) {
-cocoon.setContextDir(line.getOptionValue(CONTEXT_DIR_OPT));
+String contextDir = line.getOptionValue(CONTEXT_DIR_OPT);
+if (contextDir.equals()) {
+listener.messageGenerated(
+Careful, you must specify a configuration file when
using the -c/--contextDir argument);
+System.exit(1);
+} else {
+cocoon.setContextDir(contextDir);
+}
}
if (line.hasOption(CONFIG_FILE_OPT)) {
cocoon.setConfigFile(line.getOptionValue(CONFIG_FILE_OPT));
1.17 +26 -138
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CocoonBean.java 17 Aug 2003 13:50:45 - 1.16
+++ CocoonBean.java 27 Aug 2003 19:18:18 - 1.17
@@ -454,7 +454,7 @@
status =
getPage(
deparameterizedURI,
-target.getLastModified(filename),
+getLastModified(target, filename),
parameters,
confirmExtension ? translatedLinks : null,
gatheredLinks,
@@ -498,7 +498,7 @@
} finally {
if (output != null status != -1) {
-ModifiableSource source = target.getSource(filename);
+ModifiableSource source = getSource(target, filename);
try {
OutputStream stream = source.getOutputStream();
@@ -508,7 +508,7 @@
} catch (IOException ioex) {
log.warn(ioex.toString());
} finally {
-target.releaseSource(source);
+releaseSource(source);
}
}
@@ -585,7 +585,7 @@
n.addExtraDescription(Notifying.EXTRA_REQUESTURI, uri);
n.addExtraDescription(missing-file, uri);
-ModifiableSource source = target.getSource(filename);
+ModifiableSource source = getSource(target, filename);
try {
OutputStream stream = source.getOutputStream();
@@ -594,7 +594,7 @@
out.flush();
out.close();
} finally {
-target.releaseSource(source);
+releaseSource(source);
}
}
}
@@ -620,137 +620,25 @@
}
return uri;
}
-
-public class Target {
-// Defult type is append
-private static final String APPEND_TYPE = append;
-private static final String REPLACE_TYPE = replace;
-private static final String INSERT_TYPE = insert;
-
-private final String type;
-private final String root;
-private final String sourceURI;
-private final String destURI;
-
-private transient int _hashCode;
-private transient String _toString;
-
-public Target(
-String type
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java CocoonWrapper.java
upayavira2003/08/28 12:21:00
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean CocoonBean.java
CocoonWrapper.java
Log:
Moved error detection to correct place
Added basic support for include/exclude
Revision ChangesPath
1.13 +26 -2 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Main.java 27 Aug 2003 19:18:18 - 1.12
+++ Main.java 28 Aug 2003 19:21:00 - 1.13
@@ -163,7 +163,10 @@
private static final String NODE_LOAD_CLASS = load-class;
private static final String NODE_DEFAULT_FILENAME = default-filename;
-
+private static final String NODE_INCLUDE = include;
+private static final String NODE_EXCLUDE = exclude;
+private static final String ATTR_INCLUDE_EXCLUDE_PATTERN = pattern;
+
private static final String NODE_URI = uri;
private static final String ATTR_URI_TYPE = type;
private static final String ATTR_URI_SOURCEPREFIX = src-prefix;
@@ -501,6 +504,14 @@
} else if (nodeName.equals(NODE_DEFAULT_FILENAME)) {
cocoon.setDefaultFilename(getNodeValue(node));
+} else if (nodeName.equals(NODE_INCLUDE)) {
+String pattern =
Main.parseIncludeExcludeNode(cocoon, node, NODE_INCLUDE);
+cocoon.addIncludePattern(pattern);
+
+} else if (nodeName.equals(NODE_EXCLUDE)) {
+String pattern =
Main.parseIncludeExcludeNode(cocoon, node, NODE_EXCLUDE);
+cocoon.addExcludePattern(pattern);
+
} else if (nodeName.equals(NODE_URI)) {
Main.parseURINode(cocoon, node, destDir);
@@ -551,6 +562,19 @@
NodeList nodes = node.getChildNodes();
if (nodes.getLength()!=0) {
throw new IllegalArgumentException(Unexpected children of +
NODE_BROKEN_LINKS + node);
+}
+}
+
+private static String parseIncludeExcludeNode(CocoonBean cocoon, Node
node, final String NODE_TYPE) throws IllegalArgumentException {
+NodeList nodes = node.getChildNodes();
+if (nodes.getLength() != 0) {
+throw new IllegalArgumentException(Unexpected children of +
NODE_INCLUDE + node);
+}
+
+if (Main.hasAttribute(node, ATTR_INCLUDE_EXCLUDE_PATTERN)) {
+return Main.getAttributeValue(node,
ATTR_INCLUDE_EXCLUDE_PATTERN);
+} else {
+throw new IllegalArgumentException(Expected a
+ATTR_INCLUDE_EXCLUDE_PATTERN+ attribute for +NODE_TYPE+ node);
}
}
1.18 +79 -23
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CocoonBean.java 27 Aug 2003 19:18:18 - 1.17
+++ CocoonBean.java 28 Aug 2003 19:21:00 - 1.18
@@ -60,6 +60,7 @@
import org.apache.cocoon.components.notification.Notifier;
import org.apache.cocoon.components.notification.DefaultNotifyingBuilder;
import org.apache.cocoon.components.notification.Notifying;
+import org.apache.cocoon.matching.helpers.WildcardHelper;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.SourceResolver;
@@ -77,10 +78,13 @@
import java.util.List;
/**
- * The Cocoon Bean simplifies usage of the Cocoon object. Allows to create,
+ * pThe Cocoon Bean simplifies usage of the Cocoon object. Allows to
create,
* configure Cocoon instance and process requests, one by one or multiple
- * with link traversal.
+ * with link traversal./p
*
+ * pbWARNING:/b This interface is not stable and could be changed in
+ * backward incompatible way without prior notice./p
+
* @author a href=mailto:[EMAIL PROTECTED]Stefano Mazzocchi/a
* @author a href=mailto:[EMAIL PROTECTED]Nicola Ken Barozzi/a
* @author a href=mailto:[EMAIL PROTECTED]Vadim Gritsenko/a
@@ -97,6 +101,8 @@
private List targets = new ArrayList();
private boolean brokenLinkGenerate = false;
private String brokenLinkExtension = ;
+private List excludePatterns = new ArrayList();
+private List includePatterns = new ArrayList();
// Internal Objects
private Map allProcessedLinks;
@@ -105,6 +111,7 @@
private List listeners = new ArrayList();
private boolean verbose
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java
upayavira2003/08/29 07:05:50 Modified:src/java/org/apache/cocoon/bean CocoonBean.java Log: Removing printing of timestamp - will re-add it properly by extending the BeanListener interface Revision ChangesPath 1.19 +3 -1 cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java Index: CocoonBean.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- CocoonBean.java 28 Aug 2003 19:21:00 - 1.18 +++ CocoonBean.java 29 Aug 2003 14:05:50 - 1.19 @@ -553,9 +553,11 @@ targets.add(target.getDerivedTarget(link)); } } +/* Commenting out timestamp - will reimplement properly using the BeanListener interface double d = (System.currentTimeMillis()- startTimeMillis); String time = [ + (d/1000) + seconds]; System.out.println(+ time); +*/ return targets; }
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/sitemap LinkGatherer.java
upayavira2003/08/30 02:51:59
Modified:src/java/org/apache/cocoon/sitemap LinkGatherer.java
Log:
Making LinkGatherer non-caching, so that it will continue to work
Revision ChangesPath
1.4 +4 -2
cocoon-2.1/src/java/org/apache/cocoon/sitemap/LinkGatherer.java
Index: LinkGatherer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/LinkGatherer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LinkGatherer.java 17 Aug 2003 13:43:00 - 1.3
+++ LinkGatherer.java 30 Aug 2003 09:51:59 - 1.4
@@ -102,7 +102,9 @@
* component is currently not cacheable.
*/
public SourceValidity getValidity() {
-return NOPValidity.SHARED_INSTANCE;
+// Whilst the cache does not store gathered links, this component must
be non-cacheable
+// return NOPValidity.SHARED_INSTANCE;
+return null;
}
public void simpleLink(String href, String role, String arcrole, String
title, String show, String actuate, String uri,
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonWrapper.java
upayavira2003/09/01 07:07:33 Modified:.cli.xconf status.xml src/java/org/apache/cocoon/bean CocoonWrapper.java Log: Changing logkit path to be relative to the context dir, rather than relative to the invocation directory. All other paths in the CLI are relative to the context, so this is fixing an anomaly. Updating the cli.xconf in cocoon root to reference the docs in the build/webapp. Thus the CLI it is all set to work directly from the built webapp rather than from a no-longer used (?) docs target. Now cocoon cli -x cli.xconf will generate the docs to build/dest/ Revision ChangesPath 1.5 +72 -34cocoon-2.1/cli.xconf Index: cli.xconf === RCS file: /home/cvs/cocoon-2.1/cli.xconf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cli.xconf 7 Aug 2003 12:56:39 - 1.4 +++ cli.xconf 1 Sep 2003 14:07:33 - 1.5 @@ -33,13 +33,32 @@ |consistent method for accessing the CLI, it is recommended |that you use the command line parameters to configure |the CLI./note +| | CVS: $Id$ +-- cocoon verbose=true follow-links=true precompile-only=false -confirm-extensions=false +confirm-extensions=true + + !--+ + | The context directory is usually the webapp directory + | containing the sitemap.xmap file. + | + | The config file is the cocoon.xconf file. + | + | The work directory is used by Cocoon to store temporary + | files and cache files. + | + | The destination directory is where generated pages will + | be written (assuming the 'simple' mapper is used, see + | below) + +-- + context-dirbuild/webapp/context-dir + config-fileWEB-INF/cocoon.xconf/config-file + work-dirbuild/work/work-dir + dest-dirbuild/dest/dest-dir !--+ | Broken link reporting options: @@ -49,18 +68,18 @@ | broken-links type=xml report=filename/ | Ignore broken links (default): | broken-links type=none/ - | When a page includes an error, should a page be generated? | | Two attributes to this node specify whether a page should - | be generated when an error occured. 'generate' specifies + | be generated when an error has occured. 'generate' specifies | whether a page should be generated (default: true) and | extension specifies an extension that should be appended | to the generated page's filename (default: none) - | broken-links generate=true extension=.error.txt/ - | + | + | Using this, a quick scan through the destination directory + | will show broken links, by their filename extension. +-- broken-links type=xml - file=../brokenlinks.xml + file=brokenlinks.xml generate=false extension=.error/ @@ -75,30 +94,28 @@ -- !--+ - | + | Configures logging. + | The 'log-kit' parameter specifies the location of the log kit + | configuration file (usually called logkit.xconf. + | + | Logger specifies the logging category (for all logging prior + | to other Cocoon logging categories taking over) + | + | Available log levels are: + |DEBUG:prints all level of log messages. + |INFO: prints all level of log messages except DEBUG + | ones. + |WARN: prints all level of log messages except DEBUG + | and INFO ones. + |ERROR:prints all level of log messages except DEBUG, + | INFO and WARN ones. + |FATAL_ERROR: prints only log messages of this level +-- - logging log-kit=./logkit.xconf logger=cli level=ERROR / + logging log-kit=WEB-INF/logkit.xconf logger=cli level=ERROR / !--+ - | The context directory is usually the webapp directory - | containing the sitemap.xmap file. - | - | The config file is the cocoon.xconf file. - | - | The work directory is used by Cocoon to store temporary - | files and cache files. - | - | The destination directory is where generated pages will - | be written (assuming the 'simple' mapper is used) - +-- - context-dir./context-dir - config-filecocoon.xconf/config-file - work-dir../temp/docs/work-dir - dest-dir../docs/dest-dir - - !--+ - | Specifies the filename to be appended to URIs
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java Target.java
upayavira2003/09/15 04:26:04
Modified:src/java/org/apache/cocoon/bean CocoonBean.java Target.java
Log:
Moving destination URI arithmetic into Target class.
Revision ChangesPath
1.24 +45 -106
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CocoonBean.java 13 Sep 2003 10:20:09 - 1.23
+++ CocoonBean.java 15 Sep 2003 11:26:04 - 1.24
@@ -71,7 +71,6 @@
import java.io.PrintStream;
import java.util.Map;
import java.util.HashMap;
-import java.util.TreeMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -186,17 +185,24 @@
String sourceURI,
String destURI)
throws IllegalArgumentException {
-targets.add(new Target(type, root, sourceURI, destURI));
+Target target = new Target(type, root, sourceURI, destURI);
+target.setDefaultFilename(this.defaultFilename);
+targets.add(target);
+
}
public void addTarget(String type, String sourceURI, String destURI)
throws IllegalArgumentException {
-targets.add(new Target(type, sourceURI, destURI));
+Target target = new Target(type, sourceURI, destURI);
+target.setDefaultFilename(this.defaultFilename);
+targets.add(target);
}
public void addTarget(String sourceURI, String destURI)
throws IllegalArgumentException {
-targets.add(new Target(sourceURI, destURI));
+Target target = new Target(sourceURI, destURI);
+target.setDefaultFilename(this.defaultFilename);
+targets.add(target);
}
public void addTargets(List uris, String destURI)
@@ -204,6 +210,7 @@
Iterator i = uris.iterator();
while (i.hasNext()) {
Target target = new Target((String) i.next(), destURI);
+target.setDefaultFilename(this.defaultFilename);
targets.add(target);
}
}
@@ -367,30 +374,20 @@
int linkCount = 0;
-String destinationURI;
if (confirmExtension) {
-destinationURI = (String)
allTranslatedLinks.get(target.getSourceURI());
-if (destinationURI == null) {
-destinationURI = mangle(target.getSourceURI());
-final String type =
getType(target.getDeparameterizedSourceURI(), target.getParameters());
-final String ext = NetUtils.getExtension(destinationURI);
-final String defaultExt =
MIMEUtils.getDefaultExtension(type);
-if (defaultExt != null) {
-if ((ext == null) || (!ext.equals(defaultExt))) {
-destinationURI += defaultExt;
-}
-}
-allTranslatedLinks.put(target.getSourceURI(),
destinationURI);
+if (null == allTranslatedLinks.get(target.getSourceURI())) {
+final String mimeType =
getType(target.getDeparameterizedSourceURI(), target.getParameters());
+target.setMimeType(mimeType);
+allTranslatedLinks.put(target.getSourceURI(),
target.getDestinationURI());
}
-} else {
-destinationURI = target.getSourceURI();
}
// Store processed URI list to avoid eternal loop
allProcessedLinks.put(target, target);
-if (.equals(destinationURI)) {
-return new ArrayList();
-}
+// IS THIS STILL NEEDED?
+//if (.equals(destinationURI)) {
+//return new ArrayList();
+//}
// Process links
final HashMap translatedLinks = new HashMap();
@@ -415,31 +412,23 @@
continue;
}
-String linkDestinationURI =
-(String)
allTranslatedLinks.get(linkTarget.getSourceURI());
-if (linkDestinationURI == null) {
+if (null ==
allTranslatedLinks.get(linkTarget.getSourceURI())) {
try {
-linkDestinationURI =
-this.translateURI(linkTarget.getSourceURI());
+final String mimeType =
+
getType(target.getDeparameterizedSourceURI(), target.getParameters());
+target.setMimeType(mimeType);
+allTranslatedLinks.put(target.getSourceURI(),
target.getDestinationURI());
log.info( Link translated: +
linkTarget.getSourceURI
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers OutputStreamListener.java
upayavira2003/09/15 12:18:18
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean BeanListener.java
CocoonBean.java Target.java
Added: src/java/org/apache/cocoon/bean/helpers
OutputStreamListener.java
Log:
Improving the BeanListener interface to be able to handle better reporting
Replacing CLIListener with OutputStreamListener (generic bean listener, not
specific to the CLI)
Starting to update CLI to use this new interface
Revision ChangesPath
1.14 +9 -85 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Main.java 28 Aug 2003 19:21:00 - 1.13
+++ Main.java 15 Sep 2003 19:18:17 - 1.14
@@ -77,7 +77,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.bean.CocoonBean;
-import org.apache.cocoon.bean.BeanListener;
+import org.apache.cocoon.bean.helpers.OutputStreamListener;
/**
* Command line entry point. Parses command line, create Cocoon bean and
invokes it
@@ -174,9 +174,7 @@
private static final String ATTR_URI_DESTURI = dest;
private static Options options;
-private static List brokenLinks = new ArrayList();
-private static String brokenLinkReportFile = null;
-private static String brokenLinkReportType = text;
+private static OutputStreamListener listener;
private static void setOptions() {
options = new Options();
@@ -297,11 +295,9 @@
*/
public static void main(String[] args) throws Exception {
-long startTimeMillis = System.currentTimeMillis();
-
Main.setOptions();
CommandLine line = new PosixParser().parse( options, args );
-CLIListener listener = new Main.CLIListener();
+listener = new OutputStreamListener(System.out);
CocoonBean cocoon = new CocoonBean();
cocoon.addListener(listener);
@@ -369,7 +365,7 @@
cocoon.setDefaultFilename(line.getOptionValue(DEFAULT_FILENAME_OPT));
}
if (line.hasOption(BROKEN_LINK_FILE_OPT)) {
-brokenLinkReportFile = line.getOptionValue(BROKEN_LINK_FILE_OPT);
+
listener.setReportFile(line.getOptionValue(BROKEN_LINK_FILE_OPT));
}
if (line.hasOption(URI_FILE_OPT)) {
cocoon.addTargets(processURIFile(line.getOptionValue(URI_FILE_OPT)), destDir);
@@ -392,12 +388,10 @@
cocoon.process();
cocoon.dispose();
-listener.outputBrokenLinks();
+listener.complete();
-long duration = System.currentTimeMillis() - startTimeMillis;
-System.out.println(Total time: + (duration / 6) + minutes
+ (duration % 6)/1000 + seconds);
-int exitCode = (brokenLinks.size() == 0 ? 0 : 1);
+int exitCode = (listener.isSuccessful() ? 0 : 1);
System.exit(exitCode);
}
@@ -548,10 +542,10 @@
private static void parseBrokenLinkNode(CocoonBean cocoon, Node node)
throws IllegalArgumentException {
if (Main.hasAttribute(node, ATTR_BROKEN_LINK_REPORT_FILE)) {
-brokenLinkReportFile = Main.getAttributeValue(node,
ATTR_BROKEN_LINK_REPORT_FILE);
+listener.setReportFile(Main.getAttributeValue(node,
ATTR_BROKEN_LINK_REPORT_FILE));
}
if (Main.hasAttribute(node, ATTR_BROKEN_LINK_REPORT_TYPE)) {
-brokenLinkReportType = Main.getAttributeValue(node,
ATTR_BROKEN_LINK_REPORT_TYPE);
+listener.setReportType(Main.getAttributeValue(node,
ATTR_BROKEN_LINK_REPORT_TYPE));
}
if (Main.hasAttribute(node, ATTR_BROKEN_LINK_GENERATE)) {
cocoon.setBrokenLinkGenerate(Main.getBooleanAttributeValue(node,
ATTR_BROKEN_LINK_GENERATE));
@@ -714,75 +708,5 @@
private static void printVersion() {
System.out.println(Constants.VERSION);
System.exit(0);
-}
-public static class CLIListener implements BeanListener {
-public void pageGenerated(String uri, int linksInPage, int
pagesRemaining) {
-if (linksInPage == -1) {
-this.print(* + uri);
-} else {
-this.print(* [+linksInPage + ] +uri);
-}
-}
-public void messageGenerated(String msg) {
-this.print(msg);
-}
-
-public void warningGenerated(String uri, String warning) {
-this.print(Warning: +warning + when generating + uri);
-}
-
-public void brokenLinkFound(String uri, String message) {
-this.print(X [0] +uri
cvs commit: cocoon-2.1/src/blocks/authentication-fw/samples/flow - New directory
upayavira2003/09/17 01:40:36 cocoon-2.1/src/blocks/authentication-fw/samples/flow - New directory
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/util NetUtils.java
upayavira2003/09/18 05:11:50
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean BeanListener.java
CocoonBean.java Target.java
src/java/org/apache/cocoon/bean/helpers
DelayedOutputStream.java OutputStreamListener.java
src/java/org/apache/cocoon/util NetUtils.java
Log:
Added removeAuthentication() to NetUtils, removes FTP and HTTP authentication
details from a URI. Could do it with more protocols.
Added page skipping reporting (link preceded with ^)
Added facility to only crawl certain extensions (this didn't give any hoped
for speed improvement, but I might as well leave it there, as some might want
to crawl HTML but not PDFs)
Prevented link gathering when running in link view mode
Added code to bean to report time taken and page size
Improved layout of console reporting of CLI (now shows links found, time
taken, page size and URI, all in nice columns)
Revision ChangesPath
1.16 +13 -1 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Main.java 17 Sep 2003 01:13:44 - 1.15
+++ Main.java 18 Sep 2003 12:11:49 - 1.16
@@ -162,6 +162,9 @@
private static final String NODE_EXCLUDE = exclude;
private static final String ATTR_INCLUDE_EXCLUDE_PATTERN = pattern;
+private static final String NODE_INCLUDE_LINKS = include-links;
+private static final String ATTR_LINK_EXTENSION = extension;
+
private static final String NODE_URI = uri;
private static final String ATTR_URI_TYPE = type;
private static final String ATTR_URI_SOURCEPREFIX = src-prefix;
@@ -501,6 +504,9 @@
String pattern =
Main.parseIncludeExcludeNode(cocoon, node, NODE_EXCLUDE);
cocoon.addExcludePattern(pattern);
+} else if (nodeName.equals(NODE_INCLUDE_LINKS)) {
+Main.parseIncludeLinksNode(cocoon, node);
+
} else if (nodeName.equals(NODE_URI)) {
Main.parseURINode(cocoon, node, destDir);
@@ -532,6 +538,12 @@
NodeList nodes = node.getChildNodes();
if (nodes.getLength()!=0) {
throw new IllegalArgumentException(Unexpected children of +
NODE_LOGGING + node);
+}
+}
+
+private static void parseIncludeLinksNode(CocoonBean cocoon, Node node)
throws IllegalArgumentException {
+if (Main.hasAttribute(node, ATTR_LINK_EXTENSION)) {
+cocoon.addIncludeLinkExtension(Main.getAttributeValue(node,
ATTR_LINK_EXTENSION));
}
}
1.3 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/bean/BeanListener.java
Index: BeanListener.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/BeanListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanListener.java 15 Sep 2003 19:18:17 - 1.2
+++ BeanListener.java 18 Sep 2003 12:11:50 - 1.3
@@ -71,7 +71,7 @@
int linksInPage,
int newLinksinPage,
int pagesRemaining,
- int pageComplete,
+ int pagesComplete,
long timeTaken);
/**
@@ -79,7 +79,7 @@
* include/exclude pattern.
* @param msg
*/
-public void pageSkipped(String uri);
+public void pageSkipped(String uri, String message);
/**
* Report a general message about operation of the bean
1.27 +68 -17
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- CocoonBean.java 15 Sep 2003 19:18:17 - 1.26
+++ CocoonBean.java 18 Sep 2003 12:11:50 - 1.27
@@ -100,7 +100,8 @@
private String brokenLinkExtension = ;
private List excludePatterns = new ArrayList();
private List includePatterns = new ArrayList();
-
+private List includeLinkExtensions = null;
+
// Internal Objects
private Map allProcessedLinks;
private Map allTranslatedLinks;
@@ -223,15 +224,36 @@
includePatterns.add(preparedPattern
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java
upayavira2003/09/19 05:48:37
Modified:src/java/org/apache/cocoon/bean CocoonBean.java
Log:
Fixing problem with last link on page not being crawled. Fix provided by
simon.mieth at t-online.de.
Revision ChangesPath
1.29 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CocoonBean.java 19 Sep 2003 09:09:43 - 1.28
+++ CocoonBean.java 19 Sep 2003 12:48:37 - 1.29
@@ -371,8 +371,8 @@
} else if (this.followLinks) {
i = processTarget(target).iterator();
while (i.hasNext()) {
-target = (Target) i.next();
-targetMap.put(target, target);
+Target link = (Target) i.next();
+targetMap.put(link, link);
}
} else {
processTarget(target);
cvs commit: cocoon-2.1/src/blocks/authentication-fw/samples flow.xmap
upayavira2003/09/21 04:51:08
Modified:src/blocks/authentication-fw/conf authentication-fw.xsamples
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/flow/javascript
auth.js
src/blocks/authentication-fw/samples flow.xmap
Log:
Protected page now shows correctly on clicking on 'login' when already
authenticated.
Added reference to flow sample to blocks samples page.
Auth flow sample should now be fully working.
Revision ChangesPath
1.3 +3 -0
cocoon-2.1/src/blocks/authentication-fw/conf/authentication-fw.xsamples
Index: authentication-fw.xsamples
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/conf/authentication-fw.xsamples,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authentication-fw.xsamples7 May 2003 19:16:35 - 1.2
+++ authentication-fw.xsamples21 Sep 2003 11:51:08 - 1.3
@@ -6,6 +6,9 @@
sample name=Authentication Framework href=authentication-fw/login
This is a demo of the authentication framework integrated into Cocoon.
/sample
+sample name=Authentication Framework with Flow
href=authentication-fw/flow/login
+ This is the same demo, but using flow instead of actions.
+/sample
/group
/xsamples
1.4 +3 -5
cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/flow/javascript/auth.js
Index: auth.js
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/flow/javascript/auth.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- auth.js 20 Sep 2003 21:22:33 - 1.3
+++ auth.js 21 Sep 2003 11:51:08 - 1.4
@@ -62,10 +62,7 @@
// do authentication
authenticated = authMgr.checkAuthentication(null, handler,
application);
-if (authenticated) {
-state = authMgr.getState();
-map = state.getHandler().getContext().getContextInfo();
-} else {
+if (!authenticated) {
cocoon.redirectTo(authMgr.getForwardingURI(handler));
}
} finally {
@@ -80,7 +77,8 @@
// ApplicationName, do we need it?
authMgr =
cocoon.getComponent(Packages.org.apache.cocoon.webapps.authentication.AuthenticationManager.ROLE);
-return authMgr.isAuthenticated(handler);
+var userHandler = authMgr.isAuthenticated(handler);
+return (userHandler!=null);
} finally {
cocoon.releaseComponent(authMgr);
}
1.3 +2 -1 cocoon-2.1/src/blocks/authentication-fw/samples/flow.xmap
Index: flow.xmap
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/samples/flow.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flow.xmap 20 Sep 2003 21:22:33 - 1.2
+++ flow.xmap 21 Sep 2003 11:51:08 - 1.3
@@ -41,6 +41,7 @@
!-- = --
map:match pattern=login
map:call function=isLoggedIn
+ map:parameter name=handler value=flowdemohandler/
map:parameter name=protected-redirect value=protected/
map:parameter name=failure-internal value=internal/login/
/map:call
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java
upayavira2003/09/22 13:10:47
Modified:src/blocks/mail/java/org/apache/cocoon/mail
MailContentHandlerDelegate.java
src/blocks/woody/java/org/apache/cocoon/woody/formmodel
AbstractWidgetDefinitionBuilder.java
src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
Log:
unkown--unknown
Revision ChangesPath
1.5 +5 -5
cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java
Index: MailContentHandlerDelegate.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailContentHandlerDelegate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailContentHandlerDelegate.java 24 Mar 2003 14:33:56 - 1.4
+++ MailContentHandlerDelegate.java 22 Sep 2003 20:10:46 - 1.5
@@ -657,7 +657,7 @@
} else if (o instanceof InputStream) {
encodeInputStreamForXML((InputStream) o);
} else {
-// unkown type
+// unknown type
InputStream is = part.getInputStream();
encodeInputStreamForXML(is);
}
1.4 +1 -1
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinitionBuilder.java
Index: AbstractWidgetDefinitionBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinitionBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractWidgetDefinitionBuilder.java 16 Jul 2003 13:59:36 -
1.3
+++ AbstractWidgetDefinitionBuilder.java 22 Sep 2003 20:10:47 -
1.4
@@ -100,7 +100,7 @@
try {
builder =
(WidgetDefinitionBuilder)widgetDefinitionBuilderSelector.select(widgetName);
} catch (ServiceException e) {
-throw new CascadingException(Unkown kind of widget \ +
widgetName + \ specified at + DomHelper.getLocation(widgetDefinition), e);
+throw new CascadingException(Unknown kind of widget \ +
widgetName + \ specified at + DomHelper.getLocation(widgetDefinition), e);
}
return builder.buildWidgetDefinition(widgetDefinition);
}
1.8 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XIncludeTransformer.java 4 Jul 2003 13:55:09 - 1.7
+++ XIncludeTransformer.java 22 Sep 2003 20:10:47 - 1.8
@@ -363,7 +363,7 @@
// an empty href is a reference to the current document --
this can be different than the current base
if (href.equals()) {
if (this.href == null)
-throw new SAXException(XIncludeTransformer:
encountered empty href (= href pointing to the current document) but the
location of the current document is unkown.);
+throw new SAXException(XIncludeTransformer:
encountered empty href (= href pointing to the current document) but the
location of the current document is unknown.);
int fragmentIdentifierPos2 = this.href.indexOf('#');
if (fragmentIdentifierPos2 != -1)
href = this.href.substring(0,
fragmentIdentifierPos2);
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers OutputStreamListener.java
upayavira2003/09/26 01:25:21
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean/helpers
OutputStreamListener.java
Log:
Tidied output of CLI
Reordered command line parameter code so that a destination directory on the
command line will override an xconf one. This already applies to all other
parameters.
Revision ChangesPath
1.18 +5 -5 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Main.java 19 Sep 2003 09:09:43 - 1.17
+++ Main.java 26 Sep 2003 08:25:21 - 1.18
@@ -308,14 +308,14 @@
}
String destDir = null;
-if (line.hasOption(DEST_DIR_OPT)) {
-destDir = line.getOptionValue(DEST_DIR_OPT);
-}
-
if (line.hasOption(XCONF_OPT)) {
// destDir from command line overrides one in xconf file
destDir = Main.processXConf(cocoon,
line.getOptionValue(XCONF_OPT), destDir);
}
+if (line.hasOption(DEST_DIR_OPT)) {
+destDir = line.getOptionValue(DEST_DIR_OPT);
+}
+
if (line.hasOption(VERBOSE_OPT)) {
cocoon.setVerbose(true);
}
1.3 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java
Index: OutputStreamListener.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OutputStreamListener.java 18 Sep 2003 12:11:50 - 1.2
+++ OutputStreamListener.java 26 Sep 2003 08:25:21 - 1.3
@@ -109,7 +109,7 @@
if (linksInPage == -1) {
this.print(* + sourceURI);
} else {
-this.print(pad(13, * [+linksInPage + / + newLinksInPage + ]
) +
+this.print(pad(8, * [+linksInPage + ] ) +
pad(7,time + s ) +
pad(8, size) +
sourceURI);
@@ -135,7 +135,7 @@
}
public void pageSkipped(String uri, String message) {
-this.print(^ +uri);
+this.print(pad(23, ^ ) + uri);
}
public void complete() {
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers OutputStreamListener.java
upayavira2003/10/06 05:40:14
Modified:src/java/org/apache/cocoon/bean CocoonBean.java
src/java/org/apache/cocoon/bean/helpers
OutputStreamListener.java
Log:
Moved crawling code into a separate crawler class. This has made it possible
to implement all of my proposed reporting options. The CLI now reports:
* [no of pages generated/no of pages left] [new links in page/total pages in
links] page URI
Revision ChangesPath
1.32 +52 -75
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- CocoonBean.java 1 Oct 2003 20:27:49 - 1.31
+++ CocoonBean.java 6 Oct 2003 12:40:14 - 1.32
@@ -53,6 +53,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.bean.helpers.Crawler;
import org.apache.cocoon.bean.helpers.DelayedOutputStream;
import org.apache.cocoon.components.notification.SimpleNotifyingBean;
import org.apache.cocoon.components.notification.Notifier;
@@ -95,7 +96,6 @@
private boolean precompileOnly = false;
private boolean confirmExtension = true;
private String defaultFilename = Constants.INDEX_URI;
-private List targets = new ArrayList();
private boolean brokenLinkGenerate = false;
private String brokenLinkExtension = ;
private List excludePatterns = new ArrayList();
@@ -103,12 +103,15 @@
private List includeLinkExtensions = null;
// Internal Objects
-private Map allProcessedLinks;
-private Map allTranslatedLinks;
private boolean initialized;
private List listeners = new ArrayList();
private boolean verbose;
SourceResolver sourceResolver;
+private Crawler crawler;
+
+public CocoonBean() {
+this.crawler = new Crawler();
+}
//
// INITIALISATION METHOD
@@ -118,7 +121,7 @@
if (this.initialized == false) {
super.initialize();
-if (targets.size() == 0 !precompileOnly) {
+if (crawler.getRemainingCount() == 0 !precompileOnly) {
String error = Please, specify at least one starting URI.;
log.fatalError(error);
throw new ProcessingException(error);
@@ -196,7 +199,7 @@
target.setFollowLinks(this.followLinks);
target.setConfirmExtension(this.confirmExtension);
target.setLogger(this.logger);
-targets.add(target);
+crawler.addTarget(target);
}
public void addTarget(String type, String sourceURI, String destURI)
@@ -206,7 +209,7 @@
target.setFollowLinks(this.followLinks);
target.setConfirmExtension(this.confirmExtension);
target.setLogger(this.logger);
-targets.add(target);
+crawler.addTarget(target);
}
public void addTarget(String sourceURI, String destURI)
@@ -216,7 +219,7 @@
target.setFollowLinks(this.followLinks);
target.setConfirmExtension(this.confirmExtension);
target.setLogger(this.logger);
-targets.add(target);
+crawler.addTarget(target);
}
public void addTargets(List uris, String destURI)
@@ -228,7 +231,7 @@
target.setFollowLinks(this.followLinks);
target.setConfirmExtension(this.confirmExtension);
target.setLogger(this.logger);
-targets.add(target);
+crawler.addTarget(target);
}
}
@@ -254,7 +257,7 @@
target.setFollowLinks(followLinks);
target.setConfirmExtension(confirmExtension);
target.setLogger(logger);
-targets.add(target);
+crawler.addTarget(target);
}
public void addExcludePattern(String pattern) {
@@ -351,60 +354,34 @@
this.initialize();
}
-allProcessedLinks = new HashMap();
-allTranslatedLinks = new HashMap();
-
-Map targetMap = new HashMap();
-Iterator i = targets.iterator();
-while (i.hasNext()) {
-Target target = (Target) i.next();
-targetMap.put(target, target);
-}
-
-int nCount = 0;
-while (targetMap.size() 0) {
-Target target = (Target) targetMap.keySet().iterator().next();
-try {
-if (!allProcessedLinks.containsKey(target)) {
-if (precompileOnly) {
-processXSP(target.getSourceURI
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers Crawler.java
upayavira2003/10/06 07:38:39
Added: src/java/org/apache/cocoon/bean/helpers Crawler.java
Log:
Missed out Crawer.java from previous commit
Revision ChangesPath
1.1
cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/Crawler.java
Index: Crawler.java
===
/*
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/.
*/
package org.apache.cocoon.bean.helpers;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.cocoon.bean.Target;
import org.apache.cocoon.ProcessingException;
/**
* A simple Cocoon crawler
*
* @author a href=mailto:[EMAIL PROTECTED]Upayavira/a
* @version CVS $Id: Crawler.java,v 1.1 2003/10/06 14:38:39 upayavira Exp $
*/
public class Crawler {
private Map allTranslatedLinks;
private Map stillNotVisited;
private Set visitedAlready;
public Crawler() {
visitedAlready = new HashSet();
stillNotVisited = new HashMap();
allTranslatedLinks = new HashMap();
}
/**
* Add a target for future processing
*/
public boolean addTarget(Target target) {
String targetString = target.toString();
if (!visitedAlready.contains(targetString)) {
if (!stillNotVisited.containsKey(targetString)) {
stillNotVisited.put(targetString, target);
return true;
}
}
return false;
}
/**
* Returns the number of targets for processing
*/
public int getRemainingCount() {
return stillNotVisited.size();
}
public int getProcessedCount() {
return visitedAlready.size();
}
public int getTranslatedCount() {
return allTranslatedLinks.size();
}
public void addTranslatedLink(Target target) throws ProcessingException {
allTranslatedLinks.put(target.getSourceURI(),
target.getDestinationURI());
}
public boolean
cvs commit: cocoon-2.1 build.bat
upayavira2003/10/06 09:07:22 Modified:.build.bat Log: Fixing bug 22707 Revision ChangesPath 1.5 +2 -10 cocoon-2.1/build.bat Index: build.bat === RCS file: /home/cvs/cocoon-2.1/build.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.bat 3 Jul 2003 19:50:40 - 1.4 +++ build.bat 6 Oct 2003 16:07:22 - 1.5 @@ -36,15 +36,7 @@ set OLD_ANT_HOME=%ANT_HOME% set ANT_HOME=tools -rem - Set endorsed library path to be used by Ant -set OLD_ANT_OPTS=%ANT_OPTS% -set ANT_OPTS=-Djava.endorsed.dirs=lib\endorsed - -call %ANT_HOME%\bin\ant -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9 - -rem - Restore ANT_OPTS -set ANT_OPTS=%OLD_ANT_OPTS% -set OLD_ANT_OPTS= +call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=lib\endorsed -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9 rem - Restore ANT_HOME set ANT_HOME=%OLD_ANT_HOME%
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers DelayedOutputStream.java OutputStreamListener.java
upayavira2003/10/07 02:59:17
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean CocoonBean.java
src/java/org/apache/cocoon/bean/helpers
DelayedOutputStream.java OutputStreamListener.java
Log:
Checksum testing of pages once generated. They're now only saved if the
checksum is different.
This allows improved uploading, e.g. with Ant, but does not speed the
building of the site itself.
It is accessed by adding a checksums-uri node into cli.xconf containing a
filename referring to a file to store the checksums.
Note: this should not be considered stable - I will probably improve upon it
which will change the way it is configured.
Revision ChangesPath
1.20 +6 -3 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Main.java 26 Sep 2003 17:08:08 - 1.19
+++ Main.java 7 Oct 2003 09:59:17 - 1.20
@@ -144,7 +144,8 @@
private static final String NODE_WORK_DIR = work-dir;
private static final String NODE_CONFIG_FILE = config-file;
private static final String NODE_URI_FILE = uri-file;
-
+private static final String NODE_CHECKSUMS_URI = checksums-uri;
+
private static final String NODE_BROKEN_LINKS = broken-links;
private static final String ATTR_BROKEN_LINK_REPORT_TYPE = type;
private static final String ATTR_BROKEN_LINK_REPORT_FILE = file;
@@ -471,7 +472,6 @@
if (Main.hasAttribute(root, ATTR_CONFIRM_EXTENSIONS)) {
cocoon.setConfirmExtensions(Main.getBooleanAttributeValue(root,
ATTR_CONFIRM_EXTENSIONS));
}
-
if (destDir == null || destDir.length() == 0) {
destDir = getNodeValue(root, NODE_DEST_DIR);
}
@@ -502,6 +502,9 @@
} else if (nodeName.equals(NODE_WORK_DIR)) {
cocoon.setWorkDir(getNodeValue(node));
+} else if (nodeName.equals(NODE_CHECKSUMS_URI)) {
+cocoon.setChecksumURI(getNodeValue(node));
+
} else if (nodeName.equals(NODE_AGENT)) {
cocoon.setAgentOptions(getNodeValue(node));
1.34 +110 -18
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- CocoonBean.java 6 Oct 2003 14:41:55 - 1.33
+++ CocoonBean.java 7 Oct 2003 09:59:17 - 1.34
@@ -63,14 +63,24 @@
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceNotFoundException;
+import org.apache.excalibur.source.SourceUtil;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.io.PrintStream;
-import java.util.HashMap;
+import java.io.PrintWriter;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
* pThe Cocoon Bean simplifies usage of the Cocoon object. Allows to
create,
@@ -92,6 +102,7 @@
private boolean followLinks = true;
private boolean precompileOnly = false;
private boolean confirmExtension = true;
+private boolean checksumCompare = false;
private String defaultFilename = Constants.INDEX_URI;
private boolean brokenLinkGenerate = false;
private String brokenLinkExtension = ;
@@ -104,7 +115,10 @@
private List listeners = new ArrayList();
private boolean verbose;
SourceResolver sourceResolver;
-private Crawler crawler;
+
+private Crawler crawler;
+private String checksumsURI = null;
+private Map checksums;
public CocoonBean() {
this.crawler = new Crawler();
@@ -169,6 +183,10 @@
this.brokenLinkExtension = brokenLinkExtension;
}
+public void setChecksumURI(String uri) {
+this.checksumsURI = uri;
+}
+
public boolean followLinks() {
return followLinks;
}
@@ -351,6 +369,8 @@
this.initialize
cvs commit: cocoon-site/src/documentation/content/xdocs/link livesites-2.1.xml
upayavira2003/10/08 05:33:31 Modified:src/documentation/content/xdocs/link livesites-2.1.xml Log: Adding fwbo.org as a livesite. Revision ChangesPath 1.6 +1 -0 cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml Index: livesites-2.1.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- livesites-2.1.xml 30 Sep 2003 21:22:13 - 1.5 +++ livesites-2.1.xml 8 Oct 2003 12:33:31 - 1.6 @@ -54,6 +54,7 @@ (also link href=http://www.apartments.de;Apartments/link, link href=http://www.unterkunft.de;Hotels and Accomodations/link). /li + lilink href=http://www.fwbo.org/;Friends of the Western Buddhist Order/link/li /ul /s2 s2 title=Cocoon 2.1m2-dev
cvs commit: cocoon-2.1 cocoon.bat
upayavira2003/10/08 14:40:43 Modified:.cocoon.bat Log: Applying patch 23681 supplied by Litrik De Roy Revision ChangesPath 1.15 +6 -6 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cocoon.bat3 Oct 2003 12:59:34 - 1.14 +++ cocoon.bat8 Oct 2003 21:40:43 - 1.15 @@ -113,31 +113,31 @@ :cliLoopEnd -%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %param% +%JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB% -Dloader.main.class=org.apache.cocoon.Main Loader %param% goto end :: - Servlet --- :doServlet -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml goto end :: - Servlet with Administration Web Interface - :doAdmin -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml %COCOON_HOME%\tools\jetty\conf\admin.xml +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dhome=%COCOON_HOME% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml %COCOON_HOME%\tools\jetty\conf\admin.xml goto end :: - Servlet Debug - :doDebug -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%COCOON_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml +%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%COCOON_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml goto end :: - Servlet Profile - :doProfile -%EXEC% %JAVA_HOME%\bin\java.exe %JAVA_OPTIONS% -Xrunhprof:heap=all,cpu=samples,thread=y,depth=3 -classpath %CP% -Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed -Dwebapp=%JETTY_WEBAPP% -Dhome=%COCOON_HOME% -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT% -Djetty.admin.port=%JETTY_ADMIN_PORT% -Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed -Dloader.main.class=org.mortbay.jetty.Server Loader %COCOON_HOME%\tools\jetty\conf\main.xml +%EXEC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers BeanConfigurator.java
upayavira2003/10/08 16:22:01
Modified:src/java/org/apache/cocoon Main.java
Added: src/java/org/apache/cocoon/bean/helpers
BeanConfigurator.java
Log:
Moved xconf processing into a BeanConfigurator in preparation for an Ant task
Added support for blank lines and # comments in uri file.
Revision ChangesPath
1.21 +6 -407cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Main.java 7 Oct 2003 09:59:17 - 1.20
+++ Main.java 8 Oct 2003 23:22:00 - 1.21
@@ -50,18 +50,15 @@
*/
package org.apache.cocoon;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.cocoon.bean.CocoonBean;
import org.apache.cocoon.bean.helpers.OutputStreamListener;
+import org.apache.cocoon.bean.helpers.BeanConfigurator;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
@@ -70,9 +67,6 @@
import org.apache.commons.cli.PosixParser;
import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* Command line entry point. Parses command line, create Cocoon bean and
invokes it
@@ -130,52 +124,6 @@
protected static final String DEFAULT_FILENAME_LONG =
defaultFilename;
protected static final String URI_LONG =uri;
protected static final String URI_GROUP_NAME_LONG = uris;
-
-private static final String NODE_ROOT = cocoon;
-private static final String ATTR_VERBOSE = verbose;
-
-private static final String NODE_LOGGING = logging;
-private static final String ATTR_LOG_KIT = log-kit;
-private static final String ATTR_LOG_LEVEL = level;
-private static final String ATTR_LOGGER = logger;
-
-private static final String NODE_CONTEXT_DIR = context-dir;
-private static final String NODE_DEST_DIR = dest-dir;
-private static final String NODE_WORK_DIR = work-dir;
-private static final String NODE_CONFIG_FILE = config-file;
-private static final String NODE_URI_FILE = uri-file;
-private static final String NODE_CHECKSUMS_URI = checksums-uri;
-
-private static final String NODE_BROKEN_LINKS = broken-links;
-private static final String ATTR_BROKEN_LINK_REPORT_TYPE = type;
-private static final String ATTR_BROKEN_LINK_REPORT_FILE = file;
-private static final String ATTR_BROKEN_LINK_GENERATE = generate;
-private static final String ATTR_BROKEN_LINK_EXTENSION = extension;
-
-private static final String NODE_AGENT = user-agent;
-private static final String NODE_ACCEPT = accept;
-
-private static final String ATTR_FOLLOW_LINKS = follow-links;
-private static final String ATTR_PRECOMPILE_ONLY = precompile-only;
-private static final String ATTR_CONFIRM_EXTENSIONS =
confirm-extensions;
-private static final String NODE_LOAD_CLASS = load-class;
-private static final String NODE_DEFAULT_FILENAME = default-filename;
-
-private static final String NODE_INCLUDE = include;
-private static final String NODE_EXCLUDE = exclude;
-private static final String ATTR_INCLUDE_EXCLUDE_PATTERN = pattern;
-
-private static final String NODE_INCLUDE_LINKS = include-links;
-private static final String ATTR_LINK_EXTENSION = extension;
-
-private static final String NODE_URI = uri;
-private static final String ATTR_URI_TYPE = type;
-private static final String ATTR_URI_SOURCEPREFIX = src-prefix;
-private static final String ATTR_URI_SOURCEURI = src;
-private static final String ATTR_URI_DESTURI = dest;
-
-private static final String NODE_URIS = uris;
-private static final String ATTR_NAME = name;
private static Options options;
private static OutputStreamListener listener;
@@ -382,7 +330,7 @@
listener.setReportFile(line.getOptionValue(BROKEN_LINK_FILE_OPT));
}
if (line.hasOption(URI_FILE_OPT)) {
-
cocoon.addTargets(processURIFile(line.getOptionValue(URI_FILE_OPT)), destDir);
+
cocoon.addTargets(BeanConfigurator.processURIFile(line.getOptionValue(URI_FILE_OPT)),
destDir);
}
if (line.hasOption(FOLLOW_LINKS_OPT)) {
cocoon.setFollowLinks(yesno(line.getOptionValue(FOLLOW_LINKS_OPT)));
@@ -413,367 +361,18 @@
return yes.equals(in) || true.equals
cvs commit: cocoon-2.1/src/java/org/apache/cocoon Main.java
upayavira2003/10/10 07:11:50
Modified:src/java/org/apache/cocoon Main.java
Log:
Reordering cli options to solve bug 23725. Thanks to vincent.arbousset at
keyword.fr
Revision ChangesPath
1.22 +4 -4 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Main.java 8 Oct 2003 23:22:00 - 1.21
+++ Main.java 10 Oct 2003 14:11:50 - 1.22
@@ -329,9 +329,6 @@
if (line.hasOption(BROKEN_LINK_FILE_OPT)) {
listener.setReportFile(line.getOptionValue(BROKEN_LINK_FILE_OPT));
}
-if (line.hasOption(URI_FILE_OPT)) {
-
cocoon.addTargets(BeanConfigurator.processURIFile(line.getOptionValue(URI_FILE_OPT)),
destDir);
-}
if (line.hasOption(FOLLOW_LINKS_OPT)) {
cocoon.setFollowLinks(yesno(line.getOptionValue(FOLLOW_LINKS_OPT)));
}
@@ -340,6 +337,9 @@
}
if (line.hasOption(LOAD_CLASS_OPT)){
cocoon.addLoadedClasses(Arrays.asList(line.getOptionValues(LOAD_CLASS_OPT)));
+}
+if (line.hasOption(URI_FILE_OPT)) {
+
cocoon.addTargets(BeanConfigurator.processURIFile(line.getOptionValue(URI_FILE_OPT)),
destDir);
}
cocoon.addTargets(line.getArgList(), destDir);
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers BeanConfigurator.java
upayavira2003/10/10 22:44:07
Modified:src/java/org/apache/cocoon/bean/helpers
BeanConfigurator.java
Log:
More Ant task preparations (allowing nodes to be attributes - Ant cannot use
variable substitution within nodes, only attributes)
Fixing uriindex.html/uri processing, as some people expect it for legacy
reasons.
Revision ChangesPath
1.2 +67 -17
cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/BeanConfigurator.java
Index: BeanConfigurator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/BeanConfigurator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanConfigurator.java 8 Oct 2003 23:22:01 - 1.1
+++ BeanConfigurator.java 11 Oct 2003 05:44:07 - 1.2
@@ -86,6 +86,14 @@
private static final String NODE_URI_FILE = uri-file;
private static final String NODE_CHECKSUMS_URI = checksums-uri;
+// context-dir is needed by ant task
+public static final String ATTR_CONTEXT_DIR = context-dir;
+private static final String ATTR_DEST_DIR = dest-dir;
+private static final String ATTR_WORK_DIR = work-dir;
+private static final String ATTR_CONFIG_FILE = config-file;
+private static final String ATTR_URI_FILE = uri-file;
+private static final String ATTR_CHECKSUMS_URI = checksums-uri;
+
private static final String NODE_BROKEN_LINKS = broken-links;
private static final String ATTR_BROKEN_LINK_REPORT_TYPE = type;
private static final String ATTR_BROKEN_LINK_REPORT_FILE = file;
@@ -117,7 +125,8 @@
private static final String NODE_URIS = uris;
private static final String ATTR_NAME = name;
-public static String configure(Document xconf, CocoonBean cocoon, String
destDir, String uriGroup, OutputStreamListener listener) {
+public static String configure(Document xconf, CocoonBean cocoon, String
destDir, String uriGroup, OutputStreamListener listener)
+throws IllegalArgumentException {
Node root = xconf.getDocumentElement();
if (!NODE_ROOT.equals(root.getNodeName())) {
@@ -136,10 +145,30 @@
if (hasAttribute(root, ATTR_CONFIRM_EXTENSIONS)) {
cocoon.setConfirmExtensions(getBooleanAttributeValue(root,
ATTR_CONFIRM_EXTENSIONS));
}
+if (hasAttribute(root, ATTR_CONTEXT_DIR)) {
+cocoon.setContextDir(getAttributeValue(root, ATTR_CONTEXT_DIR));
+}
+if (hasAttribute(root, ATTR_DEST_DIR)) {
+destDir = getAttributeValue(root, ATTR_CONFIRM_EXTENSIONS);
+}
+if (hasAttribute(root, ATTR_WORK_DIR)) {
+cocoon.setWorkDir(getAttributeValue(root, ATTR_WORK_DIR));
+}
+if (hasAttribute(root, ATTR_CONFIG_FILE)) {
+cocoon.setWorkDir(getAttributeValue(root, ATTR_WORK_DIR));
+}
+if (hasAttribute(root, ATTR_URI_FILE)) {
+cocoon.addTargets(processURIFile(getAttributeValue(root,
ATTR_URI_FILE)), destDir);
+}
+if (hasAttribute(root, ATTR_CHECKSUMS_URI)) {
+cocoon.setChecksumURI(getAttributeValue(root,
ATTR_CHECKSUMS_URI));
+}
+
+
if (destDir == null || destDir.length() == 0) {
destDir = getNodeValue(root, NODE_DEST_DIR);
}
-
+
NodeList nodes = root.getChildNodes();
for (int i = 0; i nodes.getLength(); i++) {
Node node = nodes.item(i);
@@ -155,27 +184,43 @@
parseLoggingNode(cocoon, node);
} else if (nodeName.equals(NODE_CONTEXT_DIR)) {
-cocoon.setContextDir(getNodeValue(node));
+if (hasAttribute(root, ATTR_CONTEXT_DIR)) {
+throw new IllegalArgumentException(Cannot have
+NODE_CONTEXT_DIR+ as both element and attribute);
+} else {
+cocoon.setContextDir(getNodeValue(node));
+}
} else if (nodeName.equals(NODE_CONFIG_FILE)) {
-cocoon.setConfigFile(getNodeValue(node));
-
+if (hasAttribute(root, ATTR_CONFIG_FILE)) {
+throw new IllegalArgumentException(Cannot have
+NODE_CONFIG_FILE+ as both element and attribute);
+} else {
+cocoon.setConfigFile(getNodeValue(node));
+}
} else if (nodeName.equals(NODE_DEST_DIR)) {
// Ignore
} else if (nodeName.equals(NODE_WORK_DIR)) {
-cocoon.setWorkDir(getNodeValue(node));
-
+if (hasAttribute(root, ATTR_WORK_DIR)) {
+throw new
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers AntDelegate.java BeanConfigurator.java
upayavira2003/10/13 05:08:10
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean CocoonBean.java
src/java/org/apache/cocoon/bean/helpers
BeanConfigurator.java
Added: src/java/org/apache/cocoon CocoonTask.java
src/java/org/apache/cocoon/bean/helpers AntDelegate.java
Log:
Added a simple Ant task (derived from the Ant Java and ExecuteJava classes),
with significant help from Dominique Devienne
Revision ChangesPath
1.23 +3 -15 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Main.java 10 Oct 2003 14:11:50 - 1.22
+++ Main.java 13 Oct 2003 12:08:10 - 1.23
@@ -344,7 +344,7 @@
cocoon.addTargets(line.getArgList(), destDir);
-System.out.println(getProlog());
+listener.messageGenerated(CocoonBean.getProlog());
cocoon.initialize();
cocoon.process();
@@ -373,18 +373,6 @@
}
}
-/**
- * Print a description of the software before running
- */
-private static String getProlog() {
-String lSep = System.getProperty(line.separator);
-StringBuffer msg = new StringBuffer();
-
msg.append(
).append(lSep);
-msg.append(Constants.NAME).append(
).append(Constants.VERSION).append(lSep);
-msg.append(Copyright (c) ).append(Constants.YEAR).append( Apache
Software Foundation. All rights reserved.).append(lSep);
-
msg.append(
).append(lSep).append(lSep);
-return msg.toString();
-}
/**
* Print the usage message and exit
@@ -393,7 +381,7 @@
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp(cocoon cli [options] [targets],
-getProlog().toString(),
+CocoonBean.getProlog(),
options,
Note: the context directory defaults to '+
Constants.DEFAULT_CONTEXT_DIR + ');
System.exit(0);
1.1 cocoon-2.1/src/java/org/apache/cocoon/CocoonTask.java
Index: CocoonTask.java
===
/*
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
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java
upayavira2003/10/17 07:08:30
Modified:src/java/org/apache/cocoon/bean CocoonBean.java
Log:
Fixing problem where checksum-uri node not present causes failure
Revision ChangesPath
1.37 +7 -3
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- CocoonBean.java 13 Oct 2003 12:08:10 - 1.36
+++ CocoonBean.java 17 Oct 2003 14:08:29 - 1.37
@@ -368,7 +368,9 @@
this.initialize();
}
-readChecksumFile();
+if (this.checksumsURI != null) {
+readChecksumFile();
+}
if (crawler.getRemainingCount()==0) {
super.precompile();
@@ -384,7 +386,9 @@
}
}
-writeChecksumFile();
+if (this.checksumsURI != null) {
+writeChecksumFile();
+}
if (log.isInfoEnabled()) {
log.info(
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean Target.java
upayavira2003/10/17 07:22:15 Modified:src/java/org/apache/cocoon/bean Target.java Log: Fixing default-filename handling, Target wasn't passing on default filename to derived targets, thanks to Rolf Kulemann for reporting Revision ChangesPath 1.8 +2 -1 cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java Index: Target.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Target.java 19 Sep 2003 09:09:43 - 1.7 +++ Target.java 17 Oct 2003 14:22:15 - 1.8 @@ -147,6 +147,7 @@ target.setParentURI(this.sourceURI); target.setConfirmExtension(this.confirmExtension); target.setFollowLinks(this.followLinks); +target.setDefaultFilename(this.defaultFilename); target.setLogger(this.logger); return target; }
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/sitemap LinkTranslator.java
upayavira2003/10/21 14:48:32
Modified:src/java/org/apache/cocoon/bean CocoonBean.java
src/java/org/apache/cocoon/bean/helpers Crawler.java
src/java/org/apache/cocoon/sitemap LinkTranslator.java
Log:
Fixing broken link translation - LinkTranslator was set to be cachable, which
meant that links were translated with getType(), translations worked out, and
then getPage() got the cached version back which was created before the
translation had been done.
Also fixed a problem with the allTranslatedLinks map where already translated
links weren't accessed correctly.
Revision ChangesPath
1.38 +5 -1
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- CocoonBean.java 17 Oct 2003 14:08:29 - 1.37
+++ CocoonBean.java 21 Oct 2003 21:48:32 - 1.38
@@ -497,6 +497,10 @@
}
}
}
+} else {
+String originalURI = linkTarget.getOriginalSourceURI();
+linkTarget = crawler.getTranslatedLink(linkTarget);
+linkTarget.setOriginalURI(originalURI);
}
translatedLinks.put(linkTarget.getOriginalSourceURI(),
linkTarget.getTranslatedURI(target.getPath()));
1.3 +7 -2
cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/Crawler.java
Index: Crawler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/Crawler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Crawler.java 9 Oct 2003 17:37:32 - 1.2
+++ Crawler.java 21 Oct 2003 21:48:32 - 1.3
@@ -107,12 +107,17 @@
}
public void addTranslatedLink(Target target) throws ProcessingException {
-allTranslatedLinks.put(target.getSourceURI(),
target.getDestinationURI());
+allTranslatedLinks.put(target.getSourceURI(), target);
}
public boolean hasTranslatedLink(Target link) {
return allTranslatedLinks.get(link.getSourceURI())!=null;
}
+
+public Target getTranslatedLink(Target link) {
+return (Target) allTranslatedLinks.get(link.getSourceURI());
+}
+
/**
* Returns an iterator for reading targets
*/
1.4 +2 -22
cocoon-2.1/src/java/org/apache/cocoon/sitemap/LinkTranslator.java
Index: LinkTranslator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/LinkTranslator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LinkTranslator.java 5 Sep 2003 11:40:41 - 1.3
+++ LinkTranslator.java 21 Oct 2003 21:48:32 - 1.4
@@ -70,7 +70,7 @@
* @author a href=mailto:[EMAIL PROTECTED]Stefano Mazzocchi/a
* @version CVS $Id$
*/
-public class LinkTranslator extends ExtendedXLinkPipe implements
Transformer, CacheableProcessingComponent {
+public class LinkTranslator extends ExtendedXLinkPipe implements Transformer
{
private Map links;
@@ -81,26 +81,6 @@
public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters par)
throws ProcessingException, SAXException, IOException {
this.links = (Map)objectModel.get(Constants.LINK_OBJECT);
-}
-
-/**
- * Generate the unique key.
- * This key must be unique inside the space of this component.
- *
- * @return The generated key hashes the src
- */
-public java.io.Serializable getKey() {
-return 1;
-}
-
-/**
- * Generate the validity object.
- *
- * @return The generated validity object or codenull/code if the
- * component is currently not cacheable.
- */
-public SourceValidity getValidity() {
-return NOPValidity.SHARED_INSTANCE;
}
public void simpleLink(String href, String role, String arcrole,
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonWrapper.java
upayavira2003/11/07 03:31:17 Modified:src/java/org/apache/cocoon/bean CocoonWrapper.java Log: Hack to get CLI working again. This needs handling better, but I don't understand right now whether a configurable default encoding is relevant to CLI built sites. Revision ChangesPath 1.9 +3 -2 cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonWrapper.java Index: CocoonWrapper.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonWrapper.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- CocoonWrapper.java19 Sep 2003 10:10:12 - 1.8 +++ CocoonWrapper.java7 Nov 2003 11:31:17 - 1.9 @@ -175,7 +175,8 @@ File cacheDir = getDir(workDir + File.separator + cache-dir, cache); appContext.put(Constants.CONTEXT_CACHE_DIR, cacheDir); appContext.put(Constants.CONTEXT_CONFIG_URL, conf.toURL()); - +appContext.put(Constants.CONTEXT_DEFAULT_ENCODING, ISO-8859-1); + loadClasses(classList); cocoon = new Cocoon();
cvs commit: cocoon-2.1 cli.xconf
upayavira2003/11/07 07:01:54 Modified:.cli.xconf Log: Improving docs, explaining some newer options Revision ChangesPath 1.8 +71 -16cocoon-2.1/cli.xconf Index: cli.xconf === RCS file: /home/cvs/cocoon-2.1/cli.xconf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cli.xconf 26 Sep 2003 17:08:08 - 1.7 +++ cli.xconf 7 Nov 2003 15:01:54 - 1.8 @@ -1,5 +1,4 @@ ?xml version=1.0? - !--+ | This is the Apache Cocoon command line configuration file. | Here you give the command line interface details of where @@ -59,6 +58,15 @@ config-fileWEB-INF/cocoon.xconf/config-file work-dirbuild/work/work-dir dest-dirbuild/dest/dest-dir + + !--+ + | A checksum file can be used to store checksums for pages + | as they are generated. When the site is next generated, + | files will not be written if their checksum has not changes. + | This means that it will be easier to detect which files + | need to be uploaded to a server, using the timestamp. + +-- + !-- checksums-uribuild/work/checksums/checksums-uri-- !--+ | Broken link reporting options: @@ -122,21 +130,48 @@ !--+ | Specifies a user agent string to the sitemap when | generating the site. + | + | A generic term for a web browser is user agent. Any + | user agent, when connecting to a web server, will provide + | a string to identify itself (e.g. as Internet Explorer or + | Mozilla). It is possible to have Cocoon serve different + | content depending upon the user agent string provided by + | the browser. If your site does this, then you may want to + | use this user-agent entry to provide a 'fake' user agent + | to Cocoon, so that it generates the correct version of your + | site. + | + | For most sites, this can be ignored. +-- !-- - user-agentxxx/user-agent + user-agentCocoon Command Line Environment 2.1/user-agent -- !--+ | Specifies an accept string to the sitemap when generating | the site. + | User agents can specify to an HTTP server what types of content + | (by mime-type) they are able to receive. E.g. a browser may be + | able to handle jpegs, but not pngs. The HTTP accept header + | allows the server to take the browser's capabilities into account, + | and only send back content that it can handle. + | + | For most sites, this can be ignored. +-- + accept*/*/accept !--+ | Specifies which URIs should be included or excluded, according | to wildcard patterns. | + | These includes/excludes are only relevant when you are following + | links. A link URI must match an include pattern (if one is given) + | and not match an exclude pattern, if it is to be followed by + | Cocoon. It can be useful, for example, where there are links in + | your site to pages that are not generated by Cocoon, such as + | references to api-documentation. + | | By default, all URIs are included. If both include and exclude | patterns are specified, a URI is first checked against the | include patterns, and then against the exclude patterns. @@ -152,44 +187,66 @@ | and regexp matching. If you have requirements for these, contact | [EMAIL PROTECTED] +-- + include pattern=**/ exclude pattern=docs/apidocs/**/ -!-- include-links extension=.html/-- + !-- include-links extension=.html/-- !--+ | uri nodes specify the URIs that should be generated, and | where required, what should be done with the generated pages. + | They describe the way the URI of the generated file is created + | from the source page's URI. There are three ways that a generated + | file URI can be created: append, replace and insert. | - | Append: append the generated page's URI to the end of the + + + | + | APPEND: append the generated page's URI to the end of the | source URI: | | uri type=append src-prefix=documents/ src=index.html | dest=build/dest// | - | Replace: Completely ignore the generated page's URI - just + | This means that + | (1) the documents/index.html page is generated + | (2) the file will be written to build/dest/documents/index.html
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/environment/commandline CommandLineRequest.java
upayavira2003/12/21 14:48:56
Modified:src/java/org/apache/cocoon/environment/commandline
CommandLineRequest.java
Log:
Fixing null pointer exception happening when HTMLGenerator is used within CLI
Revision ChangesPath
1.6 +3 -1
cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
Index: CommandLineRequest.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CommandLineRequest.java 16 Nov 2003 00:52:08 - 1.5
+++ CommandLineRequest.java 21 Dec 2003 22:48:56 - 1.6
@@ -184,6 +184,8 @@
final Object value = this.parameters.get(name);
if (value instanceof String) {
return (String)value;
+} else if (value == null) {
+return null;
} else {
final String[] values = (String[]) value;
if (values.length == 0) {
cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/offline configuration.xml ant.xml cli.xml index.xml
upayavira2003/12/30 13:51:52
Modified:src/documentation/xdocs/userdocs/offline ant.xml cli.xml
index.xml
Added: src/documentation/xdocs/userdocs/offline configuration.xml
Log:
Docs for the Cocoon Ant task, and related changes
Revision ChangesPath
1.4 +57 -21
cocoon-2.1/src/documentation/xdocs/userdocs/offline/ant.xml
Index: ant.xml
===
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/offline/ant.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant.xml 12 Oct 2003 13:04:49 - 1.3
+++ ant.xml 30 Dec 2003 21:51:52 - 1.4
@@ -4,7 +4,7 @@
document
header
titleOffline Page Generation with Apache Ant/title
- version0.9/version
+ version1.0/version
typeTechnical document/type
authorsperson name=Upayavira email=[EMAIL PROTECTED]/
/authors
@@ -12,33 +12,69 @@
/header
body
s1 title=Overview
- pApache Ant can be used to start Cocoon in its Offline mode.
Whilst a specific
- Cocoon Ant task is planned, at present it can be invoked by
starting the
- command line interface using a standard Java task.
+ pApache Ant can be used to start Cocoon in its Offline mode.
A specific Ant
+task is available, allowing the user to embed the Cocoon
configuration
+information into Ant's build script.
/p
/s1
+ s1 title=Configuring the Ant task
+pThe main configuration for the task is to specify a
codecocoon.context/code property which points to the
+ Cocoon webapp from which the pages or site are to be
generated./p
+pFrom this property, a classpath can be created. By default, this
should point to codeWEB-INF/classes/code
+ and all jar files in codeWEB-INF/lib/code. Futher classpaths
can be added if they are needed./p
+pThe taskdef requires this classpath in order to invoke the Ant
task, and the task itself needs the classpath in
+ order to invoke Cocoon./p
+pBeyond these configurations, the rest are the same as is used by
the link href=cli.htmlCommand Line interface/link,
+ and is detailed on the link
href=configuration.htmlconfiguration/link page./p
+ /s1
s1 title=Sample Ant Task
- pA sample Ant task would be as follows:/p
+ pA sample ant build file is shown below. This sample shows only
that which is required to configure the
+ Ant task. For further details of configuring Cocoon, see the link
href=configuration.htmlconfiguration/link
+ page./p
source
![CDATA[
-java classname=org.apache.cocoon.Main fork=true
-dir=${build.context}
- failonerror=true maxmemory=128m
- arg value=-xcli.xconf/
- arg value=index.html/
- classpath
-path refid=classpath/
-fileset dir=${build.dir}
- include name=*.jar/
-/fileset
-pathelement location=${tools.jar}/
-pathelement location=${build.context}/WEB-INF/classes/
- /classpath
-/java
+?xml version=1.0?
+project default=cocoon basedir=.
+
+property name=cocoon.context value=../cocoon/build/webapp/
+path id=cocoon.classpath
+ dirset dir=${cocoon.context}/WEB-INF/classes/
+ fileset dir=${cocoon.context}/WEB-INF/lib includes=*.jar/
+/path
+
+taskdef name=cocoon classname=org.apache.cocoon.CocoonTask
classpathref=cocoon.classpath/
+
+target name=cocoon
+cocoon verbose=true
+classpathref=cocoon.classpath
+follow-links=true
+precompile-only=false
+confirm-extensions=false
+context-dir=${cocoon.context}
+config-file=WEB-INF/cocoon.xconf
+work-dir=build/work
+dest-dir=build/dest
+default-filename=index.html
+accept=*/*
+
+ broken-links type=xml
+ file=brokenlinks.xml
+ generate=false
+ extension=.error/
+
+ logging log-kit=${cocoon.context}/WEB-INF/logkit.xconf
logger=cli level=DEBUG /
+
+ uris name=site follow-links=true
+ uri type=append
+src-prefix=
+src=index.html
+dest=${cocoon.context}/build/dest//
+ /uris
+/cocoon
+/target
+/project
]]/source
- pThis makes use of the Cocoon Command Line Interface's xconf
configuration file. See
- link href=cli.htmlcommand line/link page
cvs commit: cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/components/source/impl XMLDBSource.java
upayavira2004/01/13 04:47:20
Modified:src/blocks/xmldb/java/org/apache/cocoon/components/source/impl
XMLDBSource.java
Log:
Setting URL of source when a new document is added to a collection
Revision ChangesPath
1.10 +2 -1
cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/components/source/impl/XMLDBSource.java
Index: XMLDBSource.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/components/source/impl/XMLDBSource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLDBSource.java 13 Jan 2004 08:44:05 - 1.9
+++ XMLDBSource.java 13 Jan 2004 12:47:20 - 1.10
@@ -519,6 +519,7 @@
if (name.equals()) {
name = collection.createId();
+this.url += name;
}
Resource resource = collection.createResource(name,
XMLResource);
cvs commit: cocoon-2.1/src/blocks/woody/samples/resources woody-field-styling.xsl
upayavira2004/01/15 14:03:05
Modified:src/blocks/woody/samples/resources woody-field-styling.xsl
Log:
Fixing submit-on-change for radio buttons
Revision ChangesPath
1.29 +2 -1
cocoon-2.1/src/blocks/woody/samples/resources/woody-field-styling.xsl
Index: woody-field-styling.xsl
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/woody-field-styling.xsl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- woody-field-styling.xsl 29 Dec 2003 15:43:58 - 1.28
+++ woody-field-styling.xsl 15 Jan 2004 22:03:05 - 1.29
@@ -101,6 +101,7 @@
xsl:when test=$vertical
table cellpadding=0 cellspacing=0 border=0 title={wi:hint}
xsl:variable name=id select=@id/
+ xsl:variable name=on-change
select=wi:styling/@submit-on-change/
xsl:for-each select=wi:selection-list/wi:item
tr
td
@@ -108,7 +109,7 @@
xsl:if test=@value = $value
xsl:attribute name=checkedchecked/xsl:attribute
/xsl:if
- xsl:if test=wi:styling/@submit-on-change='true'
+ xsl:if test=$on-change='true'
xsl:attribute
name=onchangewoody_submitForm(this)/xsl:attribute
/xsl:if
/input
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/reading ImageReader.java
upayavira2004/02/24 04:44:56
Modified:src/java/org/apache/cocoon/reading ImageReader.java
Log:
Fixing bug no 27184, thanks to Jean-Baptiste Quenot
Revision ChangesPath
1.5 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/reading/ImageReader.java
Index: ImageReader.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/reading/ImageReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ImageReader.java 12 Dec 2003 09:41:33 - 1.4
+++ ImageReader.java 24 Feb 2004 12:44:56 - 1.5
@@ -147,7 +147,7 @@
}
if (!enlarge) {
-if ((nw ow nh = 0) || (oh nh nw =0)) {
+if ((nw ow nh = 0) || (nh oh nw =0)) {
wm = 1.0d;
hm = 1.0d;
} else if (nw ow) {
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor - New directory
upayavira2004/04/02 12:02:04 cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor - New directory
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables - New directory
upayavira2004/04/02 12:02:13 cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables - New directory
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables PreparedVariableResolverTestCase.java PreparedVariableResolverTestCase.xtest
upayavira2004/04/02 12:22:07
Modified:src/java/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolver.java
.status.xml
Added: src/test/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolverTestCase.java
PreparedVariableResolverTestCase.xtest
Log:
Rewrote PreparedVariableResolver to allow for nested sitemap variables.
Revision ChangesPath
1.4 +318 -225
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PreparedVariableResolver.java 5 Mar 2004 13:02:53 - 1.3
+++ PreparedVariableResolver.java 2 Apr 2004 20:22:07 - 1.4
@@ -26,116 +26,122 @@
import org.apache.cocoon.sitemap.PatternException;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Stack;
/**
* Prepared implementation of [EMAIL PROTECTED] VariableResolver} for fast
evaluation.
*
- * @author a href=mailto:[EMAIL PROTECTED]Sylvain Wallez/a
- * @author a href=mailto:[EMAIL PROTECTED]Torsten Curdt/a
+ * @author a href=mailto:[EMAIL PROTECTED]Upayavira/a
* @version CVS $Id$
*/
final public class PreparedVariableResolver extends VariableResolver
implements Disposable {
private ComponentManager manager;
private ComponentSelector selector;
+private List tokens;
+private boolean needsMapStack;
-final private List items = new ArrayList();
-
-// Special constants used for levels
-// ROOT and ANCHOR are placed first as they need a context to be
resolved (see resolve())
-static final int ROOT = 0;
-static final int ANCHOR = -1;
-static final int LITERAL = -2;
-static final int THREADSAFE_MODULE = -3;
-static final int STATEFUL_MODULE = -4;
-
-private static final Integer ROOT_OBJ = new Integer(ROOT);
-private static final Integer LITERAL_OBJ = new Integer(LITERAL);
-private static final Integer THREADSAFE_MODULE_OBJ = new
Integer(THREADSAFE_MODULE);
-private static final Integer STATEFUL_MODULE_OBJ = new
Integer(STATEFUL_MODULE);
-private static final Integer ANCHOR_OBJ = new Integer(ANCHOR);
+private static final int OPEN = -2;
+private static final int CLOSE = -3;
+private static final int COLON = -4;
+private static final int TEXT = -5;
+private static final int EVAL = -6;
+private static final int EXPR = -7;
+private static final int SITEMAP_VAR = -8;
+private static final int PREFIXED_SITEMAP_VAR = -9;
+private static final int THREADSAFE_MODULE = -10;
+private static final int STATEFUL_MODULE = -11;
+private static final int ROOT_SITEMAP_VARIABLE = 0;
+private static final int ANCHOR_VAR = -1;
+private static Token COLON_TOKEN = new Token(COLON);
+private static Token OPEN_TOKEN = new Token(OPEN);
+private static Token CLOSE_TOKEN = new Token(CLOSE);
+
+// @TODO Allow escaping braces.
+
public PreparedVariableResolver(String expr, ComponentManager manager)
throws PatternException {
super(expr);
this.manager = manager;
+this.selector = null;
-
-int length = expr.length();
-int prev = 0; // position after last closing brace
-
-compile : while(prev length) {
-// find next unescaped '{'
-int pos = prev;
-while(pos length
- (pos = expr.indexOf('{', pos)) != -1
- (pos != 0 expr.charAt(pos - 1) == '\\')) {
-pos++;
-}
-
-if (pos = length || pos == -1) {
-// no more braces : add ending literal
-if (prev length) {
-addLiteral(expr.substring(prev));
+int openCount = 0;
+int closeCount = 0;
+
+needsMapStack = false;
+
+tokens = new ArrayList();
+int pos=0;
+int i;
+for (i=0;i expr.length();i++) {
+char c = expr.charAt(i);
+if (c=='{' || c=='}' || c==':') {
+if (i pos) {
+tokens.add(new Token(expr.substring(pos, i)));
}
-break compile;
-}
-
-// Pass closing brace
-pos++;
-
-// Add litteral strings
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables PreparedVariableResolverTestCase.java
upayavira2004/04/03 12:41:26
Modified:src/java/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolver.java
src/test/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolverTestCase.java
Log:
Fixing colon outside of module reference, and enabling escaping of braces
Revision ChangesPath
1.5 +70 -38
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PreparedVariableResolver.java 2 Apr 2004 20:22:07 - 1.4
+++ PreparedVariableResolver.java 3 Apr 2004 20:41:26 - 1.5
@@ -77,51 +77,83 @@
tokens = new ArrayList();
int pos=0;
int i;
+boolean escape = false;
for (i=0;i expr.length();i++) {
char c = expr.charAt(i);
-if (c=='{' || c=='}' || c==':') {
+if (escape) {
+escape = false;
+} else if (c=='\\' i expr.length()) {
+char nextChar = expr.charAt(i+1);
+if (nextChar == '{' || nextChar == '}') {
+expr = expr.substring(0, i) + expr.substring(i+1);
+escape = true;
+i--;
+}
+} else if (c=='{') {
if (i pos) {
tokens.add(new Token(expr.substring(pos, i)));
}
-if (c=='{') {
-openCount++;
-tokens.add(OPEN_TOKEN);
-int colonPos = indexOf(expr, :, i);
-int closePos = indexOf(expr, }, i);
-int openPos = indexOf(expr, {, i);
-if (openPos colonPos openPos closePos) {
-throw new PatternException(Invalid '{' at position
+ i + in expression + expr);
-} else if (colonPos closePos) {
-// we've found a module
-Token token;
-String module = expr.substring(i+1, colonPos);
-
-if (module.equals(sitemap)) {
-// Explicit prefix for sitemap variable
-needsMapStack = true;
-token = new Token(PREFIXED_SITEMAP_VAR);
-} else if (module.startsWith(#)) {
-// anchor syntax refering to a name result level
-needsMapStack = true;
-token = new Token(ANCHOR_VAR,
module.substring(1));
-} else {
-// Module used
-token = getNewModuleToken(module);
-}
-tokens.add(token);
-i = colonPos-1;
-} else {
-// Unprefixed name : sitemap variable
+openCount++;
+tokens.add(OPEN_TOKEN);
+int colonPos = indexOf(expr, :, i);
+int closePos = indexOf(expr, }, i);
+int openPos = indexOf(expr, {, i);
+if (openPos colonPos openPos closePos) {
+throw new PatternException(Invalid '{' at position + i
+ in expression + expr);
+} else if (colonPos closePos) {
+// we've found a module
+Token token;
+String module = expr.substring(i+1, colonPos);
+
+if (module.equals(sitemap)) {
+// Explicit prefix for sitemap variable
needsMapStack = true;
-tokens.add(getNewSitemapToken(expr.substring(i+1,
closePos)));
-i = closePos-1;
+token = new Token(PREFIXED_SITEMAP_VAR);
+} else if (module.startsWith(#)) {
+// anchor syntax refering to a name result level
+needsMapStack = true;
+token = new Token(ANCHOR_VAR, module.substring(1));
+} else {
+// Module used
+token = getNewModuleToken(module);
+}
+tokens.add(token);
+i = colonPos-1;
+} else
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables PreparedVariableResolver.java
upayavira2004/04/03 12:57:08
Modified:src/java/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolver.java
Log:
Removing unnecessary @TODO
Revision ChangesPath
1.6 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PreparedVariableResolver.java 3 Apr 2004 20:41:26 - 1.5
+++ PreparedVariableResolver.java 3 Apr 2004 20:57:08 - 1.6
@@ -61,8 +61,6 @@
private static Token OPEN_TOKEN = new Token(OPEN);
private static Token CLOSE_TOKEN = new Token(CLOSE);
-// @TODO Allow escaping braces.
-
public PreparedVariableResolver(String expr, ComponentManager manager)
throws PatternException {
super(expr);
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables PreparedVariableResolverTestCase.java
upayavira2004/04/03 22:38:16
Modified:src/java/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolver.java
src/test/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolverTestCase.java
Log:
Another test case, and another fix.
Revision ChangesPath
1.7 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PreparedVariableResolver.java 3 Apr 2004 20:57:08 - 1.6
+++ PreparedVariableResolver.java 4 Apr 2004 06:38:16 - 1.7
@@ -144,7 +144,7 @@
continue;
}
}
-if (i != pos) {
+if (i != pos || tokens.size()==0) {
// this colon isn't part of a module reference
continue;
}
1.3 +15 -1
cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
Index: PreparedVariableResolverTestCase.java
===
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreparedVariableResolverTestCase.java 3 Apr 2004 20:41:26 -
1.2
+++ PreparedVariableResolverTestCase.java 4 Apr 2004 06:38:16 -
1.3
@@ -173,6 +173,20 @@
assertEquals(http://cocoon.apache.org;, resolver.resolve(context,
getObjectModel()));
}
+public void testColonBeginningTextContent() throws PatternException {
+String expr = :colon-starts-this;
+
+InvokeContext context = new InvokeContext(true);
+context.enableLogging(new LogKitLogger(getLogger()));
+
+Map sitemapElements;
+sitemapElements = new HashMap();
+context.pushMap(label, sitemapElements);
+
+PreparedVariableResolver resolver = new
PreparedVariableResolver(expr, manager);
+assertEquals(:colon-starts-this, resolver.resolve(context,
getObjectModel()));
+}
+
public void testEscapedBraces() throws PatternException {
String expr = This is a \\{brace\\};
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables PreparedVariableResolverTestCase.java
upayavira2004/04/14 02:39:45
Modified:src/java/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolver.java
src/test/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolverTestCase.java
Log:
Fixing case were a colon occurs as a single text character, not a token, e.g:
{1}:{1}
As reported by Christian Mayrhuber on user list
Revision ChangesPath
1.8 +3 -12
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PreparedVariableResolver.java 4 Apr 2004 06:38:16 - 1.7
+++ PreparedVariableResolver.java 14 Apr 2004 09:39:45 - 1.8
@@ -418,17 +418,8 @@
}
public Token(String value) {
-this.value = null;
-if (value.equals({)) {
-this.type = OPEN;
-} else if (value.equals(})) {
-this.type = CLOSE;
-} else if (value.equals(:)) {
-this.type = COLON;
-} else {
-this.type = TEXT;
-this.value = value;
-}
+this.type = TEXT;
+this.value = value;
}
public int getType() {
1.4 +17 -1
cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
Index: PreparedVariableResolverTestCase.java
===
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PreparedVariableResolverTestCase.java 4 Apr 2004 06:38:16 -
1.3
+++ PreparedVariableResolverTestCase.java 14 Apr 2004 09:39:45 -
1.4
@@ -187,6 +187,21 @@
assertEquals(:colon-starts-this, resolver.resolve(context,
getObjectModel()));
}
+public void testEmbeddedColon() throws PatternException {
+String expr = {1}:{1};
+
+InvokeContext context = new InvokeContext(true);
+context.enableLogging(new LogKitLogger(getLogger()));
+
+Map sitemapElements;
+sitemapElements = new HashMap();
+sitemapElements.put(1, abc);
+context.pushMap(label, sitemapElements);
+
+PreparedVariableResolver resolver = new
PreparedVariableResolver(expr, manager);
+assertEquals(abc:abc, resolver.resolve(context, getObjectModel()));
+}
+
public void testEscapedBraces() throws PatternException {
String expr = This is a \\{brace\\};
@@ -200,4 +215,5 @@
PreparedVariableResolver resolver = new
PreparedVariableResolver(expr, manager);
assertEquals(This is a {brace}, resolver.resolve(context,
getObjectModel()));
}
+
}
cvs commit: cocoon-2.1/src/webapp/samples/simpleform samples.xml
upayavira2004/04/28 14:01:23 Modified:src/webapp/samples/simpleform samples.xml Log: Changing reference to Form handling frameworks Revision ChangesPath 1.4 +3 -3 cocoon-2.1/src/webapp/samples/simpleform/samples.xml Index: samples.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/simpleform/samples.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- samples.xml 5 Apr 2004 12:34:23 - 1.3 +++ samples.xml 28 Apr 2004 21:01:23 - 1.4 @@ -32,8 +32,8 @@ /note note Apache Cocoon contains several approaches to forms. The one demonstrated - here is probably the simplest but also the weakest. Please do consider - the others as well: JXForms and Woody. + here is probably the simplest but also the weakest. Please also consider + Cocoon Forms in the Forms block. /note sample name=Logicsheet href=one/index On a XSP two logicsheets are used to redisplay submitted data and
cvs commit: cocoon-2.1/src/webapp/test-suite - New directory
upayavira2004/04/28 14:05:18 cocoon-2.1/src/webapp/test-suite - New directory
cvs commit: cocoon-2.1/src/webapp/test-suite/xdocs - New directory
upayavira2004/04/28 14:05:25 cocoon-2.1/src/webapp/test-suite/xdocs - New directory
cvs commit: cocoon-2.1/src/webapp/test-suite/xdocs index.xml
upayavira2004/04/28 14:29:08
Modified:.build.properties
tools/targets webapp-build.xml
Added: src/webapp/test-suite sitemap.xmap
src/webapp/test-suite/stylesheets simple-xdoc2html.xslt
src/webapp/test-suite/xdocs index.xml
Log:
Adding a very simple 'test-suite' webapp, for use in automated testing.
Will be used in an up-coming CocoonBeanTestCase.
Revision ChangesPath
1.37 +3 -0 cocoon-2.1/build.properties
Index: build.properties
===
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.properties 8 Mar 2004 06:07:14 - 1.36
+++ build.properties 28 Apr 2004 21:29:08 - 1.37
@@ -26,6 +26,7 @@
#exclude.webapp.documentation=true
#exclude.webapp.javadocs=true
#exclude.webapp.samples=true
+#exclude.webapp.test-suite=true
# Build Exclusions
@@ -92,6 +93,7 @@
build.webapp.classes=${build.webapp.webinf}/classes
build.webapp.lib=${build.webapp.webinf}/lib
build.webapp.samples=${build.webapp}/samples
+build.webapp.test-suite=${build.webapp}/test-suite
build.webapp.docs=${build.webapp}/docs
build.webapp.javadocs=${build.webapp}/api/java
build.webapp.loglevel=INFO
@@ -136,6 +138,7 @@
samples=${src}/samples
webapp=${src}/webapp
webapp.samples=${webapp}/samples
+webapp.test-suite=${webapp}/test-suite
customconf=${src}/confpatch
# Deprecated Stuff
1.15 +8 -1 cocoon-2.1/tools/targets/webapp-build.xml
Index: webapp-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/targets/webapp-build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- webapp-build.xml 2 Apr 2004 19:07:49 - 1.14
+++ webapp-build.xml 28 Apr 2004 21:29:08 - 1.15
@@ -92,6 +92,13 @@
target name=prepare-webapp-samples depends=prepare-webapp, samples,
block-samples unless=internal.exclude.webapp.samples/
+ target name=prepare-webapp-test-suite depends=prepare-webapp
unless=internal.exclude.webapp.test-suite
+!-- copy test suite files --
+copy todir=${build.webapp.test-suite}
+ fileset dir=${webapp.test-suite}/
+/copy
+ /target
+
target name=prepare-webapp-deprecated depends=prepare-webapp
unless=internal.exclude.deprecated
copy file=${build}/${name}-deprecated.jar
tofile=${build.webapp.lib}/${name}-${version}-deprecated.jar/
xpatch file=${build.webapp}/WEB-INF/cocoon.xconf
@@ -152,7 +159,7 @@
includes=**/*.xwelcome/
/target
- target name=webapp
depends=prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf
description=Builds web application folder
+ target name=webapp
depends=prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-test-suite,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf
description=Builds web application folder
/target
target name=war depends=webapp description=Builds web application
archive
1.1 cocoon-2.1/src/webapp/test-suite/sitemap.xmap
Index: sitemap.xmap
===
?xml version=1.0 encoding=UTF-8?
!--
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.
--
!-- CVS $Id: sitemap.xmap,v 1.1 2004/04/28 21:29:08 upayavira Exp $ --
map:sitemap xmlns:map=http://apache.org/cocoon/sitemap/1.0;
!-- === Components
--
map:components
map:generators default=file/
map:transformers default=xslt/
map:readers default=resource/
map:serializers default=html/
map:matchers default=wildcard/
map:selectors default=browser/
/map:components
!-- === Views === --
map:views
map:view name=content from-label=content
map:serialize type=xml/
/map:view
map:view from-label=content name=pretty-content
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/bean - New directory
upayavira2004/04/30 05:54:09 cocoon-2.1/src/test/org/apache/cocoon/bean - New directory
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/bean CocoonBeanTestCase.java
upayavira2004/04/30 05:55:55
Modified:src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/bean CocoonBean.java
src/java/org/apache/cocoon/bean/helpers AntDelegate.java
Added: src/test/org/apache/cocoon/bean CocoonBeanTestCase.java
Log:
Adding a simple (to be extended CocoonBeanTestCase.
First test: the processURI(uri, outputStream) method.
Fixes to actually make the processURI method work
Revision ChangesPath
1.26 +6 -1 cocoon-2.1/src/java/org/apache/cocoon/Main.java
Index: Main.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Main.java 28 Mar 2004 20:51:24 - 1.25
+++ Main.java 30 Apr 2004 12:55:55 - 1.26
@@ -312,6 +312,11 @@
listener.messageGenerated(CocoonBean.getProlog());
+if (cocoon.getTargetCount() ==0 cocoon.isPrecompileOnly()) {
+listener.messageGenerated(Please, specify at least one starting
URI.);
+System.exit(1);
+}
+
cocoon.initialize();
cocoon.process();
cocoon.dispose();
1.41 +14 -7
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- CocoonBean.java 10 Mar 2004 12:58:09 - 1.40
+++ CocoonBean.java 30 Apr 2004 12:55:55 - 1.41
@@ -96,12 +96,6 @@
if (this.initialized == false) {
super.initialize();
-if (crawler.getRemainingCount() == 0 !precompileOnly) {
-String error = Please, specify at least one starting URI.;
-log.fatalError(error);
-throw new ProcessingException(error);
-}
-
this.sourceResolver =
(SourceResolver) getComponentManager().lookup(
SourceResolver.ROLE);
@@ -131,6 +125,10 @@
this.precompileOnly = precompileOnly;
}
+public boolean isPrecompileOnly() {
+return precompileOnly;
+}
+
public void setVerbose(boolean verbose) {
this.verbose = verbose;
}
@@ -239,6 +237,10 @@
crawler.addTarget(target);
}
+public int getTargetCount() {
+return crawler.getRemainingCount();
+}
+
public void addExcludePattern(String pattern) {
int preparedPattern[] = WildcardHelper.compilePattern(pattern);
excludePatterns.add(preparedPattern);
@@ -331,6 +333,11 @@
if (!this.initialized) {
this.initialize();
+}
+
+if (crawler.getRemainingCount() == 0 !precompileOnly) {
+log.info(No targets for to be processed.);
+return;
}
if (this.checksumsURI != null) {
1.3 +6 -1
cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
Index: AntDelegate.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntDelegate.java 5 Mar 2004 13:02:45 - 1.2
+++ AntDelegate.java 30 Apr 2004 12:55:55 - 1.3
@@ -39,6 +39,11 @@
System.out.println(CocoonBean.getProlog());
+if (cocoon.getTargetCount() ==0 cocoon.isPrecompileOnly()) {
+listener.messageGenerated(Please, specify at least one starting
URI.);
+System.exit(1);
+}
+
cocoon.initialize();
cocoon.process();
cocoon.dispose();
1.1
cocoon-2.1/src/test/org/apache/cocoon/bean/CocoonBeanTestCase.java
Index: CocoonBeanTestCase.java
===
/*
* 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
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/treeprocessor/variables PreparedVariableResolverTestCase.java PreparedVariableResolverTestCase.xtest
upayavira2004/05/06 12:27:55
Modified:src/java/org/apache/cocoon/bean CocoonBean.java Target.java
src/java/org/apache/cocoon/components/pipeline/impl
CachingProcessingPipeline.java
src/java/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolver.java
src/test/org/apache/cocoon/components/treeprocessor/variables
PreparedVariableResolverTestCase.java
PreparedVariableResolverTestCase.xtest
Log:
Fix for {baselink:} as found by Carsten.
Revision ChangesPath
1.42 +18 -1
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- CocoonBean.java 30 Apr 2004 12:55:55 - 1.41
+++ CocoonBean.java 6 May 2004 19:27:54 - 1.42
@@ -159,6 +159,7 @@
/**
* Adds a target for processing
*
+ * @deprecated in favour of addTarget(Target target)
* @param type Type of target - append, replace, insert.
* @param root
* @param sourceURI URI of the starting page
@@ -179,6 +180,9 @@
crawler.addTarget(target);
}
+/**
+ * @deprecated in favour of addTarget(Target target)
+ */
public void addTarget(String type, String sourceURI, String destURI)
throws IllegalArgumentException {
Target target = new Target(type, sourceURI, destURI);
@@ -189,6 +193,9 @@
crawler.addTarget(target);
}
+/**
+ * @deprecated in favour of addTarget(Target target)
+ */
public void addTarget(String sourceURI, String destURI)
throws IllegalArgumentException {
Target target = new Target(sourceURI, destURI);
@@ -199,6 +206,9 @@
crawler.addTarget(target);
}
+/**
+ * @deprecated in favour of addTarget(Target target)
+ */
public void addTargets(List uris, String destURI)
throws IllegalArgumentException {
Iterator i = uris.iterator();
@@ -212,6 +222,9 @@
}
}
+/**
+ * @deprecated in favour of addTarget(Target target)
+ */
public void addTarget(
String type,
String root,
@@ -237,6 +250,10 @@
crawler.addTarget(target);
}
+public void addTarget(Target target) {
+crawler.addTarget(target);
+}
+
public int getTargetCount() {
return crawler.getRemainingCount();
}
1.13 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java
Index: Target.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Target.java 5 Mar 2004 13:02:45 - 1.12
+++ Target.java 6 May 2004 19:27:54 - 1.13
@@ -426,4 +426,4 @@
public void setLogger(String string) {
logger = string;
}
-}
\ No newline at end of file
+}
1.5 +17 -1
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java
Index: CachingProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CachingProcessingPipeline.java5 Mar 2004 13:02:50 - 1.4
+++ CachingProcessingPipeline.java6 May 2004 19:27:54 - 1.5
@@ -16,7 +16,9 @@
package org.apache.cocoon.components.pipeline.impl;
import org.apache.avalon.framework.component.ComponentException;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.caching.CacheValidityToSourceValidity;
import org.apache.cocoon.caching.CachedResponse;
import org.apache.cocoon.caching.CachingOutputStream;
import org.apache.cocoon.caching.ComponentCacheKey;
@@ -27,10 +29,14 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
+import org.apache.excalibur.source.SourceValidity;
import java.io.OutputStream;
import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.util.Arrays;
import java.util.Iterator;
+import java.util.List;
/**
* The CachingProcessingPipeline
@@ -55,6 +61,16
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean Target.java
upayavira2004/05/06 12:32:37 Modified:src/java/org/apache/cocoon/bean Target.java Log: Fixing erroneous commit Revision ChangesPath 1.14 +0 -0 cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java Index: Target.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl CachingProcessingPipeline.java
upayavira2004/05/06 12:34:13
Modified:src/java/org/apache/cocoon/components/pipeline/impl
CachingProcessingPipeline.java
Log:
Fixing erroneous commit
Revision ChangesPath
1.6 +0 -16
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java
Index: CachingProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachingProcessingPipeline.java6 May 2004 19:27:54 - 1.5
+++ CachingProcessingPipeline.java6 May 2004 19:34:13 - 1.6
@@ -16,9 +16,7 @@
package org.apache.cocoon.components.pipeline.impl;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.CacheValidityToSourceValidity;
import org.apache.cocoon.caching.CachedResponse;
import org.apache.cocoon.caching.CachingOutputStream;
import org.apache.cocoon.caching.ComponentCacheKey;
@@ -29,14 +27,10 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.excalibur.source.SourceValidity;
import java.io.OutputStream;
import java.io.Serializable;
-import java.lang.reflect.Array;
-import java.util.Arrays;
import java.util.Iterator;
-import java.util.List;
/**
* The CachingProcessingPipeline
@@ -61,16 +55,6 @@
expiresObj);
this.cache.store(this.toCacheKey,
response);
-/*List links = (List)
environment.getObjectModel().get(Constants.LINK_COLLECTION_OBJECT);
-if (links!=null) {
-SourceValidity[] linkValidities = new
SourceValidity[this.toCacheSourceValidities.length+1];
-System.arraycopy(this.toCacheSourceValidities, 0,
linkValidities, 0, this.toCacheSourceValidities.length);
-for (int i=0; ithis.toCacheSourceValidities.length;i++)
{
-linkValidities[i]=this.toCacheSourceValidities[i];
-}
-
linkValidities[this.toCacheSourceValidities.length]=CacheValidityToSourceValidity.createValidity(null);
-this.cache.store(linkValidities, new
CachedResponse(links.serialize()));
-}*/
} else {
CachedResponse response = new
CachedResponse(this.toCacheSourceValidities,
(byte[])this.xmlSerializer.getSAXFragment(),
cvs commit: cocoon-2.1/src/webapp/samples/modules sitemap.xmap
upayavira2004/05/07 02:52:26
Modified:src/webapp/samples/modules sitemap.xmap
Log:
Making the baselink module sample do something useful. As suggested by Jorg
Heymans.
Revision ChangesPath
1.11 +6 -4 cocoon-2.1/src/webapp/samples/modules/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/modules/sitemap.xmap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sitemap.xmap 6 May 2004 11:09:42 - 1.10
+++ sitemap.xmap 7 May 2004 09:52:26 - 1.11
@@ -101,14 +101,16 @@
map:match pattern=content/baselink.xml
map:generate type=jx src=properties.xml
- map:parameter name=(anything) value={baselink:}/
+ map:parameter name=sitemapAsBase
value={baselink:SitemapBaseLink}/
+ map:parameter name=requestAsBase
value={baselink:RequestBaseLink}/
/map:generate
map:transform src=properties2html.xsl
map:parameter name=title value=BaseLink Input Module
(BaseLinkModule)/
map:parameter name=description value=Returns a relative path
(../,
-../../, etc) linking to the base of the current request URI. In
-this demonstration, the request URI is {0} (an internal request
not
+../../, etc) linking to either the base of the current request
URI or the base
+of the sitemap.
+In this demonstration, the request URI is {0} (an internal
request not
equivalent to what the user sees)/
/map:transform
map:serialize /
cvs commit: cocoon-2.1 status.xml
upayavira2004/05/07 07:42:20
Modified:src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java
.status.xml
Log:
Adding cocoon.redirectTo(url, isGlobal), to allow FOM to do global redirects.
Revision ChangesPath
1.34 +7 -3
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Index: FOM_Cocoon.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FOM_Cocoon.java 25 Apr 2004 12:12:08 - 1.33
+++ FOM_Cocoon.java 7 May 2004 14:42:20 - 1.34
@@ -281,8 +281,12 @@
(OutputStream)unwrap(outputStream));
}
-public void jsFunction_redirectTo(String uri) throws Exception {
-this.currentCall.redirector.redirect(false, uri);
+public void jsFunction_redirectTo(String uri, boolean isGlobal) throws
Exception {
+if (isGlobal) {
+this.currentCall.redirector.globalRedirect(false, uri);
+} else {
+this.currentCall.redirector.redirect(false, uri);
+}
}
public void jsFunction_sendStatus(int sc) {
1.314 +11 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- status.xml6 May 2004 14:23:04 - 1.313
+++ status.xml7 May 2004 14:42:20 - 1.314
@@ -212,6 +212,16 @@
changes
release version=@version@ date=@date@
+ action dev=UV type=add
+ Extended FOM so that cocoon.redirectTo(url, true) will do a global
+ redirect. cocoon.redirectTo(url) will act as before. This enables
+ FOM to redirect when it is called from within cocoon: protocol
+ requests, aggregations, etc.
+ /action
+ action dev=UV type=fix
+ Moving check on number of specified targets within CocoonBean. This was
+ preventing the processURI(uri, outputStream) method from working.
+ /action
action dev=VG type=remove
CForms: Remove custom flow level forms validators.
/action
cvs commit: cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/components/source/impl XMLDBSource.java
upayavira2004/06/11 07:27:32
Modified:src/blocks/xmldb/java/org/apache/cocoon/components/source/impl
XMLDBSource.java
Log:
Adding user/password to writeOutputStream in XMLDBSource
Revision ChangesPath
1.18 +4 -4
cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/components/source/impl/XMLDBSource.java
Index: XMLDBSource.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/components/source/impl/XMLDBSource.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XMLDBSource.java 16 May 2004 16:13:25 - 1.17
+++ XMLDBSource.java 11 Jun 2004 14:27:32 - 1.18
@@ -493,7 +493,7 @@
base = this.url.substring(0, this.url.lastIndexOf(/));
name = this.url.substring(this.url.lastIndexOf(/)+1);
}
-Collection collection = DatabaseManager.getCollection(base);
+Collection collection = DatabaseManager.getCollection(base,
user, password);
if (name.equals()) {
name = collection.createId();
@@ -526,7 +526,7 @@
base = k.substring(0, k.lastIndexOf(/));
name = k.substring(k.lastIndexOf(/)+1);
-Collection collection = DatabaseManager.getCollection(base);
+Collection collection = DatabaseManager.getCollection(base,
user, password);
CollectionManagementService service =
(CollectionManagementService)
collection.getService(CollectionManagementService, 1.0);
@@ -541,7 +541,7 @@
base = this.url.substring(0, this.url.lastIndexOf(/));
name = this.url.substring(this.url.lastIndexOf(/)+1);
-Collection collection = DatabaseManager.getCollection(base);
+Collection collection = DatabaseManager.getCollection(base,
user, password);
Resource resource = collection.getResource(name);
if (resource == null) {
cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/offline configuration.xml
upayavira2004/06/29 05:38:21
Modified:src/documentation/xdocs/userdocs/offline configuration.xml
Log:
Formatting fix in doc page
Revision ChangesPath
1.4 +1 -1
cocoon-2.1/src/documentation/xdocs/userdocs/offline/configuration.xml
Index: configuration.xml
===
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/offline/configuration.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configuration.xml 8 May 2004 08:57:58 - 1.3
+++ configuration.xml 29 Jun 2004 12:38:21 - 1.4
@@ -27,7 +27,7 @@
/header
body
s1 title=Overview
- pThis page details the {{xconf}} configuration format for
configuring Cocoon's offline
+ pThis page details the codexconf/code configuration format for
configuring Cocoon's offline
page and site generation capabilities./p
pThis page gives details of how configure Cocoon. Details of the
concepts behind
offline page generation are given on the offline generation
cvs commit: cocoon-2.1/src/blocks/html/lib nekohtml-0.9.2.jar
upayavira2004/07/08 03:11:41 Modified:.gump.xml status.xml lib jars.xml Added: legalnekohtml.0.9.2.jar.license.txt src/blocks/html/conf html.xmap src/blocks/html/java/org/apache/cocoon/generation NekoHTMLGenerator.java src/blocks/html/lib nekohtml-0.9.2.jar Removed: src/blocks/html/conf tidy.xmap Log: Adding a NekoHTMLGenerator. I wondered whether to extend the existing HTMLGenerator to use Neko or JTidy, but decided on a new Generator. They could be merged if necessary. This is the first Jar I've committed. Can someone check I've done gump, licence, etc, correctly? Revision ChangesPath 1.169 +7 -2 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- gump.xml 6 Jul 2004 15:31:38 - 1.168 +++ gump.xml 8 Jul 2004 10:11:38 - 1.169 @@ -470,7 +470,8 @@ depend project=cocoon inherit=all/ depend project=jtidy/ - +depend project=nekohtml/ + work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/ @@ -1271,4 +1272,8 @@ jar name=lib/core/javacImpl-0.9.jar id=impl/ /project + project name=nekohtml +packageorg.cyberneko.html/package +jar name=src/blocks/html/lib/nekohtml-0.9.2.jar id=nekohtml/ + /project /module 1.389 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.388 retrieving revision 1.389 diff -u -r1.388 -r1.389 --- status.xml8 Jul 2004 07:22:34 - 1.388 +++ status.xml8 Jul 2004 10:11:38 - 1.389 @@ -204,6 +204,11 @@ changes release version=@version@ date=@date@ + action dev=UV type=add + Added a NekoHTMLGenerator to HTML block. This is a simpler HTML parser than + JTidy, which preserves more of the original HTML, primarily just balancing + closing tags. + /action action dev=TC type=add fixes-bug=29935 due-to=Leszek Gawron due-to-email=[EMAIL PROTECTED] added support for stripping root elements in the CIncludeTransformer action 1.238 +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.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- jars.xml 8 Jul 2004 09:17:31 - 1.237 +++ jars.xml 8 Jul 2004 10:11:40 - 1.238 @@ -571,6 +571,14 @@ /file file +titleTransform HTML to XML/title +descriptionNekoHTML is a lightweight HTML syntax correcter written using Xerces Native Interface./description +used-byNekoHTML generator (html block)/used-by +libhtml/lib/nekohtml-0.9.2.jar/lib +homepagehttp://www.apache.org/~andyc/neko//homepage + /file + + file titleSearch engine/title description jakarta-lucene is a search engine toolkit designed for indexing and 1.1 cocoon-2.1/legal/nekohtml.0.9.2.jar.license.txt Index: nekohtml.0.9.2.jar.license.txt === The CyberNeko Software License, Version 1.0 (C) Copyright 2002,2003, Andy Clark. All rights reserved. Redistribution and use in source and binary forms, with or without modification, 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 Andy Clark. Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names CyberNeko and NekoHTML 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 NekoHTML, nor may NekoHTML appear in their name, without prior written permission of the author. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED
cvs commit: cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation NekoHTMLGenerator.java
upayavira2004/07/08 05:04:08 Modified:src/blocks/html/java/org/apache/cocoon/generation NekoHTMLGenerator.java Log: doc fixes Revision ChangesPath 1.2 +3 -3 cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java Index: NekoHTMLGenerator.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NekoHTMLGenerator.java8 Jul 2004 10:11:41 - 1.1 +++ NekoHTMLGenerator.java8 Jul 2004 12:04:08 - 1.2 @@ -58,7 +58,7 @@ * The neko html generator reads HTML from a source, converts it to XHTML * and generates SAX Events. It uses the NekoHTML library to do this. * - * @cocoon.sitemap.component.name html + * @cocoon.sitemap.component.name nekohtml * @cocoon.sitemap.component.label content * @cocoon.sitemap.component.logger sitemap.generator.nekohtml * @cocoon.sitemap.component.documentation.caching @@ -93,7 +93,7 @@ /** XPath Processor */ private XPathProcessor processor = null; -/** JTidy properties */ +/** Neko properties */ private Properties properties; public void service(ServiceManager manager)
cvs commit: cocoon-2.1 gump.xml
upayavira2004/07/08 12:43:44 Modified:.gump.xml Log: Removing NekoHTML as a defined project as it apparently exists already in Gump. Revision ChangesPath 1.170 +1 -5 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- gump.xml 8 Jul 2004 10:11:38 - 1.169 +++ gump.xml 8 Jul 2004 19:43:44 - 1.170 @@ -1272,8 +1272,4 @@ jar name=lib/core/javacImpl-0.9.jar id=impl/ /project - project name=nekohtml -packageorg.cyberneko.html/package -jar name=src/blocks/html/lib/nekohtml-0.9.2.jar id=nekohtml/ - /project /module
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/matching I18nMatcher.java
upayavira2004/07/11 11:50:07
Modified:src/webapp sitemap.xmap
Added: src/java/org/apache/cocoon/matching I18nMatcher.java
Log:
A first pass at an I18nMatcher.
Revision ChangesPath
1.54 +8 -1 cocoon-2.1/src/webapp/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.1/src/webapp/sitemap.xmap,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sitemap.xmap 23 Jun 2004 19:32:03 - 1.53
+++ sitemap.xmap 11 Jul 2004 18:50:07 - 1.54
@@ -243,6 +243,13 @@
map:matcher name=mount-table
src=org.apache.cocoon.matching.MountTableMatcher
map:parameter name=ignore-missing-tables value=true/
/map:matcher
+map:matcher name=i18n src=org.apache.cocoon.matching.I18nMatcher
+ request-param-namelang/request-param-name
+ use-localetrue/use-locale
+ use-localestrue/use-locales
+ default-locale lang=en country=US/
+ test-blank-localetrue/test-blank-locale
+/map:matcher
/map:matchers
!--+
1.1
cocoon-2.1/src/java/org/apache/cocoon/matching/I18nMatcher.java
Index: I18nMatcher.java
===
/*
* 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.matching;
import java.io.IOException;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.sitemap.PatternException;
import org.apache.commons.lang.StringUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
/**
* A matcher that locates and identifies to the pipeline a source document to
be used as
* the content for an i18n site, based upon a locale provided in a range of
ways.
* h1Configuration/h1
* p
* A sample configuration (given in the lt;matchersgt; section of the
sitemap) is given
* below.
* /p
* pre
* lt;map:matcher name=i18n
src=org.apache.cocoon.matching.I18nMatchergt;
*lt;request-param-namegt;langlt;/request-param-namegt;
*lt;use-localegt;truelt;/use-localegt;
*lt;use-localesgt;truelt;/use-localesgt;
*lt;default-locale lang=pt country=BR/gt;
*lt;test-blank-localegt;truelt;/test-blank-localegt;
* lt;/map:matchergt;
* /pre
* p
* Within this configuration, it is possible to:
* ul
* liSpecify the request parameter that is to be used as a locale, if
present/li
* liSpecify whether the primary locale provided by the user agent is
to be used/li
* liSpecify whether each locale provided by the user agent should be
tested in turn/li
* liSpecify the default locale to be used when none matches any of the
previous/li
* liSpecify whether a file should be looked for without a locale in
its filename, e.g.
* after looking for index.en.html, try index.html./li
* /ul
* /p
* h1Usage/h1
* pThis matcher will be used in a pipeline like so:
* /p
* pre
* lt;map:match pattern=*.htmlgt;
* lt;map:match type=i18n pattern=xml/{1}.*.xmlgt;
* lt;map:generate src={source}/gt;
* ...
* lt;/map:matchgt;
* lt;/map:matchgt;
* /pre
*
* h1Locale Identification/h1
* p
* A source will be looked for using each of the following as a source for
locale. Where the
* full locale (language, country, variant) doesn't match, it will fall back
to first language
* and country, and then just language, before moving on to the next locale.
* ul
* liLocale provided as a request parameter/li
svn commit: rev 54546 - cocoon/trunk/src/java/org/apache/cocoon/bean/helpers
Author: upayavira
Date: Mon Oct 11 03:25:11 2004
New Revision: 54546
Modified:
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
Log:
Fixing bug #29360 ant precompile problem
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
Mon Oct 11 03:25:11 2004
@@ -27,7 +27,7 @@
* introspection (due to classpath issues).
*
* @author a href=mailto:[EMAIL PROTECTED]Upayavira/a
- * @version CVS $Id: AntDelegate.java,v 1.3 2004/04/30 12:55:55 upayavira Exp $
+ * @version CVS $Id$
*/
public class AntDelegate {
@@ -39,7 +39,7 @@
System.out.println(CocoonBean.getProlog());
-if (cocoon.getTargetCount() ==0 cocoon.isPrecompileOnly()) {
+if (!cocoon.isPrecompileOnly() cocoon.getTargetCount() ==0) {
listener.messageGenerated(Please, specify at least one starting
URI.);
System.exit(1);
}
svn commit: rev 54552 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers
Author: upayavira
Date: Mon Oct 11 03:35:06 2004
New Revision: 54552
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
Log:
Fixing bug #29360, ant precompile prob.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/AntDelegate.java
Mon Oct 11 03:35:06 2004
@@ -27,7 +27,7 @@
* introspection (due to classpath issues).
*
* @author a href=mailto:[EMAIL PROTECTED]Upayavira/a
- * @version CVS $Id: AntDelegate.java,v 1.3 2004/04/30 12:55:55 upayavira Exp $
+ * @version CVS $Id$
*/
public class AntDelegate {
@@ -39,7 +39,7 @@
System.out.println(CocoonBean.getProlog());
-if (cocoon.getTargetCount() ==0 cocoon.isPrecompileOnly()) {
+if (!cocoon.isPrecompileOnly() cocoon.getTargetCount() ==0) {
listener.messageGenerated(Please, specify at least one starting
URI.);
System.exit(1);
}
svn commit: rev 54566 - cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers
Author: upayavira Date: Mon Oct 11 04:57:20 2004 New Revision: 54566 Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml Log: namespaces are okay (verified by Scott Roth) Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml == --- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml (original) +++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml Mon Oct 11 04:57:20 2004 @@ -325,7 +325,6 @@ /s2 /s1 s1 title=Known Problems - pNamespace handling: namespace declarations are not copied to the codeSource/code, resulting in invalid XML./p pI cannot get the 'insert before' example working, which uses the code![CDATA[source:reinsert/]]/code tag./p /s1 s1 title=Warning
svn commit: rev 54567 - cocoon/trunk/src/documentation/xdocs/userdocs/transformers
Author: upayavira Date: Mon Oct 11 04:58:46 2004 New Revision: 54567 Modified: cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml Log: tabs-spaces Modified: cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml == --- cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml (original) +++ cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml Mon Oct 11 04:58:46 2004 @@ -17,188 +17,188 @@ !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.0//EN document-v10.dtd document - header - titleSource Writing Transformer/title - version0.9/version - typeTechnical document/type - authors - person name=Jeremy Quinn email=[EMAIL PROTECTED]/ - /authors - abstractThis document describes the Source Writing transformer of Cocoon./abstract - /header - body - s1 title=Source Writing Transformer - pDiverts xml from a pipeline, writing it to a Source (or + header +titleSource Writing Transformer/title +version0.9/version +typeTechnical document/type +authors + person name=Jeremy Quinn email=[EMAIL PROTECTED]/ +/authors +abstractThis document describes the Source Writing transformer of Cocoon./abstract + /header + body +s1 title=Source Writing Transformer + pDiverts xml from a pipeline, writing it to a Source (or deleting it)./p - pThankfully, codeFileSource/code is no longer the only codeSource/code that currently implements codeWritableSource/code; there are implementations of WebDAV and Apache Slide WritableSources in the scratchpad. Hopefully further codeModifiableSource/code implementations (XMLDB, CVS, Email, SQL, etc.) will be appear in the future./p + pThankfully, codeFileSource/code is no longer the only codeSource/code that currently implements codeWritableSource/code; there are implementations of WebDAV and Apache Slide WritableSources in the scratchpad. Hopefully further codeModifiableSource/code implementations (XMLDB, CVS, Email, SQL, etc.) will be appear in the future./p pSee the transformer in action with the Cocoon Samples for webdav block, and Wiki about it at link href=http://wiki.apache.org/cocoon/WebDAVCMS;WebDAVCMS/link. /p - ul - liName : write-source/li - liClass: org.apache.cocoon.transformation.SourceWritingTransformer/li - liCacheable: no./li - /ul - /s1 - s1 title=The Tags - source - ![CDATA[ - source:write - [source:path/] - source:source/ - source:fragment/ - /source:write - - source:insert/ - source:path/ - source:source/ - source:fragment/ - [source:replace/] - [source:reinsert/] - /source:insert + ul +liName : write-source/li +liClass: org.apache.cocoon.transformation.SourceWritingTransformer/li +liCacheable: no./li + /ul +/s1 +s1 title=The Tags +source + ![CDATA[ +source:write + [source:path/] + source:source/ + source:fragment/ +/source:write + +source:insert/ + source:path/ + source:source/ + source:fragment/ + [source:replace/] + [source:reinsert/] +/source:insert - source:delete/ - source:source/ - [source:path/] - Ignored - [source:fragment/] - Ignored - [source:replace/] - Ignored - [source:reinsert/] - Ignored - /source:insert - ]] - /source - pIn the namespace codexmlns:source=http://apache.org/cocoon/source/1.0;/code./p - pThe contents of the code![CDATA[source:fragment/]]/code +source:delete/ + source:source/ + [source:path/] - Ignored + [source:fragment/] - Ignored + [source:replace/] - Ignored + [source:reinsert/] - Ignored +/source:insert + ]] +/source + pIn the namespace codexmlns:source=http://apache.org/cocoon/source/1.0;/code./p + pThe contents of the code![CDATA[source:fragment/]]/code tag are written to the specified ModifiableSource when the document
svn commit: rev 54568 - cocoon/trunk/src/documentation/xdocs/userdocs/transformers
Author: upayavira Date: Mon Oct 11 04:59:29 2004 New Revision: 54568 Modified: cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml Log: fixing bug 27821 (namespaces are okay now) - verified by Scott Roth Modified: cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml == --- cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml (original) +++ cocoon/trunk/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml Mon Oct 11 04:59:29 2004 @@ -325,7 +325,6 @@ /s2 /s1 s1 title=Known Problems - pNamespace handling: namespace declarations are not copied to the codeSource/code, resulting in invalid XML./p pI cannot get the 'insert before' example working, which uses the code![CDATA[source:reinsert/]]/code tag./p /s1 s1 title=Warning
svn commit: rev 54666 - in cocoon/trunk/src/java/org/apache/cocoon/bean: . helpers
Author: upayavira
Date: Tue Oct 12 04:08:27 2004
New Revision: 54666
Modified:
cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java
cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.java
cocoon/trunk/src/java/org/apache/cocoon/bean/Target.java
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/BeanConfigurator.java
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/Crawler.java
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java
Log:
Broken link reporting now includes referring pages (requested by Forrest)
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java Tue Oct
12 04:08:27 2004
@@ -15,12 +15,14 @@
*/
package org.apache.cocoon.bean;
+import java.util.List;
+
/**
* Interface allowing caller to install a listener so that it can be informed
* as the bean makes progress through the links to be called.
*
* @author a href=mailto:[EMAIL PROTECTED]Upayavira/a
- * @version CVS $Id: BeanListener.java,v 1.5 2004/03/05 13:02:45 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
public interface BeanListener {
@@ -72,6 +74,7 @@
* @param messageA reason why the link was not generated
*/
public void brokenLinkFound(String uri, String parentURI, String message,
Throwable t);
+public void brokenLinkFound(String uri, List parentURIs, String message,
Throwable t);
/**
* Signals completion of the generation process. This method can
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.java
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.javaTue Oct
12 04:08:27 2004
@@ -60,7 +60,7 @@
* @author a href=mailto:[EMAIL PROTECTED]Nicola Ken Barozzi/a
* @author a href=mailto:[EMAIL PROTECTED]Vadim Gritsenko/a
* @author a href=mailto:[EMAIL PROTECTED]Upayavira/a
- * @version CVS $Id: CocoonBean.java,v 1.45 2004/07/11 23:02:54 antonio Exp $
+ * @version CVS $Id$
*/
public class CocoonBean extends CocoonWrapper {
@@ -309,6 +309,14 @@
}
}
+public void sendBrokenLinkWarning(String uri, List referrers, String
warning, Throwable t) {
+Iterator i = listeners.iterator();
+while (i.hasNext()) {
+BeanListener l = (BeanListener) i.next();
+l.brokenLinkFound(uri, referrers, warning, t);
+}
+}
+
public void pageSkipped(String uri, String message) {
Iterator i = listeners.iterator();
while (i.hasNext()) {
@@ -460,7 +468,7 @@
newLinkCount++;
}
} catch (ProcessingException pe) {
-this.sendBrokenLinkWarning(linkTarget.getSourceURI(),
pe.getMessage());
+this.sendBrokenLinkWarning(linkTarget.getSourceURI(),
linkTarget.getReferringURIs(), pe.getMessage(), pe);
if (this.brokenLinkGenerate) {
if (crawler.addTarget(linkTarget)) {
newLinkCount++;
@@ -530,7 +538,9 @@
output = null;
this.resourceUnavailable(target);
this.sendBrokenLinkWarning(target.getSourceURI(),
-DefaultNotifyingBuilder.getRootCause(pe).getMessage());
+target.getReferringURIs(),
+DefaultNotifyingBuilder.getRootCause(pe).getMessage(),
+DefaultNotifyingBuilder.getRootCause(pe));
} finally {
if (output != null status != -1) {
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/Target.java
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/Target.java(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/Target.javaTue Oct 12
04:08:27 2004
@@ -15,6 +15,8 @@
*/
package org.apache.cocoon.bean;
+import java.util.ArrayList;
+import java.util.List;
import java.util.TreeMap;
import org.apache.cocoon.Constants;
@@ -29,7 +31,7 @@
* written (the destination URI).
*
* @author a href=mailto:[EMAIL PROTECTED]Upayavira/a
- * @version CVS $Id: Target.java,v 1.14 2004/05/06 19:32:37 upayavira Exp $
+ * @version CVS $Id$
*/
public class Target {
// Defult type is append
@@ -50,7 +52,8 @@
private String defaultFilename = Constants.INDEX_URI;
private String finalDestinationURI = null;
private String extension = null;
-
+private List referringURIs = null;
+
private boolean followLinks;
private boolean
svn commit: rev 54676 - in cocoon/trunk/src/java/org/apache/cocoon/bean: . helpers
Author: upayavira
Date: Tue Oct 12 08:57:34 2004
New Revision: 54676
Modified:
cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java
cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.java
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/Crawler.java
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java
Log:
Fixing it so that broken link referrer works properly (I think!)
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/BeanListener.java Tue Oct
12 08:57:34 2004
@@ -74,7 +74,7 @@
* @param messageA reason why the link was not generated
*/
public void brokenLinkFound(String uri, String parentURI, String message,
Throwable t);
-public void brokenLinkFound(String uri, List parentURIs, String message,
Throwable t);
+public void brokenLinkFound(Target target, Throwable t);
/**
* Signals completion of the generation process. This method can
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.java
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonBean.javaTue Oct
12 08:57:34 2004
@@ -309,11 +309,11 @@
}
}
-public void sendBrokenLinkWarning(String uri, List referrers, String
warning, Throwable t) {
+public void sendBrokenLinkWarning(Target target, Throwable t) {
Iterator i = listeners.iterator();
while (i.hasNext()) {
BeanListener l = (BeanListener) i.next();
-l.brokenLinkFound(uri, referrers, warning, t);
+l.brokenLinkFound(target, t);
}
}
@@ -468,7 +468,7 @@
newLinkCount++;
}
} catch (ProcessingException pe) {
-this.sendBrokenLinkWarning(linkTarget.getSourceURI(),
linkTarget.getReferringURIs(), pe.getMessage(), pe);
+this.sendBrokenLinkWarning(linkTarget, pe);
if (this.brokenLinkGenerate) {
if (crawler.addTarget(linkTarget)) {
newLinkCount++;
@@ -537,9 +537,7 @@
output.close();
output = null;
this.resourceUnavailable(target);
-this.sendBrokenLinkWarning(target.getSourceURI(),
-target.getReferringURIs(),
-DefaultNotifyingBuilder.getRootCause(pe).getMessage(),
+this.sendBrokenLinkWarning(target,
DefaultNotifyingBuilder.getRootCause(pe));
} finally {
if (output != null status != -1) {
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/Crawler.java
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/Crawler.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/Crawler.java Tue Oct
12 08:57:34 2004
@@ -56,7 +56,11 @@
Target existingTarget =
(Target)stillNotVisited.get(targetString);
existingTarget.addReferringURI(target.getReferringURI());
}
+} else {
+Target visitedTarget = (Target)visitedAlready.get(targetString);
+visitedTarget.addReferringURI(target.getReferringURI());
}
+
return false;
}
Modified:
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java
==
---
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java
Tue Oct 12 08:57:34 2004
@@ -21,13 +21,12 @@
import java.io.OutputStream;
import java.io.PrintWriter;
import java.text.DecimalFormat;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.apache.cocoon.bean.BeanListener;
+import org.apache.cocoon.bean.Target;
/**
* Command line entry point. Parses command line, create Cocoon bean and
invokes it
@@ -107,14 +106,13 @@
* @deprecated use brokenLinkFound(String, List, String, Throwable) instead
*/
public void brokenLinkFound(String uri, String parentURI, String message,
Throwable t) {
-List parents = new ArrayList(1);
-parents.add(parentURI);
-brokenLinkFound(uri, parents, message, t);
+this.print(pad(42,X [0] )+uri+\tBROKEN: +message
svn commit: rev 76039 - cocoon/site/src/documentation/content/xdocs/link
Author: upayavira Date: Tue Nov 16 13:18:56 2004 New Revision: 76039 Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Log: Updating live sites instructions, as per Helma van der Linden Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml == --- cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml (original) +++ cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Tue Nov 16 13:18:56 2004 @@ -131,14 +131,55 @@ s1 title=How to get listed p -If you do not find your site here, make sure you -link href=mailto:[EMAIL PROTECTED] Livesites: Cocoon 2.1tell us/link. -Enter a meaningful title and the version of Cocoon after the words Link Livesites: in the -subject, provide a short summary of your site and do not forget to tell us the URL. You could -also follow the link href=../community/contrib.htmlContributing/link page to make it easier for -everyone. +If you do not find your site here, make sure you tell us. +br/ +Please follow the instructions below, or we will not be able to honor your request. /p - pWe would like to see this list grow bigger every day :-)/p + p + Create an entry in Bugzilla following these instructions. You will find an example + a href=http://issues.apache.org/bugzilla/ here/a:br/ + emPlease do strongnot/strong modify the sample entry. Create a new one./em +/p + +ul + liselect the usual options for submitting a patch. + /li + liEnter a summary like this: em[Link] NameOfYourSite/em + /li + liIn the comments, please answer the following questions: + /li + +ul + liURL of the website:br/ + Note: emIf the website is actually an intranet, can you provide some + screenshots as attachment to the Bugzilla entry?/em/li + liTitle of the website (to be used on the LiveSites page):br/ + Note: emadd '(intranet)' to the title if necessary/em./li + liCocoon version used:/li + liShort summary of your site:/li + liHow can we verify this site is actually built with Cocoon?/li +/ul + + liIf you agree, answering the following questions helps potential Cocoon users +to find references that are similar to their needs. But there's no obligation +if you don't want to disclose that kind of information. + /li + +ul + liHow much time did it take to build the site from design to publication?/li + liHow many people were involved in the project?/li + liHow much traffic does the site handle?/li + liWhat made you choose Cocoon to build the site?/li + liWhat other information do you want to disclose (e.g. how does it work, +how did you build it, what parts of Cocoon did you use)?/li +/ul + liCan you provide a contact email address if people want further information?/li + liIf you have already provided the same/a similar link for the LiveSites pages, +please state it here and indicate if this link should be replaced with the above +information or if it should be kept as well?/li +/ul + +pThank you for helping spread the word about Cocoon./p /s1 /body /document
svn commit: rev 76105 - cocoon/site/src/documentation/content/xdocs/link
Author: upayavira Date: Wed Nov 17 01:42:34 2004 New Revision: 76105 Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Log: A reference to a sample bugzilla template (as per Helma) Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml == --- cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml (original) +++ cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Wed Nov 17 01:42:34 2004 @@ -137,7 +137,7 @@ /p p Create an entry in Bugzilla following these instructions. You will find an example - a href=http://issues.apache.org/bugzilla/ here/a:br/ + a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=32266;here/a:br/ emPlease do strongnot/strong modify the sample entry. Create a new one./em /p
svn commit: rev 76174 - cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util
Author: upayavira
Date: Wed Nov 17 13:44:23 2004
New Revision: 76174
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
Log:
Typo
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
Wed Nov 17 13:44:23 2004
@@ -74,7 +74,7 @@
}
if (!componentClass.isAssignableFrom(clazz))
-throw new ConfigurationException(The class \ + src + \ is
of an incorrect type, it should implement or exted +
componentClass.getName());
+throw new ConfigurationException(The class \ + src + \ is
of an incorrect type, it should implement or extend +
componentClass.getName());
Object component = null;
try {
svn commit: rev 76175 - cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util
Author: upayavira
Date: Wed Nov 17 13:45:08 2004
New Revision: 76175
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
Log:
typo
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
==
---
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
(original)
+++
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java
Wed Nov 17 13:45:08 2004
@@ -74,7 +74,7 @@
}
if (!componentClass.isAssignableFrom(clazz))
-throw new ConfigurationException(The class \ + src + \ is
of an incorrect type, it should implement or exted +
componentClass.getName());
+throw new ConfigurationException(The class \ + src + \ is
of an incorrect type, it should implement or extend +
componentClass.getName());
Object component = null;
try {
svn commit: r105998 - cocoon/site/src/documentation/content/xdocs/link
Author: upayavira Date: Sat Nov 20 13:24:43 2004 New Revision: 105998 Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Log: Er, making xdoc valid Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml == --- cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml (original) +++ cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Sat Nov 20 13:24:43 2004 @@ -137,8 +137,8 @@ /p p Create an entry in Bugzilla following these instructions. You will find an example - a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=32266;here/a:br/ - emPlease do strongnot/strong modify the sample entry. Create a new one./em + link href=http://issues.apache.org/bugzilla/show_bug.cgi?id=32266;here/link:br/ + emPlease do NOT modify the sample entry. Create a new one./em /p ul
svn commit: r106003 - cocoon/trunk/src/documentation/xdocs/userdocs/flow
Author: upayavira Date: Sat Nov 20 13:52:18 2004 New Revision: 106003 Modified: cocoon/trunk/src/documentation/xdocs/userdocs/flow/jpath.xml Log: Making it valid XML (in trunk too) Modified: cocoon/trunk/src/documentation/xdocs/userdocs/flow/jpath.xml == --- cocoon/trunk/src/documentation/xdocs/userdocs/flow/jpath.xml (original) +++ cocoon/trunk/src/documentation/xdocs/userdocs/flow/jpath.xmlSat Nov 20 13:52:18 2004 @@ -131,7 +131,7 @@ /p p If the tag contains child elements it will scope the setting for the enclosed -elements, otherwise it is a global setting. You can't nest jpath:set-lenient +elements, otherwise it is a global setting. You can't nest lt;jpath:set-lenientgt; tags. /p source
svn commit: r109386 - /cocoon/site/src/documentation/content/xdocs/versioning.xml
Author: upayavira Date: Wed Dec 1 14:14:14 2004 New Revision: 109386 URL: http://svn.apache.org/viewcvs?view=revrev=109386 Log: typo Modified: cocoon/site/src/documentation/content/xdocs/versioning.xml Modified: cocoon/site/src/documentation/content/xdocs/versioning.xml Url: http://svn.apache.org/viewcvs/cocoon/site/src/documentation/content/xdocs/versioning.xml?view=diffrev=109386p1=cocoon/site/src/documentation/content/xdocs/versioning.xmlr1=109385p2=cocoon/site/src/documentation/content/xdocs/versioning.xmlr2=109386 == --- cocoon/site/src/documentation/content/xdocs/versioning.xml (original) +++ cocoon/site/src/documentation/content/xdocs/versioning.xml Wed Dec 1 14:14:14 2004 @@ -273,7 +273,7 @@ /p /section section id=reality - titleRealitiy/title + titleReality/title p The above expresses the intentions of the Cocoon community to support a release management contract to all the users of the framework. However
svn commit: r112022 - /cocoon/site/src/documentation/content/xdocs/community/members.xml
Author: upayavira Date: Wed Dec 15 13:35:11 2004 New Revision: 112022 URL: http://svn.apache.org/viewcvs?view=revrev=112022 Log: A few missing 'members' copied from the 2.1 'who.xml' file Modified: cocoon/site/src/documentation/content/xdocs/community/members.xml Modified: cocoon/site/src/documentation/content/xdocs/community/members.xml Url: http://svn.apache.org/viewcvs/cocoon/site/src/documentation/content/xdocs/community/members.xml?view=diffrev=112022p1=cocoon/site/src/documentation/content/xdocs/community/members.xmlr1=112021p2=cocoon/site/src/documentation/content/xdocs/community/members.xmlr2=112022 == --- cocoon/site/src/documentation/content/xdocs/community/members.xml (original) +++ cocoon/site/src/documentation/content/xdocs/community/members.xml Wed Dec 15 13:35:11 2004 @@ -31,7 +31,9 @@ titleThe Community/title p This list contains all past and present committers on the various Cocoon projects -in strict alphabetical order. +in strict alphabetical order. For details of contributors to a specific version of +Cocoon, see the relevant version pages +(e.g. link href=http://cocoon.apache.org/2.1/who.html;2.1/link). /p ul liZvi Avraham (zvia.at.apache.org)/li @@ -40,13 +42,17 @@ liBrian Behlendorf (brian.at.apache.org)/li liRoss Burton (rossb.at.apache.org)/li liMark Butler (butlermh.at.apache.org)/li + liGuido Casper (gcasper.at.apache.org)/li + liUgo Cei (ugo.at.apache.org)/li liSteven Coffman (gears.at.apache.org)/li + liTony Collen (tony.at.apache.org)/li liMarcus Crafter (crafterm.at.apache.org)/li liDavid Crossley (crossley.at.apache.org)/li liTorsten Curdt (tcurdt.at.apache.org)/li liBertrand Delacr#233;taz (bdelacretaz.at.apache.org)/li liPeter Donald (donaldp.at.apache.org)/li liBruno Dumon (bruno.at.apache.org)/li + liDaniel Fagerstr#246;m (danielf.at.apache.org)/li liGerhard Froehlich (froehlich.at.apache.org)/li liPier Fumagalli (pier.at.apache.org)/li liAntonio Gallardo (antonio.at.apache.org)/li @@ -56,10 +62,12 @@ liVadim Gritsenko (vgritsenko.at.apache.org)/li liChristian Haul (haul.at.apache.org)/li liJ#246;rg Heinicke (joerg.at.apache.org)/li + liUnico Hommes (unico.at.apache.org)/li liGeoff Howard (ghoward.at.apache.org)/li liBernhard Huber (huber.at.apache.org)/li liIvelin Ivanov (ivelin.at.apache.org)/li liMatthew Langham (mlangham.at.apache.org)/li + liTim Larson (tim.at.apache.org)/li liBen Laurie (ben.at.apache.org)/li liBerin Loritsch (bloritsch.at.apache.org)/li liMartin Man (mman.at.apache.org)/li @@ -72,6 +80,8 @@ liChristopher Oliver (coliver.at.apache.org)/li liGiacomo Pati (giacomo.at.apache.org)/li liKonstantin Piroumian (kpiroumian.at.apache.org)/li + liMarc Portier (mpo.at.apache.org)/li + liReinhard P#246;tz(reinhard.at.apache.org)/li liOvidiu Predescu (ovidiu.at.apache.org)/li liJeremy Quinn (jeremy.at.apache.org)/li liGianugo Rabellino (gianugo.at.apache.org)/li @@ -84,9 +94,9 @@ liDiana Shannon (shannon.at.apache.org)/li liDavanum Srinivas (dims.at.apache.org)/li liJeff Turner (jefft.at.apache.org)/li + liUpayavira (upayavira.at.apache.org)/li liSylvain Wallez (sylvain.at.apache.org)/li liCarsten Ziegeler (cziegeler.at.apache.org)/li - liUpayavira (upayavira.at.apache.org)/li /ul /section
svn commit: r112023 - /cocoon/site/src/documentation/content/xdocs/community/committer.xml
Author: upayavira Date: Wed Dec 15 13:36:18 2004 New Revision: 112023 URL: http://svn.apache.org/viewcvs?view=revrev=112023 Log: About properties Modified: cocoon/site/src/documentation/content/xdocs/community/committer.xml Modified: cocoon/site/src/documentation/content/xdocs/community/committer.xml Url: http://svn.apache.org/viewcvs/cocoon/site/src/documentation/content/xdocs/community/committer.xml?view=diffrev=112023p1=cocoon/site/src/documentation/content/xdocs/community/committer.xmlr1=112022p2=cocoon/site/src/documentation/content/xdocs/community/committer.xmlr2=112023 == --- cocoon/site/src/documentation/content/xdocs/community/committer.xml (original) +++ cocoon/site/src/documentation/content/xdocs/community/committer.xml Wed Dec 15 13:36:18 2004 @@ -38,9 +38,20 @@ that if SVN files are inconsistent, some of those editors just make it worse. /p - p -The solution is that some committers who have a proper editor +The solution comes in two parts: + /p + p +When a committer adds a new file, they need to ensure that the file +has the correct line endings for their own operating system, and that +either their SVN client automatically sets the EOL settings for the +file based upon the file extension, or they must do: + /p +source![CDATA[svn add myfile.txt +svn propset svn:eol-style native myfile.txt +]] +/source + pis that some committers who have a proper editor should occasionally correct the whitespace across all SVN files, applying the following rules. /p @@ -50,7 +61,7 @@ ul liReplace all tabs with spaces./li liNo trailing whitespace./li -liNo M$-DOS line endings./li +liNo MS-DOS line endings./li liNewline at end-of-file./li liSingle whitespace between words./li /ul @@ -90,7 +101,7 @@ find . -type f | xargs grep -l '^M' | xargs file | \ grep -i -w text | cut -f1 -d: -To add the ^M useCtrl-v Ctrl-m at the command-line. +To add the ^M use Ctrl-v Ctrl-m at the command-line. Note that copy-and-paste will not work. The -w can be omitted, but might then match some extra filenames. ]]/source
svn commit: r122545 - /cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml /cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml
Author: upayavira Date: Thu Dec 16 03:40:55 2004 New Revision: 122545 URL: http://svn.apache.org/viewcvs?view=revrev=122545 Log: RequestMethodSelector documentation Added: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml Modified: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml?view=diffrev=122545p1=cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xmlr1=122544p2=cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xmlr2=122545 == --- cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml (original) +++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/book.xml Thu Dec 16 03:40:55 2004 @@ -35,6 +35,7 @@ menu-item label=Host Selector href=host-selector.html/ menu-item label=Parameter Selector href=parameter-selector.html/ menu-item label=Request Attribute Selector href=requestattribute-selector.html/ +menu-item label=Request Method Selector href=requestmethod-selector.html/ menu-item label=Request Parameter Selector href=requestparameter-selector.html/ menu-item label=Regular-expression Header Selector href=regular-expression-header-selector.html/ /menu Added: cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml?view=autorev=122545 == --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml Thu Dec 16 03:40:55 2004 @@ -0,0 +1,112 @@ +?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. +-- +!DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.0//EN ../../dtd/document-v10.dtd + +!-- + ![CDATA[ CVS Version: $Id: selector.template,v 1.6 2004/04/21 00:35:27 crossley Exp $ + ]] +-- +document + header +titleRequestMethodSelector in Cocoon/title +version0.9/version +typeTechnical document/type +authors + person name=Cocoon Community email=dev@cocoon.apache.org/ +/authors +abstractThis document describes the RequestMethodSelector of Cocoon./abstract + /header + body +s1 title=RequestMethodSelector + table +tr + tdNAME/tdtdRequestMethod/td +/tr +tr + tdWHAT/tdtdThe codeRequestMethodSelector/code component is used to +select appropriate sitemap processing depending on the request method, +for example, codeGET/code or codePOST/code. + /td +/tr +tr + tdTYPE/tdtdSelector, Sitemap Component/td +/tr +tr + tdBLOCK/tdtdCore/td +/tr +tr + tdCLASS/tdtdorg.apache.cocoon.selection.RequestMethodSelector/td +/tr +tr + tdCACHEABLE/tdtdnot applicable/td +/tr + /table +/s1 +s1 title=Description + p +The RequestMethodSelector allows pipeline creation to be influenced by the method of +the request. For example, in a Cocoon Forms environment, a codeGET/code request +could be forwarded to a new FlowScript function, whilst a codePOST/code could be +forwarded to a continuation, for example: + /p + source![CDATA[ +map:match pattern=myform + map:select type=request-method +map:when test=GET + map:call function=myform/ +/map:when +map:when test=POST + map:call continuation=request-param:continuation-id/ +/map:when + /map:select +/map:match +]]/source +/s1 +s1 title=Configuration + + s2 title=Sitemap component configuration example +p/p +source![CDATA[ +map:selectors... + map:selector name=request-method +logger=sitemap.selector.request-method +src=org.apache.cocoon.selection.RequestMethodSelector/ + ... +/map:selectors +]]/source + /s2
svn commit: r149388 - cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml
Author: upayavira Date: Tue Feb 1 03:46:59 2005 New Revision: 149388 URL: http://svn.apache.org/viewcvs?view=revrev=149388 Log: First pass at an updated site structure (in collaboration with Reinhard) Modified: cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml Modified: cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml?view=diffr1=149387r2=149388 == --- cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml Tue Feb 1 03:46:59 2005 @@ -23,19 +23,32 @@ index label=Archive/ /index index label=Download/ +index label=Getting Support/ +index label=Older Versions/ +index label=Related Projects + index label=Projects based on Cocoon/ + index label=Sites using Cocoon/ + index label=Cocoon based Hosting/ +/index index label=History/ -index label=Related Projects/ /about docs label=Community tab=community doc label=Who we are? href=community.html/ -doc label=Wiki docs/ doc label=Contributing/ -doc label=Committer Tips/ +doc label=Committer Tips/!-- content from developer info page to be merged into this page or subordinate pages -- doc label=Mailing Lists/ -doc label=Mail Archives/ +doc label=Mail Archives/ +doc label=Collaboration Tools + doc label=Subversion/ + doc label=Bugzilla/ + doc label=Wiki/ + doc label=IRC channel/ +/doc +doc label=Events/!-- this page includes an 'informal meetings' link to a wiki page, as well as links to GetTogether, ApacheCon, etc -- +doc label=Versioning Scheme/ /docs - + !-- The href must be wholesite.html/pdf You can change the labels and node names all label=All
svn commit: r149430 - cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml
Author: upayavira Date: Tue Feb 1 10:43:25 2005 New Revision: 149430 URL: http://svn.apache.org/viewcvs?view=revrev=149430 Log: Typo pointed out by Helma, bug #5 Modified: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml Modified: cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml?view=diffr1=149429r2=149430 == --- cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml (original) +++ cocoon/whiteboard/doc-repos/2.2/src/documentation/content/xdocs/site.xml Tue Feb 1 10:43:25 2005 @@ -73,7 +73,7 @@ doc label=Your own project doc label=Building Cocoon/ doc label=Ant integration/ - doc label=Maven inegration/ + doc label=Maven integration/ doc label=Eclipse integration/ doc label=Deployment doc label=Tomcat/
svn commit: r154838 - in cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon: bean/CocoonWrapper.java environment/commandline/AbstractCommandLineEnvironment.java
Author: upayavira
Date: Tue Feb 22 04:30:44 2005
New Revision: 154838
URL: http://svn.apache.org/viewcvs?view=revrev=154838
Log:
Adding ability for CocoonBean to process a URL to a content handler
with cocoonBean.process(uri, contentHandler), rather than to an
OutputStream (of course skipping the serializer).
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java?view=diffr1=154837r2=154838
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Tue Feb 22 04:30:44 2005
@@ -391,6 +391,36 @@
}
}
+/**
+ * Process single URI into given content handler, skipping final
+ * serializer
+ *
+ * @param uri to process
+ * @param handler to write generated contents into
+ */
+public void processURI(String uri, ContentHandler handler)
+throws Exception {
+
+if (!initialized) {
+initialize();
+}
+log.info(Processing URI: + uri);
+
+// Get parameters, deparameterized URI and path from URI
+final TreeMap parameters = new TreeMap();
+final String deparameterizedURI =
+NetUtils.deparameterize(uri, parameters);
+parameters.put(user-agent, userAgent);
+parameters.put(accept, accept);
+
+int status =
+getPage(deparameterizedURI, 0L, parameters, null, null, handler);
+
+if (status = 400) {
+throw new ProcessingException(Resource not found: + status);
+}
+}
+
public void dispose() {
if (this.initialized) {
this.initialized = false;
@@ -452,6 +482,47 @@
// Here Cocoon can throw an exception if there are errors in
processing the page
cocoon.process(env);
+
+// if we get here, the page was created :-)
+int status = env.getStatus();
+if (!env.isModified()) {
+status = -1;
+}
+return status;
+}
+
+/**
+ * Processes an URI for its content.
+ *
+ * @param deparameterizedURI a codeString/code value of an URI to
start sampling from
+ * @param parameters a codeMap/code value containing request parameters
+ * @param links a codeMap/code value
+ * @param stream an codeOutputStream/code to write the content to
+ * @return a codeString/code value for the content
+ * @exception Exception if an error occurs
+ */
+protected int getPage(String deparameterizedURI,
+ long lastModified,
+ Map parameters,
+ Map links,
+ List gatheredLinks,
+ ContentHandler handler)
+throws Exception {
+
+parameters.put(user-agent, userAgent);
+parameters.put(accept, accept);
+
+FileSavingEnvironment env =
+new FileSavingEnvironment(deparameterizedURI, lastModified,
context,
+ attributes, parameters, links,
+ gatheredLinks, cliContext, null, log);
+
+XMLConsumer consumer = new ContentHandlerWrapper(handler);
+ProcessingPipeline pipeline = cocoon.buildPipeline(env);
+CocoonComponentManager.enterEnvironment(env,
cocoon.getComponentManager(), cocoon);
+pipeline.prepareInternal(env);
+CocoonComponentManager.leaveEnvironment();
+pipeline.process(env, consumer);
// if we get here, the page was created :-)
int status = env.getStatus();
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java?view=diffr1=154837r2=154838
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
Tue Feb 22 04:30:44 2005
@@ -36,7 +36,7 @@
* This environment is used to save the requested file to disk.
*
* @author a href=mailto:[EMAIL PROTECTED]Stefano Mazzocchi/a
- * @version CVS $Id: AbstractCommandLineEnvironment.java,v 1.6 2004/03/05
13:02:54 bdelacretaz Exp $
+ * @version CVS $Id
svn commit: r154839 - cocoon/branches/BRANCH_2_1_X/status.xml
Author: upayavira Date: Tue Feb 22 04:43:32 2005 New Revision: 154839 URL: http://svn.apache.org/viewcvs?view=revrev=154839 Log: Adding status message Modified: cocoon/branches/BRANCH_2_1_X/status.xml Modified: cocoon/branches/BRANCH_2_1_X/status.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diffr1=154838r2=154839 == --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Feb 22 04:43:32 2005 @@ -202,6 +202,9 @@ changes release version=@version@ date=@date@ + action dev=UV type=add + CocoonBean can now process a URL to a SAX ContentHandler (skipping the serialiser), via cocoon.process(uri, handler). + /action action dev=VG type=update OJB Block: Integrated OJB logging with Cocoon logging. /action
svn commit: r154840 - cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java cocoon/trunk/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java cocoon/trunk/status.xml
Author: upayavira
Date: Tue Feb 22 05:00:13 2005
New Revision: 154840
URL: http://svn.apache.org/viewcvs?view=revrev=154840
Log:
Adding ability for CocoonBean to process a URL to a content handler
with cocoonBean.process(uri, contentHandler), rather than to an
OutputStream (of course skipping the serializer).
Modified:
cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
cocoon/trunk/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
cocoon/trunk/status.xml
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java?view=diffr1=154839r2=154840
==
--- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Tue Feb 22
05:00:13 2005
@@ -397,6 +397,36 @@
}
}
+/**
+ * Process single URI into given content handler, skipping final
+ * serializer
+ *
+ * @param uri to process
+ * @param handler to write generated contents into
+ */
+public void processURI(String uri, ContentHandler handler)
+throws Exception {
+
+if (!initialized) {
+initialize();
+}
+log.info(Processing URI: + uri);
+
+// Get parameters, deparameterized URI and path from URI
+final TreeMap parameters = new TreeMap();
+final String deparameterizedURI =
+NetUtils.deparameterize(uri, parameters);
+parameters.put(user-agent, userAgent);
+parameters.put(accept, accept);
+
+int status =
+getPage(deparameterizedURI, 0L, parameters, null, null, handler);
+
+if (status = 400) {
+throw new ProcessingException(Resource not found: + status);
+}
+}
+
public void dispose() {
if (this.initialized) {
this.initialized = false;
@@ -458,6 +488,47 @@
// Here Cocoon can throw an exception if there are errors in
processing the page
cocoon.process(env);
+
+// if we get here, the page was created :-)
+int status = env.getStatus();
+if (!env.isModified()) {
+status = -1;
+}
+return status;
+}
+
+/**
+ * Processes an URI for its content.
+ *
+ * @param deparameterizedURI a codeString/code value of an URI to
start sampling from
+ * @param parameters a codeMap/code value containing request parameters
+ * @param links a codeMap/code value
+ * @param stream an codeOutputStream/code to write the content to
+ * @return a codeString/code value for the content
+ * @exception Exception if an error occurs
+ */
+protected int getPage(String deparameterizedURI,
+ long lastModified,
+ Map parameters,
+ Map links,
+ List gatheredLinks,
+ ContentHandler handler)
+throws Exception {
+
+parameters.put(user-agent, userAgent);
+parameters.put(accept, accept);
+
+FileSavingEnvironment env =
+new FileSavingEnvironment(deparameterizedURI, lastModified,
context,
+ attributes, parameters, links,
+ gatheredLinks, cliContext, null, log);
+
+XMLConsumer consumer = new ContentHandlerWrapper(handler);
+ProcessingPipeline pipeline = cocoon.buildPipeline(env);
+CocoonComponentManager.enterEnvironment(env,
cocoon.getComponentManager(), cocoon);
+pipeline.prepareInternal(env);
+CocoonComponentManager.leaveEnvironment();
+pipeline.process(env, consumer);
// if we get here, the page was created :-)
int status = env.getStatus();
Modified:
cocoon/trunk/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java?view=diffr1=154839r2=154840
==
---
cocoon/trunk/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
Tue Feb 22 05:00:13 2005
@@ -39,7 +39,7 @@
* This environment is used to save the requested file to disk.
*
* @author a href=mailto:[EMAIL PROTECTED]Stefano Mazzocchi/a
- * @version CVS $Id: AbstractCommandLineEnvironment.java,v 1.7 2004/05/25
07:28:24 cziegeler Exp $
+ * @version CVS $Id$
*/
public abstract class AbstractCommandLineEnvironment
@@ -173,6 +173,19 @@
*/
public boolean isExternal() {
return
svn commit: r154842 - cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Author: upayavira Date: Tue Feb 22 05:03:18 2005 New Revision: 154842 URL: http://svn.apache.org/viewcvs?view=revrev=154842 Log: Some missing imports Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java?view=diffr1=154841r2=154842 == --- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Tue Feb 22 05:03:18 2005 @@ -42,7 +42,9 @@ import org.apache.cocoon.Cocoon; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.components.CocoonComponentManager; import org.apache.cocoon.components.ContextHelper; +import org.apache.cocoon.components.pipeline.ProcessingPipeline; import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.Core; import org.apache.cocoon.environment.Environment; @@ -52,10 +54,13 @@ import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.util.IOUtils; import org.apache.cocoon.util.NetUtils; +import org.apache.cocoon.xml.ContentHandlerWrapper; +import org.apache.cocoon.xml.XMLConsumer; import org.apache.commons.lang.SystemUtils; import org.apache.log.Hierarchy; import org.apache.log.Priority; +import org.xml.sax.ContentHandler; /** * The Cocoon Wrapper simplifies usage of the Cocoon object. Allows to create,
svn commit: r154843 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Author: upayavira Date: Tue Feb 22 05:04:52 2005 New Revision: 154843 URL: http://svn.apache.org/viewcvs?view=revrev=154843 Log: Some missing imports Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java?view=diffr1=154842r2=154843 == --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java Tue Feb 22 05:04:52 2005 @@ -42,6 +42,8 @@ import org.apache.cocoon.Cocoon; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.components.CocoonComponentManager; +import org.apache.cocoon.components.pipeline.ProcessingPipeline; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.commandline.CommandLineContext; import org.apache.cocoon.environment.commandline.FileSavingEnvironment; @@ -49,10 +51,13 @@ import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.util.IOUtils; import org.apache.cocoon.util.NetUtils; +import org.apache.cocoon.xml.ContentHandlerWrapper; +import org.apache.cocoon.xml.XMLConsumer; import org.apache.commons.lang.SystemUtils; import org.apache.log.Hierarchy; import org.apache.log.Priority; +import org.xml.sax.ContentHandler; /** * The Cocoon Wrapper simplifies usage of the Cocoon object. Allows to create,
svn commit: r155185 [1/3] - in cocoon/trunk/src/documentation/xdocs: plan/book.xml plan/index.xml plan/review-sitemap-docs.xml userdocs/selectors/book.xml userdocs/selectors/requestmethod-selector.xml userdocs/selectors/resourceexists-selector.xml
Author: upayavira Date: Thu Feb 24 05:09:44 2005 New Revision: 155185 URL: http://svn.apache.org/viewcvs?view=revrev=155185 Log: This merges all changes from 2.1 into 2.2. We can now use 2.2 docs as the basis for the new documentation system. The remaining changes are 2.2 specific, which is how it should be. Added: cocoon/trunk/src/documentation/xdocs/plan/review-sitemap-docs.xml cocoon/trunk/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml cocoon/trunk/src/documentation/xdocs/userdocs/selectors/resourceexists-selector.xml Modified: cocoon/trunk/src/documentation/xdocs/plan/book.xml cocoon/trunk/src/documentation/xdocs/plan/index.xml cocoon/trunk/src/documentation/xdocs/userdocs/selectors/book.xml Modified: cocoon/trunk/src/documentation/xdocs/plan/book.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/plan/book.xml?view=diffr1=155184r2=155185 == --- cocoon/trunk/src/documentation/xdocs/plan/book.xml (original) +++ cocoon/trunk/src/documentation/xdocs/plan/book.xml Thu Feb 24 05:09:44 2005 @@ -31,6 +31,7 @@ menu label=Documentation menu-item label=Overview href=doc.html/ +menu-item label=Review docs href=review-sitemap-docs.html/ menu-item label=Changes href=changes-doc.html/ menu-item label=To Do href=todo-doc.html/ menu-item label=Issues href=issues-doc.html/ Modified: cocoon/trunk/src/documentation/xdocs/plan/index.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/plan/index.xml?view=diffr1=155184r2=155185 == --- cocoon/trunk/src/documentation/xdocs/plan/index.xml (original) +++ cocoon/trunk/src/documentation/xdocs/plan/index.xml Thu Feb 24 05:09:44 2005 @@ -62,15 +62,23 @@ ul lilink href=release.htmlRelease Plan/link - major things to do before the next release/li + lilink href=review-sitemap-docs.htmlReview Sitemap Docs/link +- a coordinated review of the generated documentation for sitemap + components. + /li + lilink href=http://wiki.apache.org/cocoon/22NewDocuments;New Cocoon 2.2 Documentation/link +- a coordinated review of all documentation, to prepare for the +Cocoon-2.2 release. + /li /ul ul - lilink href=doc.htmlDocumentation/link + liNot maintained: link href=doc.htmlDocumentation/link - revisions and additions are required/li - lilink href=changes-doc.htmlDocumentation History of Changes/link/li - lilink href=todo-doc.htmlDocumentation To Do List/link/li - lilink href=issues-doc.htmlDocumentation Issues/link/li - lilink href=linkstatus.htmlLinkstatus/link + liNot maintained: link href=changes-doc.htmlDocumentation History of Changes/link/li + liNot maintained: link href=todo-doc.htmlDocumentation To Do List/link/li + liNot maintained: link href=issues-doc.htmlDocumentation Issues/link/li + liNot recent: link href=linkstatus.htmlLinkstatus/link - Tools to assess and mend any broken hyperlinks/li /ul
svn commit: r155185 [3/3] - in cocoon/trunk/src/documentation/xdocs: plan/book.xml plan/index.xml plan/review-sitemap-docs.xml userdocs/selectors/book.xml userdocs/selectors/requestmethod-selector.xml userdocs/selectors/resourceexists-selector.xml
Modified: cocoon/trunk/src/documentation/xdocs/userdocs/selectors/book.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/selectors/book.xml?view=diffr1=155184r2=155185 == --- cocoon/trunk/src/documentation/xdocs/userdocs/selectors/book.xml (original) +++ cocoon/trunk/src/documentation/xdocs/userdocs/selectors/book.xml Thu Feb 24 05:09:44 2005 @@ -35,7 +35,9 @@ menu-item label=Host Selector href=host-selector.html/ menu-item label=Parameter Selector href=parameter-selector.html/ menu-item label=Request Attribute Selector href=requestattribute-selector.html/ +menu-item label=Request Method Selector href=requestmethod-selector.html/ menu-item label=Request Parameter Selector href=requestparameter-selector.html/ +menu-item label=Resource Exists Selector href=resourceexists-selector.html/ menu-item label=Regular-expression Header Selector href=regular-expression-header-selector.html/ /menu menu label=Optional Added: cocoon/trunk/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml?view=autorev=155185 == --- cocoon/trunk/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml (added) +++ cocoon/trunk/src/documentation/xdocs/userdocs/selectors/requestmethod-selector.xml Thu Feb 24 05:09:44 2005 @@ -0,0 +1,112 @@ +?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. +-- +!DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.0//EN ../../dtd/document-v10.dtd + +!-- + ![CDATA[ CVS Version: $Id: requestmethod-selector.xml 123717 2004-12-30 14:23:28Z vgritsenko $ + ]] +-- +document + header +titleRequestMethodSelector in Cocoon/title +version0.9/version +typeTechnical document/type +authors + person name=Cocoon Community email=dev@cocoon.apache.org/ +/authors +abstractThis document describes the RequestMethodSelector of Cocoon./abstract + /header + body +s1 title=RequestMethodSelector + table +tr + tdNAME/tdtdRequestMethod/td +/tr +tr + tdWHAT/tdtdThe codeRequestMethodSelector/code component is used to +select appropriate sitemap processing depending on the request method, +for example, codeGET/code or codePOST/code. + /td +/tr +tr + tdTYPE/tdtdSelector, Sitemap Component/td +/tr +tr + tdBLOCK/tdtdCore/td +/tr +tr + tdCLASS/tdtdorg.apache.cocoon.selection.RequestMethodSelector/td +/tr +tr + tdCACHEABLE/tdtdnot applicable/td +/tr + /table +/s1 +s1 title=Description + p +The RequestMethodSelector allows pipeline creation to be influenced by the method of +the request. For example, in a Cocoon Forms environment, a codeGET/code request +could be forwarded to a new FlowScript function, whilst a codePOST/code could be +forwarded to a continuation, for example: + /p + source![CDATA[ +map:match pattern=myform + map:select type=request-method +map:when test=GET + map:call function=myform/ +/map:when +map:when test=POST + map:call continuation=request-param:continuation-id/ +/map:when + /map:select +/map:match +]]/source +/s1 +s1 title=Configuration + + s2 title=Sitemap component configuration example +p/p +source![CDATA[ +map:selectors... + map:selector name=request-method +logger=sitemap.selector.request-method +src=org.apache.cocoon.selection.RequestMethodSelector/ + ... +/map:selectors +]]/source + /s2 + s2 title=Configuration +p + The request method selector does not require any specific configuration, other than + specifying a name and an implementing class, as in the example above. +/p + /s2 +/s1 +s1 title=History + p +2004-12-16: Created this document + /p +/s1 +s1 title=See also + p +General documentation about selectors is available at +link
svn commit: r149387 - cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml
Author: upayavira Date: Tue Feb 1 03:43:03 2005 New Revision: 149387 URL: http://svn.apache.org/viewcvs?view=revrev=149387 Log: Tabs to spaces Modified: cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml Modified: cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml?view=diffr1=149386r2=149387 == --- cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/documentation/content/xdocs/site.xml Tue Feb 1 03:43:03 2005 @@ -18,13 +18,13 @@ site label=Apache Cocoon href= xmlns=http://apache.org/forrest/linkmap/1.0; tab= about label=Project tab=project - index label=News - index label=Latest href=index.html/ - index label=Archive/ - /index - index label=Download/ - index label=History/ - index label=Related Projects/ +index label=News + index label=Latest href=index.html/ + index label=Archive/ +/index +index label=Download/ +index label=History/ +index label=Related Projects/ /about docs label=Community tab=community
svn commit: r159521 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Author: upayavira
Date: Wed Mar 30 12:31:30 2005
New Revision: 159521
URL: http://svn.apache.org/viewcvs?view=revrev=159521
Log:
Allow the CocoonBean to use an existing Cocoon object, if one exists.
You just need to do cocoonBean.setUseExistingCocoon(true);
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java?view=diffr1=159520r2=159521
==
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Wed Mar 30 12:31:30 2005
@@ -40,6 +40,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.CocoonAccess;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.CocoonComponentManager;
@@ -100,6 +101,7 @@
private HashMap empty = new HashMap();
private boolean initialized = false;
+private boolean useExistingCocoon = false;
//
// INITIALISATION METHOD
@@ -164,12 +166,16 @@
loadClasses(classList);
-cocoon = new Cocoon();
-ContainerUtil.enableLogging(cocoon, log);
-ContainerUtil.contextualize(cocoon, appContext);
-cocoon.setLoggerManager(logManager);
-ContainerUtil.initialize(cocoon);
-
+if (this.useExistingCocoon) {
+cocoon = getCocoon();
+}
+if (cocoon == null) {
+cocoon = new Cocoon();
+ContainerUtil.enableLogging(cocoon, log);
+ContainerUtil.contextualize(cocoon, appContext);
+cocoon.setLoggerManager(logManager);
+ContainerUtil.initialize(cocoon);
+}
} catch (Exception e) {
log.fatalError(Exception caught, e);
throw e;
@@ -177,6 +183,14 @@
initialized = true;
}
+private Cocoon getCocoon() {
+return new CocoonAccess() {
+final Cocoon instance() {
+return super.getCocoon();
+}
+}.instance();
+}
+
protected ExcaliburComponentManager getComponentManager() {
return cocoon.getComponentManager();
}
@@ -367,6 +381,11 @@
public void addLoadedClasses(List classList) {
this.classList.addAll(classList);
}
+
+public void setUseExistingCocoon(boolean useExistingCocoon) {
+this.useExistingCocoon = useExistingCocoon;
+}
+
/**
* Process single URI into given output stream.
*
svn commit: r160853 - cocoon/whiteboard/doc-repos/mapping-2.2.txt
Author: upayavira Date: Mon Apr 11 03:02:32 2005 New Revision: 160853 URL: http://svn.apache.org/viewcvs?view=revrev=160853 Log: Proposed mappings between hierarchical and flat names for new 2.2 documentation. Please review and update/correct/remove pages and their names. See separate mail to dev for more info. Added: cocoon/whiteboard/doc-repos/mapping-2.2.txt Added: cocoon/whiteboard/doc-repos/mapping-2.2.txt URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/mapping-2.2.txt?view=autorev=160853 == --- cocoon/whiteboard/doc-repos/mapping-2.2.txt (added) +++ cocoon/whiteboard/doc-repos/mapping-2.2.txt Mon Apr 11 03:02:32 2005 @@ -0,0 +1,268 @@ +bylaws-addendum.html: (TO GLOBAL) +catalog-test.html: (REMOVE) +css/testdoc.html: (REMOVE) +ctwig/ctwig-basic01.html: (REMOVE) +ctwig/ctwig-basic02.html: (REMOVE) +ctwig/ctwig-basic03.html: (REMOVE) +ctwig/ctwig-contributing.html: (REMOVE) +ctwig/ctwig-gettingstarted.html: (REMOVE) +ctwig/ctwig-installing.html: (REMOVE) +ctwig/ctwig-osx.html: (REMOVE) +ctwig/ctwig-transformations.html: (REMOVE) +ctwig/ctwig-why.html: (REMOVE) +ctwig/index.html: (REMOVE) +ctwig/sample/transformations/basic01/basic01-01.html: (REMOVE) +ctwig/sample/transformations/basic01/basic01-01.xml: (REMOVE) +ctwig/sample/transformations/basic02/basic02-01.html: (REMOVE) +ctwig/sample/transformations/basic02/basic02-01.xml: (REMOVE) +ctwig/sample/transformations/basic03/basic03-01.html: (REMOVE) +ctwig/sample/transformations/basic03/basic03-01.xml: (REMOVE) +developing/avalon.html: developing-with-avalon +developing/datasources.html: developing-with-datasources +developing/deli.html: deli +developing/deliquick.html: deli-quick +developing/extending.html: extending-cocoon +developing/httprequest.html: http-request +developing/index.html: developing +developing/parent-component-manager.html: parent-component-manager +developing/portal/basket.html: (REMOVE) +developing/portal/coplets.html: (REMOVE) +developing/portal/events.html: (REMOVE) +developing/portal/forms.html: (REMOVE) +developing/portal/index.html: (REMOVE) +developing/portal/portal-block.html: (REMOVE) +developing/portal/profiles.html: (REMOVE) +developing/source.html: sources +developing/stores.html: stores +developing/web3.html: sap-r3 +developing/webapps/authentication.html: authentication +developing/webapps/contexts.html: session-contexts +developing/webapps/forms.html: webapp-forms +developing/webapps/index.html: (REMOVE) +developing/webapps/portal.html: (REMOVE) +developing/webapps/session.html: session-transformer +dictionary.html: (REMOVE) +drafts/cocoon2-docbook.html: (REMOVE) +faq/faq-actions.html: (REMOVE) +faq/faq-aggregators.html: (REMOVE) +faq/faq-configure-c2.html: (REMOVE) +faq/faq-configure-environment.html: (REMOVE) +faq/faq-cvs.html: (REMOVE) +faq/faq-databases.html: (REMOVE) +faq/faq-debugging.html: (REMOVE) +faq/faq-generators.html: (REMOVE) +faq/faq-install.html: (REMOVE) +faq/faq-matchers.html: (REMOVE) +faq/faq-selectors.html: (REMOVE) +faq/faq-serializers.html: (REMOVE) +faq/faq-sitemap.html: (REMOVE) +faq/faq-transformers.html: (REMOVE) +faq/faq-xslt.html: (REMOVE) +faq/faq-xsp.html: (REMOVE) +faq/index.html: (REMOVE) +features.html: features +howto/howto-author-core-docs.html: howto-author-docs +howto/howto-author-faq.html: (REMOVE) +howto/howto-author-howto.html: (REMOVE) +howto/howto-author-snippet.html: (REMOVE) +howto/howto-bugzilla.html: (TO GLOBAL) +howto/howto-explore-samples.html: samples +howto/howto-flow-debugger.html: howto-flow-debugger +howto/howto-html-pdf-publishing.html: howto-pdf-publishing +howto/howto-paginator-transformer.html: paginator-transformer +howto/howto-patch.html: (TO GLOBAL) +howto/index.html: (REMOVE) +index.html: index +installing/index.html: installing +installing/jars.html: jars (KEEP THIS? Is it up to date? Or autogenerated?) +installing/requirements.html: install-requirements +installing/tests.html: tests +installing/updating.html: updating +introduction.html: introduction +license.html: (TO GLOBAL) +overview.html: overview +performancetips.html: performance-tips +plan/changes-doc.html: changes +plan/doc.html: doc-plan +plan/index.html: plan +plan/issues-doc.html: (REMOVE) +plan/linkstatus.html: (REMOVE) +plan/proposed-toc.html: (REMOVE) +plan/release.html: release +plan/review-sitemap-docs.html: review-sitemap-docs +plan/roadmap.html: roadmap +plan/samples.html: plan-samples +plan/todo-doc.html: todo +plan/updating.html: updating-to-2.2 +snippet/index.html: (REMOVE) +snippet/snippet-internal-pipeline.html: internal-pipelines +snippet/snippet-xslt-options.html: specifying-xslt-options +todo.html: todo2 (MERGE WITH todo) +tracks/first-steps-track.html: (REMOVE) +tracks/index.html: (REMOVE) +tracks/web-publishing-track.html: (REMOVE) +tutorial/index.html: tutorials +tutorial/tutorial-develop-webapp.html: (REMOVE) +tutorial/tutorial-generator.html: tutorial-custom-generator
svn commit: r161172 - cocoon/whiteboard/doc-repos/mapping-2.2.txt
Author: upayavira Date: Wed Apr 13 03:43:10 2005 New Revision: 161172 URL: http://svn.apache.org/viewcvs?view=revrev=161172 Log: Change format of mapping file to include name of blocks to which document belongs. Remove (REMOVE) - when no filename is given, it means the document shall be removed and not carried across into the new documentation system. Modified: cocoon/whiteboard/doc-repos/mapping-2.2.txt Modified: cocoon/whiteboard/doc-repos/mapping-2.2.txt URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/mapping-2.2.txt?view=diffr1=161171r2=161172 == --- cocoon/whiteboard/doc-repos/mapping-2.2.txt (original) +++ cocoon/whiteboard/doc-repos/mapping-2.2.txt Wed Apr 13 03:43:10 2005 @@ -1,268 +1,281 @@ -bylaws-addendum.html: (TO GLOBAL) -catalog-test.html: (REMOVE) -css/testdoc.html: (REMOVE) -ctwig/ctwig-basic01.html: (REMOVE) -ctwig/ctwig-basic02.html: (REMOVE) -ctwig/ctwig-basic03.html: (REMOVE) -ctwig/ctwig-contributing.html: (REMOVE) -ctwig/ctwig-gettingstarted.html: (REMOVE) -ctwig/ctwig-installing.html: (REMOVE) -ctwig/ctwig-osx.html: (REMOVE) -ctwig/ctwig-transformations.html: (REMOVE) -ctwig/ctwig-why.html: (REMOVE) -ctwig/index.html: (REMOVE) -ctwig/sample/transformations/basic01/basic01-01.html: (REMOVE) -ctwig/sample/transformations/basic01/basic01-01.xml: (REMOVE) -ctwig/sample/transformations/basic02/basic02-01.html: (REMOVE) -ctwig/sample/transformations/basic02/basic02-01.xml: (REMOVE) -ctwig/sample/transformations/basic03/basic03-01.html: (REMOVE) -ctwig/sample/transformations/basic03/basic03-01.xml: (REMOVE) -developing/avalon.html: developing-with-avalon -developing/datasources.html: developing-with-datasources -developing/deli.html: deli -developing/deliquick.html: deli-quick -developing/extending.html: extending-cocoon -developing/httprequest.html: http-request -developing/index.html: developing -developing/parent-component-manager.html: parent-component-manager -developing/portal/basket.html: (REMOVE) -developing/portal/coplets.html: (REMOVE) -developing/portal/events.html: (REMOVE) -developing/portal/forms.html: (REMOVE) -developing/portal/index.html: (REMOVE) -developing/portal/portal-block.html: (REMOVE) -developing/portal/profiles.html: (REMOVE) -developing/source.html: sources -developing/stores.html: stores -developing/web3.html: sap-r3 -developing/webapps/authentication.html: authentication -developing/webapps/contexts.html: session-contexts -developing/webapps/forms.html: webapp-forms -developing/webapps/index.html: (REMOVE) -developing/webapps/portal.html: (REMOVE) -developing/webapps/session.html: session-transformer -dictionary.html: (REMOVE) -drafts/cocoon2-docbook.html: (REMOVE) -faq/faq-actions.html: (REMOVE) -faq/faq-aggregators.html: (REMOVE) -faq/faq-configure-c2.html: (REMOVE) -faq/faq-configure-environment.html: (REMOVE) -faq/faq-cvs.html: (REMOVE) -faq/faq-databases.html: (REMOVE) -faq/faq-debugging.html: (REMOVE) -faq/faq-generators.html: (REMOVE) -faq/faq-install.html: (REMOVE) -faq/faq-matchers.html: (REMOVE) -faq/faq-selectors.html: (REMOVE) -faq/faq-serializers.html: (REMOVE) -faq/faq-sitemap.html: (REMOVE) -faq/faq-transformers.html: (REMOVE) -faq/faq-xslt.html: (REMOVE) -faq/faq-xsp.html: (REMOVE) -faq/index.html: (REMOVE) -features.html: features -howto/howto-author-core-docs.html: howto-author-docs -howto/howto-author-faq.html: (REMOVE) -howto/howto-author-howto.html: (REMOVE) -howto/howto-author-snippet.html: (REMOVE) -howto/howto-bugzilla.html: (TO GLOBAL) -howto/howto-explore-samples.html: samples -howto/howto-flow-debugger.html: howto-flow-debugger -howto/howto-html-pdf-publishing.html: howto-pdf-publishing -howto/howto-paginator-transformer.html: paginator-transformer -howto/howto-patch.html: (TO GLOBAL) -howto/index.html: (REMOVE) -index.html: index -installing/index.html: installing -installing/jars.html: jars (KEEP THIS? Is it up to date? Or autogenerated?) -installing/requirements.html: install-requirements -installing/tests.html: tests -installing/updating.html: updating -introduction.html: introduction -license.html: (TO GLOBAL) -overview.html: overview -performancetips.html: performance-tips -plan/changes-doc.html: changes -plan/doc.html: doc-plan -plan/index.html: plan -plan/issues-doc.html: (REMOVE) -plan/linkstatus.html: (REMOVE) -plan/proposed-toc.html: (REMOVE) -plan/release.html: release -plan/review-sitemap-docs.html: review-sitemap-docs -plan/roadmap.html: roadmap -plan/samples.html: plan-samples -plan/todo-doc.html: todo -plan/updating.html: updating-to-2.2 -snippet/index.html: (REMOVE) -snippet/snippet-internal-pipeline.html: internal-pipelines -snippet/snippet-xslt-options.html: specifying-xslt-options -todo.html: todo2 (MERGE WITH todo) -tracks/first-steps-track.html: (REMOVE) -tracks/index.html: (REMOVE) -tracks/web-publishing-track.html: (REMOVE) -tutorial/index.html: tutorials -tutorial/tutorial-develop-webapp.html: (REMOVE
svn commit: r161173 - cocoon/whiteboard/doc-repos/mapping-2.2.txt
Author: upayavira Date: Wed Apr 13 04:00:40 2005 New Revision: 161173 URL: http://svn.apache.org/viewcvs?view=revrev=161173 Log: Static which docs should go with which blocks. At the moment, this will just be used as a part of a naming convention. We can move the docs to appropriate repositories at a later stage. Modified: cocoon/whiteboard/doc-repos/mapping-2.2.txt Modified: cocoon/whiteboard/doc-repos/mapping-2.2.txt URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/mapping-2.2.txt?view=diffr1=161172r2=161173 == --- cocoon/whiteboard/doc-repos/mapping-2.2.txt (original) +++ cocoon/whiteboard/doc-repos/mapping-2.2.txt Wed Apr 13 04:00:40 2005 @@ -32,28 +32,28 @@ ctwig/sample/transformations/basic03/basic03-01.xml:: developing/avalon.html:: developing-with-avalon developing/datasources.html:: developing-with-datasources -developing/deli.html:: deli -developing/deliquick.html:: deli-quick +developing/deli.html:deli:index +developing/deliquick.html:deli: deli-quick developing/extending.html:: extending-cocoon developing/httprequest.html:: http-request developing/index.html:: developing developing/parent-component-manager.html:: parent-component-manager -developing/portal/basket.html:: -developing/portal/coplets.html:: -developing/portal/events.html:: -developing/portal/forms.html:: -developing/portal/index.html:: -developing/portal/portal-block.html:: -developing/portal/profiles.html:: +developing/portal/basket.html:portal:basket +developing/portal/coplets.html:portal:coplets +developing/portal/events.html:portal:events +developing/portal/forms.html:portal:forms +developing/portal/index.html:portal:index +developing/portal/portal-block.html:portal:portal-block +developing/portal/profiles.html:portal:profiles developing/source.html:: sources developing/stores.html:: stores -developing/web3.html:: sap-r3 -developing/webapps/authentication.html:: authentication -developing/webapps/contexts.html:: session-contexts -developing/webapps/forms.html:: webapp-forms +developing/web3.html:web3: sap-r3 +developing/webapps/authentication.html:authentication-fw: authentication +developing/webapps/contexts.html:session-fw: session-contexts +developing/webapps/forms.html:session-fw: webapp-forms developing/webapps/index.html:: developing/webapps/portal.html:: -developing/webapps/session.html:: session-transformer +developing/webapps/session.html:session-fw: session-transformer dictionary.html:: drafts/cocoon2-docbook.html:: faq/faq-actions.html:: @@ -78,12 +78,12 @@ howto/howto-author-faq.html:: howto/howto-author-howto.html:: howto/howto-author-snippet.html:: -howto/howto-bugzilla.html:: (TO GLOBAL) +howto/howto-bugzilla.html:global:howto-bugzilla howto/howto-explore-samples.html:: samples howto/howto-flow-debugger.html:: howto-flow-debugger howto/howto-html-pdf-publishing.html:: howto-pdf-publishing howto/howto-paginator-transformer.html:: paginator-transformer -howto/howto-patch.html:: (TO GLOBAL) +howto/howto-patch.html:global:howto-patch howto/index.html:: index.html:: index installing/index.html:: installing @@ -92,7 +92,7 @@ installing/tests.html:: tests installing/updating.html:: updating introduction.html:: introduction -license.html:: (TO GLOBAL) +license.html:global:license overview.html:: overview performancetips.html:: performance-tips plan/changes-doc.html:: changes @@ -120,11 +120,11 @@ tutorial/tutorial-rmi-generator.html:: tutorial-rmi-generator tutorial/tutorial-shots.html:: userdocs/actions/actions.html:: actions -userdocs/actions/database-actions.html:: (MOVE TO DATABASES BLOCK) -userdocs/actions/script-action.html:: (MOVE TO BSF BLOCK) +userdocs/actions/database-actions.html:databases:database-actions +userdocs/actions/script-action.html:bsf:script-action -userdocs/actions/sendmail-action.html:: (MOVE TO MAIL BLOCK) -userdocs/actions/session-action.html:: session-action +userdocs/actions/sendmail-action.html:mail:sendmail-action +userdocs/actions/session-action.html:session-fw:session-action userdocs/concepts/actions.html:: actions2 (MERGE WITH ACTIONS) userdocs/concepts/caching.html:: caching userdocs/concepts/catalog.html:: catalog @@ -143,7 +143,7 @@ userdocs/concepts/storejanitor.html:: store-janitor userdocs/concepts/validation.html:: userdocs/concepts/views.html:: views -userdocs/concepts/xmlsearching.html:: (TO LUCENE BLOCK) +userdocs/concepts/xmlsearching.html:lucene:xml-searching userdocs/flow/api.html:: flow-api userdocs/flow/continuations.html:: flow-continuations userdocs/flow/how-does-it-work.html:: flow-workings @@ -183,26 +183,26 @@ userdocs/generators/calendar-generator.html:: calendar-generator userdocs/generators/directory-generator.html:: directory-generator userdocs/generators/error-generator.html:: error-generator -userdocs/generators/extractor-generator.html:: extractor-generator +userdocs/generators/extractor
svn commit: r161184 - cocoon/trunk/src/documentation/src/content/xdocs/site.xml
Author: upayavira Date: Wed Apr 13 07:24:21 2005 New Revision: 161184 URL: http://svn.apache.org/viewcvs?view=revrev=161184 Log: An updated site.xml, including all of the legacy documentation that we are likely to keep, organised hierarchically (with the help of some clever throw-away Perl). Modified: cocoon/trunk/src/documentation/src/content/xdocs/site.xml Modified: cocoon/trunk/src/documentation/src/content/xdocs/site.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/src/content/xdocs/site.xml?view=diffr1=161183r2=161184 == --- cocoon/trunk/src/documentation/src/content/xdocs/site.xml (original) +++ cocoon/trunk/src/documentation/src/content/xdocs/site.xml Wed Apr 13 07:24:21 2005 @@ -150,12 +150,258 @@ /doc legacy label=Legacy tab=legacy -doc label=Overview href=c21_index.html/ -doc label=Misc. - doc label=introduction href=c21_introduction.html/ -/doc -doc label=Concepts - doc label=index href=c21_concepts_index.html/ -/doc + snippet label=snippet +doc label=snippet-internal-pipeline href=c21-internal-pipelines.html/ +doc label=snippet-xslt-options href=c21-specifying-xslt-options.html/ + /snippet + doc label=license href=c21-block-global-license.html/ + userdocs label=userdocs +actions label=actions + doc label=sendmail-action href=c21-block-mail-sendmail-action.html/ + doc label=session-action href=c21-block-session-fw-session-action.html/ + doc label=actions href=c21-actions.html/ + doc label=script-action href=c21-block-bsf-script-action.html/ + doc label=database-actions href=c21-block-databases-database-actions.html/ +/actions +xsp label=xsp + doc label=xsp-internals href=c21-block-xsp-internals.html/ + doc label=session href=c21-block-xsp-session.html/ + doc label=logicsheet-forms href=c21-block-xsp-logicsheet-forms.html/ + doc label=logicsheet href=c21-block-xsp-logicsheet.html/ + doc label=request href=c21-block-xsp-request.html/ + doc label=esql href=c21-block-xsp-esql.html/ + doc label=sendmail href=c21-block-xsp-sendmail.html/ + doc label=index href=c21-block-xsp-index.html/ + doc label=sessions href=c21-block-xsp-sessions.html/ + doc label=logicsheet-concepts href=c21-block-xsp-logicsheet-concepts.html/ +/xsp +serializers label=serializers + doc label=ziparchive-serializer href=c21-ziparchive-serializer.html/ + doc label=xhtml-serializer href=c21-xhtml-serializer.html/ + doc label=vrml-serializer href=c21-vrml-serializer.html/ + doc label=pdf-serializer href=c21-block-fop-pdf-serializer.html/ + doc label=serializers href=c21-serializers.html/ + doc label=svgxml-serializer href=c21-block-batik-svgxml-serializer.html/ + doc label=pcl-serializer href=c21-block-fop-pcl-serializer.html/ + doc label=link-serializer href=c21-link-serializer.html/ + doc label=svg-serializer href=c21-block-batik-svg-serializer.html/ + doc label=svgpng-serializer href=c21-block-batik-svgpng-serializer.html/ + doc label=xls-serializer href=c21-block-poi-xls-serializer.html/ + doc label=text-serializer href=c21-text-serializer.html/ + doc label=xml-serializer href=c21-xml-serializer.html/ + doc label=svgjpeg-serializer href=c21-block-batik-svgjpeg-serializer.html/ + doc label=ps-serializer href=c21-block-fop-ps-serializer.html/ + doc label=svgtiff-serializer href=c21-block-batik-svgtiff-serializer.html/ + doc label=wap-serializer href=c21-wap-serializer.html/ + doc label=html-serializer href=c21-html-serializer.html/ +/serializers +generators label=generators + doc label=jsp-generator href=c21-block-jsp-jsp-generator.html/ + doc label=serverpages-generator href=c21-block-xsp-serverpages-generator.html/ + doc label=xpathdirectory-generator href=c21-xpathdirectory-generator.html/ + doc label=stream-generator href=c21-stream-generator.html/ + doc label=search-generator href=c21-block-lucene-search-generator.html/ + doc label=script-generator href=c21-block-bsf-script-generator.html/ + doc label=calendar-generator href=c21-calendar-generator.html/ + doc label=xmldb-generator href=c21-block-xmldb-xmldb-generator.html/ + doc label=xmldbcollection-generator href=c21-block-xmldb-xmldbcollection-generator.html/ + doc label=wsproxy-generator href=c21-block-proxy-webserviceproxy-generator.html/ + doc label=extractor-generator href=c21-block-batik-extractor-generator.html/ + doc label=profile-generator href=c21-block-profiler-profiler-generator.html/ + doc label=jx-generator href=c21-jxtemplate-generator.html/ + doc label=html-generator href=c21-html-generator.html/ + doc label=linkstatus-generator href=c21-linkstatus-generator.html/ + doc label=directory-generator href=c21-directory
svn commit: r164967 [3/3] - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-committer/ OLD-committers/ OLD-contrib/ OLD-devinfo-merge-to-committer/ OLD-fr-mail-lists/ OLD-francais/ OLD-history/ OLD-hosting/ OLD-incubation/ OLD-index/ OLD-links/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-mail-archives/ OLD-mail-lists/ OLD-news/ OLD-pmc/ OLD-releasing/ OLD-versioning/
Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html?rev=164967view=auto == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html (added) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html Wed Apr 27 03:07:09 2005 @@ -0,0 +1,364 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +html +head +META http-equiv=Content-Type content=text/html; charset=UTF-8 +titleThe Apache Cocoon Versioning Manifesto - DRAFT/title +link href=http://purl.org/DC/elements/1.0/; rel=schema.DC +/head +body + +div class=warningDRAFT INITIAL VERSION/div + + +p + This document covers how the Cocoon project is versioned. + Since Cocoon is a framework, it is very important to define a stable API + for users and developers. However, we also need to move Cocoon forward, + technologically. To balance these two needs, a strict policy of versioning + is required, which users can rely upon to understand the limitations, + restrictions, and the changes that can occur from one release to the next. +/p + + +h1Basics/h1 + + +p +Versions are denoted using a standard triplet of integers: + /p + +p +MAJOR.MINOR.PATCH. + /p + +p +The basic intent is that MAJOR versions are incompatible, large-scale +upgrades of the API. MINOR versions retain usage and extension compatibility +with older minor versions, and changes in the PATCH level are perfectly +compatible, forwards and backwards. + /p + +p +Following the main design principle of Cocoon, the pyramid of contracts, +we distinguish between users and developers of Cocoon. A very rough distinction +between them is that a user writes the application using Cocoon without +coding Java. There is one exception to this rule: flow script - the java +script is also written by the user. + /p + +p +A developer codes Java and provides additional functionality for the user, +so a developer extends Cocoon. + /p + +p +Therefore we distinguish between usage compatibility (user API) and +extension compatibility (developer API). Both compatibility levels cover +some kind of source compatibility. Cocoon does not provide binary +compatibility. But as Cocoon is distributed as a source release that +you have to compile anyway, it's safer to compile your own application +code (if any) using the version of Cocoon that your application runs on. + /p + +p +There are several reasons why recompilation is recommended. We strongly +advise to compile Cocoon (or any other Java application) with the same +JDK that is later used in production. + /p + +ul + +li + Ensures that you have reliable operating environment. For example if + you compile a Java application with JDK 1.4 in JDK 1.3 compatible mode + it still can happen that your application doesn't run properly with JDK 1.3! + This is not Cocoon specific! +/li + +li + Allows you to easily configure which parts you want. The selection of + wanted blocks is currently evaluated at build time, so if you want + to have an additional block/remove a block in your Cocoon installation, + you have to rebuild Cocoon. +/li + +li + You will get warned about deprecated parts of the API. +/li + +/ul + + +h1Usage Compatibility/h1 + + +p + +emUsage/em compatibility guarantees that an application written by +a Cocoon user is compatible. All files developed by a typical Cocoon +user like xml files, sitemaps, stylesheets (elements and namespace declarations) +keep on being picked up by the machinery and are dealt with correctly +(sitemap semantics, generator/transformer-picked up elements, config +file entries...). + /p + +p +In fact this should cover everything (including flow script) but except +your own Java code. + /p + +p +Applications that write against a particular version will remain usage +compatible against later versions, until the major number changes. + /p + +p +Writing an application against a version means that this application +does not use any deprecated API of that version. Therefore minor version +changes are only usage compatible from one minor version to the direct +
svn commit: r164967 [1/3] - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-committer/ OLD-committers/ OLD-contrib/ OLD-devinfo-merge-to-committer/ OLD-fr-mail-lists/ OLD-francais/ OLD-history/ OLD-hosting/ OLD-incubation/ OLD-index/ OLD-links/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-mail-archives/ OLD-mail-lists/ OLD-news/ OLD-pmc/ OLD-releasing/ OLD-versioning/
Author: upayavira Date: Wed Apr 27 03:07:09 2005 New Revision: 164967 URL: http://svn.apache.org/viewcvs?rev=164967view=rev Log: Adding old 'site', for copying across into new place, just like c21- files in 2.2 documentation. Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.1/ cocoon/whiteboard/doc
svn commit: r164967 [2/3] - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-committer/ OLD-committers/ OLD-contrib/ OLD-devinfo-merge-to-committer/ OLD-fr-mail-lists/ OLD-francais/ OLD-history/ OLD-hosting/ OLD-incubation/ OLD-index/ OLD-links/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-mail-archives/ OLD-mail-lists/ OLD-news/ OLD-pmc/ OLD-releasing/ OLD-versioning/
Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html?rev=164967view=auto == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html (added) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html Wed Apr 27 03:07:09 2005 @@ -0,0 +1,66 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +html +head +META http-equiv=Content-Type content=text/html; charset=UTF-8 +titleThe Apache Cocoon Project/title +link href=http://purl.org/DC/elements/1.0/; rel=schema.DC +meta content=Cocoon Developers name=DC.Creator +/head +body + +h1Apache Cocoon/h1 + + +pApache Cocoon is a web development framework built around the concepts of + separation of concerns and component-based web development./p + + +pCocoon implements these concepts around the notion of 'component pipelines', + each component on the pipeline specializing on a particular operation. This + makes it possible to use a Lego(tm)-like approach in building web solutions, + hooking together components into pipelines without any required programming./p + + +pCocoon is web glue for your web application development needs. It is a glue + that keeps concerns separate and allows parallel evolution of all aspects of + a web application, improving development pace and reducing the chance of + conflicts./p + + + +h1The Apache Cocoon Project/h1 + + +pThe emApache Cocoon Project/em is the open source community project + developing Apache Cocoon and Cocoon-based application frameworks. With strong + foundations in XML-based server-side web application frameworks, the Apache Cocoon + Project consists of a group of people that share common values on + collaboration-intensive and community-based quality open source development. + The Apache Cocoon Project is proud to share these values with its parent + organization: The Apache Software Foundation./p + + +pThe Apache Cocoon project currently consists of a href=2.1/Apache Cocoon/a + itself. The a class=external href=http://lenya.apache.org/;Lenya/a CMS, which is + now a top-level project, started its life at Apache as an + a href=community/incubation.htmlincubating/a Cocoon subproject./p + + +pThe a href=link/index.htmllinks section/a also lists a number of Cocoon-related + projects and resources./p + + + +h1Documentation/h1 + + +p +The documentation is located in each module and on the website +under each specific Cocoon version. There is also the community +effort to maintain the extensive +a class=external href=http://wiki.apache.org/cocoon/;Cocoon Wiki/a. + /p + + +/body +/html Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml?rev=164967view=auto == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml (added) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml Wed Apr 27 03:07:09 2005 @@ -0,0 +1,9 @@ +?xml version=1.0? +meta + authors +author contact=http://cocoon.apache.org;Cocoon Community/author + /authors + legacy +original-filenameindex.html/original-filename + /legacy +/meta Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml?rev=164967view=auto == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml (added) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml Wed Apr 27 03:07:09 2005 @@ -0,0 +1,3 @@ +?xml version=1.0? +comments +/comments Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html?rev=164967view=auto == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html (added) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html Wed Apr 27 03:07:09 2005 @@ -0,0 +1,47 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +html +head +META http-equiv=Content-Type content=text/html; charset=UTF-8 +titleCocoon Links Overview/title +link
svn commit: r165000 - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: OLD-links/ links/
Author: upayavira Date: Wed Apr 27 09:00:41 2005 New Revision: 165000 URL: http://svn.apache.org/viewcvs?rev=165000view=rev Log: Moving the links page (my first SVN move, hope it works!) Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/links/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/ Removed: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/
svn commit: r165005 - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-history/ OLD-hosting/ OLD-index/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-news/ history/ hosting/ index/ links/ livesites-1.x/ livesites-2.0/ livesites-2.1/ news-archives/ news/
Author: upayavira Date: Wed Apr 27 09:11:04 2005 New Revision: 165005 URL: http://svn.apache.org/viewcvs?rev=165005view=rev Log: First pass at moving docs around in the 'global site' repository. More work to do yet. Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html - copied, changed from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-1.x/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.0/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.1/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/news/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-news/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/news-archives/ - copied from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/ Removed: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.1/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-news/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/links/ Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/news/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/site.xml Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html?rev=165005r1=164999r2=165005view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html Wed Apr 27 09:11:04 2005 @@ -109,7 +109,7 @@ Enter a meaningful title after the words Link Hosting: in the subject, provide a short summary of your site and do not forget to tell us the URL. -You could also follow the a href=../community/contrib.htmlContributing/a +You could also follow the a href=contributing.htmlContributing/a page to make it easier for everyone. /p Copied: cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html (from r164999, cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html) URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html?p2=cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.htmlp1=cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.htmlr1=164999r2=165005rev=165005view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html Wed Apr 27 09:11:04 2005 @@ -40,13 +40,13 @@ organization: The Apache Software Foundation./p -pThe Apache Cocoon project currently consists of a href=2.1/Apache Cocoon/a +pThe Apache Cocoon project currently consists of a href=2.2/Apache Cocoon/a itself. The a class=external href=http://lenya.apache.org/;Lenya/a CMS, which is now a top-level project, started its life at Apache as an - a href=community/incubation.htmlincubating/a Cocoon subproject./p + a class=external href=http://incubator.apache.org;incubating/a Cocoon subproject./p -pThe a href=link/index.htmllinks section/a also lists a number of Cocoon-related +pThe a href
svn commit: r165197 - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ cocoon-based-projects/ history/ related-projects/
Author: upayavira Date: Thu Apr 28 14:03:01 2005 New Revision: 165197 URL: http://svn.apache.org/viewcvs?rev=165197view=rev Log: Some pages that didn't make it into the new repository. Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/related-projects/ cocoon/whiteboard/doc-repos/global/src/content/xdocs/related-projects/comments_en.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/related-projects/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/related-projects/meta.xml Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/content_en.html cocoon/whiteboard/doc-repos/global/src/content/xdocs/site.xml Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/comments_en.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/comments_en.xml?rev=165197view=auto == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/comments_en.xml (added) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/comments_en.xml Thu Apr 28 14:03:01 2005 @@ -0,0 +1,6 @@ +?xml version=1.0? +comments + comment name=Reinhard Poetz by=http://www.poetz.cc; subject=the first comment +my first comment + /comment +/comments Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/content_en.html URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/content_en.html?rev=165197view=auto == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/content_en.html (added) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/cocoon-based-projects/content_en.html Thu Apr 28 14:03:01 2005 @@ -0,0 +1,91 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +html +head +META http-equiv=Content-Type content=text/html; charset=UTF-8 +titleCocoon Based Projects/title +link href=http://purl.org/DC/elements/1.0/; rel=schema.DC +/head +body + h1Cocoon-Based Projects/h1 + pA number of other projects use Cocoon as their underlying framework. +This page lists some of them, although there are undoubtably more./p + + h2Apache Forrest/h2 + pa class=external href=http://forrest.apache.org;Apache Forrest/a is + an XML standards-oriented documentation framework based upon Apache Cocoon, + providing XSLT stylesheets and schemas, images and other resources. Forrest + uses these to render the source content into a website via command-line, + robot, or dynamic application./p + h2Apache Lenya/h2 + pa href=http://lenya.apache.org;Apache Lenya/a is an Open-Source +Content Management and Publishing System written in 100% pure Java. + It is based on open standards such as XML ( DOM, SAX) and XSLT. + One of its core components is the pipeline processor Cocoon from the Apache + Software Foundation./p + h2FAQ Project/h2 + pa href=http://opensource.yourdecor.ca/faq1/index.html;FAQ Project/a is a +web-based, database driven that make use of JSP and XML and Cocoon./p + + h2sp.xsl/h2 + pa href=http://www.sourcepole.com/sources/software/sp.xsl/;sp.xsl/a + generates simple websites with XSL./p + + h2WebEditor WCMS/h2 + pa href=http://webeditor.sourceforge.net/;WebEditor WCMS/a is a web +application to manage the content of a news-based web site (you know Slashdot?). + It's based on Apache Cocoon and Apache/ApacheJServ/Tomcat as Web Server/Servlet + platform./p + + h2Chello - A minimal Cocoon 2 application/h2 + pa href=http://chello.sourceforge.net/;Chello/a is an Open Source minimal +Cocoon 2 application. It features project compilation using ANT, + unit testing with JUnit, functional testing with HTTPUnit, continuous integration + process with CruiseControl, documentation generation for Java code using javadoc + and XSL Stylesheets using XSLDoc, project documentation using Cocoon and automatic + build of web archive file (WAR) for easy distribution./p + + h2Holometabolous - CMS, Profiling and App Suite/h2 + pa href=http://sourceforge.net/projects/holometabolous/;Holometabolous /a +is a content management, profiling and application suite built on top of software +from the Apache foundation, most especially Cocoon, with a database back
svn commit: r165198 - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: history/meta.xml hosting/meta.xml livesites-1.x/meta.xml livesites-2.0/meta.xml livesites-2.1/meta.xml news-archives/meta.xml news/meta.xml
Author: upayavira Date: Thu Apr 28 14:09:02 2005 New Revision: 165198 URL: http://svn.apache.org/viewcvs?rev=165198view=rev Log: Removing legacy node, so that we don't get a huge This page hasn't been reviewed warning. Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-1.x/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.0/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/news-archives/meta.xml cocoon/whiteboard/doc-repos/global/src/content/xdocs/news/meta.xml Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/meta.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/meta.xml?rev=165198r1=165197r2=165198view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/meta.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/meta.xml Thu Apr 28 14:09:02 2005 @@ -3,7 +3,4 @@ authors author contact=http://cocoon.apache.org;Cocoon Community/author /authors - legacy -original-filenamehistory.html/original-filename - /legacy /meta Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/meta.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/meta.xml?rev=165198r1=165197r2=165198view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/meta.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/meta.xml Thu Apr 28 14:09:02 2005 @@ -3,7 +3,4 @@ authors author contact=http://cocoon.apache.org;Cocoon Community/author /authors - legacy -original-filenamelink/hosting.html/original-filename - /legacy /meta Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-1.x/meta.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-1.x/meta.xml?rev=165198r1=165197r2=165198view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-1.x/meta.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-1.x/meta.xml Thu Apr 28 14:09:02 2005 @@ -3,7 +3,4 @@ authors author contact=http://cocoon.apache.org;Cocoon Community/author /authors - legacy -original-filenamelink/livesites-1.x.html/original-filename - /legacy /meta Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.0/meta.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.0/meta.xml?rev=165198r1=165197r2=165198view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.0/meta.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.0/meta.xml Thu Apr 28 14:09:02 2005 @@ -3,7 +3,4 @@ authors author contact=http://cocoon.apache.org;Cocoon Community/author /authors - legacy -original-filenamelink/livesites-2.0.html/original-filename - /legacy /meta Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/meta.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/meta.xml?rev=165198r1=165197r2=165198view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/meta.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/meta.xml Thu Apr 28 14:09:02 2005 @@ -3,7 +3,4 @@ authors author contact=http://cocoon.apache.org;Cocoon Community/author /authors - legacy -original-filenamelink/livesites-2.1.html/original-filename - /legacy /meta Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/news-archives/meta.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/news-archives/meta.xml?rev=165198r1=165197r2=165198view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/news-archives/meta.xml (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/news-archives/meta.xml Thu Apr 28 14:09:02 2005 @@ -3,7 +3,4 @@ authors author contact=http://cocoon.apache.org;Cocoon Community/author /authors - legacy -original-filenamenews/archives.html/original-filename - /legacy /meta
svn commit: r165622 - /cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-pmc/content_en.html
Author: upayavira Date: Mon May 2 05:52:46 2005 New Revision: 165622 URL: http://svn.apache.org/viewcvs?rev=165622view=rev Log: Applying Sylvain's commit to the new global repos. We need to keep both up to date, so as not to loose changes! Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-pmc/content_en.html Modified: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-pmc/content_en.html URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-pmc/content_en.html?rev=165622r1=165621r2=165622view=diff == --- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-pmc/content_en.html (original) +++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-pmc/content_en.html Mon May 2 05:52:46 2005 @@ -45,6 +45,12 @@ liAntonio Gallardo/li + +liLeszek Gawron/li + + +liRalph Goers/li + liVadim Gritsenko/li
