cvs commit: cocoon-2.1 gump.xml
vgritsenko2003/08/15 08:34:23 Modified:.gump.xml Log: Jing JAR has been moved Revision ChangesPath 1.75 +2 -2 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- gump.xml 7 Aug 2003 07:27:01 - 1.74 +++ gump.xml 15 Aug 2003 15:34:22 - 1.75 @@ -1047,7 +1047,7 @@ description Jing performs XML Validation using RelaxNG schemas /description -home nested=lib/optional/ +home nested=tools/lib/ jar name=jing-20020724.jar/ /project
cvs commit: cocoon-2.1/src/webapp/samples/aggregation/content - New directory
vgritsenko2003/08/15 18:36:48 cocoon-2.1/src/webapp/samples/aggregation/content - New directory
cvs commit: cocoon-2.1/src/webapp/samples/xinclude/content includehtml.xml loopinclusion.xml somehtml.xhtml test.xml test2.xml test3.xml test4.xml test5.xml xmlbase.xml
vgritsenko2003/08/15 18:44:12 Modified:src/blocks/asciiart/conf asciiart.xsamples src/blocks/batik/samples samples.xml src/webapp/samples samples.xml src/webapp/samples/aggregation samples.xml sitemap.xmap Added: src/webapp/samples/aggregation/content includehtml.xml loopinclusion.xml somehtml.xhtml test.xml test2.xml test3.xml test4.xml test5.xml xmlbase.xml Removed: src/webapp/samples/xinclude samples.xml sitemap.xmap src/webapp/samples/xinclude/content includehtml.xml loopinclusion.xml somehtml.xhtml test.xml test2.xml test3.xml test4.xml test5.xml xmlbase.xml Log: Samples tweaks: move xinclude inside aggregation, together with cinclude. Add link to mozilla svg project. Revision ChangesPath 1.2 +2 -2 cocoon-2.1/src/blocks/asciiart/conf/asciiart.xsamples Index: asciiart.xsamples === RCS file: /home/cvs/cocoon-2.1/src/blocks/asciiart/conf/asciiart.xsamples,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- asciiart.xsamples 20 Jul 2003 04:47:27 - 1.1 +++ asciiart.xsamples 16 Aug 2003 01:44:12 - 1.2 @@ -2,8 +2,8 @@ xsamples xpath=/samples unless=[EMAIL PROTECTED]'asciiart'] - group name=asciiart -sample name=ASCII art href=asciiart/ + group name=ASCII Art +sample name=ASCII Art href=asciiart/ Plain text files with character-based artwork and diagrams are presented in various formats, e.g. plain text, JPEG, PNG /sample 1.4 +4 -1 cocoon-2.1/src/blocks/batik/samples/samples.xml Index: samples.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/batik/samples/samples.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- samples.xml 7 May 2003 19:15:02 - 1.3 +++ samples.xml 16 Aug 2003 01:44:12 - 1.4 @@ -56,6 +56,9 @@ sample name=Adobe SVG Viewer href=http://www.adobe.com/svg/viewer/install/main.html; SVG browser plugin /sample +sample name=Mozilla SVG Project href=http://www.mozilla.org/projects/svg/; + Mozilla with native SVG support +/sample /group /samples 1.24 +98 -104 cocoon-2.1/src/webapp/samples/samples.xml Index: samples.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/samples.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- samples.xml 15 Aug 2003 15:57:32 - 1.23 +++ samples.xml 16 Aug 2003 01:44:12 - 1.24 @@ -5,87 +5,82 @@ samples name=Cocoon Samples xmlns:xlink=http://www.w3.org/1999/xlink; group name=The Power of XML - sample name=Hello World! href=hello-world/ -The complete separation between content and style -leads to a very powerful multi-channeling solution where you can -apply different stylesheets to the same content and generate different -flavors of it. - /sample - sample name=XML-ized web sites href=sites/ -A couple of existing web sites have been xml-ized to show you -how easier it is to handle pure-content markup. - /sample - sample name=Presentation Slides href=slides/slides -An example of more complex use of XSLT for navigation and content filtering. - /sample - sample name=Internationalization (i18n) amp; Localization (l10n) href=i18n/ -Since XML is based on Unicode, it can be used to encode all types of -languages. Here is an example of the power of such an approach with -the help of those i18n and l10n Cocoon facilities. - /sample - sample name=Syndication and Content Aggregation href=aggregation/ -Separation of content and style allows not only to serve your content -in different ways, but also to syndicate, aggregate or otherwise transform -content provided by other web sites. - /sample - sample name=Catalog Entity Resolver href=catalog/ -XML is handy but also very complex. Cocoon integrates a number of -facilities to help you during your journey through XML-land. One of these -is the centralized handling of resolving network resources -(e.g. DTDs, symbols, character entity sets, images) to local copies through -the use of catalogs. - /sample - sample name=XInclude href=xinclude/ - XInclude transformer sample. XInclude merges XML documents, or parts of - them, into one document. - /sample +sample name=Hello World! href=hello-world/ + The complete separation between content and style + leads to a very
cvs commit: cocoon-2.1/src/documentation/xdocs/installing index.xml
vgritsenko2003/08/07 19:51:59 Modified:src/documentation/xdocs/installing index.xml Log: Correct link to snapshots Revision ChangesPath 1.9 +1 -1 cocoon-2.1/src/documentation/xdocs/installing/index.xml Index: index.xml === RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/installing/index.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- index.xml 3 Jul 2003 14:48:10 - 1.8 +++ index.xml 8 Aug 2003 02:51:59 - 1.9 @@ -68,7 +68,7 @@ s2 title=Download a development snapshot p You also can download one of the development snapshots from the -link href=http://xml.apache.org/cocoon/mirror.cgi#nightly;CVS snapshots/link +link href=http://cocoon.apache.org/mirror.cgi#nightly;CVS snapshots/link directory. /p /s2
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/store/impl DefaultStore.java
vgritsenko2003/08/12 09:01:01
Modified:src/java/org/apache/cocoon/components/store/impl
DefaultStore.java
Log:
Remove debug printout
Revision ChangesPath
1.6 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java
Index: DefaultStore.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultStore.java 12 Aug 2003 15:50:40 - 1.5
+++ DefaultStore.java 12 Aug 2003 16:01:01 - 1.6
@@ -194,8 +194,6 @@
getLogger().debug(Disposing);
if (super.m_Index != null) {
-System.out.println(-- DISPOSING --);
-super.m_Index.dumpTree(System.out);
super.m_Index.close();
}
cvs commit: cocoon-2.1 status.xml
vgritsenko2003/08/12 08:50:40
Modified:src/java/org/apache/cocoon/components/store/impl
DefaultStore.java
.status.xml
Log:
Fix jisp store impl: reuse index file
Revision ChangesPath
1.5 +32 -5
cocoon-2.1/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java
Index: DefaultStore.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultStore.java 26 Jul 2003 15:17:25 - 1.4
+++ DefaultStore.java 12 Aug 2003 15:50:40 - 1.5
@@ -57,6 +57,7 @@
import com.coyotegulch.jisp.IndexedObjectDatabase;
import com.coyotegulch.jisp.KeyNotFound;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -81,7 +82,8 @@
implements org.apache.excalibur.store.Store,
Contextualizable,
ThreadSafe,
- Parameterizable {
+ Parameterizable,
+ Disposable {
/** The context containing the work and the cache directory */
protected Context context;
@@ -169,9 +171,17 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug(Datafile exists: + databaseExists);
}
-super.m_Database = new IndexedObjectDatabase(databaseFile.toString(),
!databaseExists);
-super.m_Index = new BTreeIndex(indexFile.toString(),
-order, this.getNullKey(), false);
+super.m_Database = new IndexedObjectDatabase(databaseFile.toString(),
+ !databaseExists);
+
+if (!databaseExists) {
+// Create new index
+super.m_Index = new BTreeIndex(indexFile.toString(),
+ order, super.getNullKey(), false);
+} else {
+// Open existing index
+super.m_Index = new BTreeIndex(indexFile.toString());
+}
super.m_Database.attachIndex(super.m_Index);
} catch (KeyNotFound ignore) {
} catch (Exception e) {
@@ -179,4 +189,21 @@
}
}
+public void dispose() {
+try {
+getLogger().debug(Disposing);
+
+if (super.m_Index != null) {
+System.out.println(-- DISPOSING --);
+super.m_Index.dumpTree(System.out);
+super.m_Index.close();
+}
+
+if (super.m_Database != null) {
+super.m_Database.close();
+}
+} catch (Exception e) {
+getLogger().error(dispose(..) Exception, e);
+}
+}
}
1.117 +7 -3 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- status.xml12 Aug 2003 15:48:02 - 1.116
+++ status.xml12 Aug 2003 15:50:40 - 1.117
@@ -202,6 +202,10 @@
changes
release version=@version@ date=@date@
+ action dev=VG type=fix
+ Fix Jisp based persistent store: close database files on Cocoon shutdown and
+ re-use existing database and index files on startup.
+ /action
action dev=SW type=fix fixes-bug=22239
Views are now always loaded before resources, ensuring proper call of views
from resources.
Redeclaring a component (e.g. file generator) with no label attribute was
wrongly inheriting
@@ -210,10 +214,10 @@
/release
release version=2.1 date=August 12 2003
action dev=JH type=update fixes-bug=22288 due-to=Mark Leicester
due-to-email=[EMAIL PROTECTED]
-midi block refactoring applied.
+Midi block refactoring applied.
/action
action dev=CZ type=add fixes-bug=22270 due-to=Unico Hommes
due-to-email=[EMAIL PROTECTED]
- Patch for allowing to specify a cocoon-view for internal requests in the query
string.
+Patch for allowing to specify a cocoon-view for internal requests in the query
string.
/action
action dev=JH type=fix fixes-bug=19839
Instrumentation support: Updated client libraries to make instrumentation work
again.
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/language/generator ProgramGeneratorImpl.java
vgritsenko2003/08/11 18:41:33
Modified:src/java/org/apache/cocoon/components/language/generator
ProgramGeneratorImpl.java
Log:
Do not log normal flow as ERROR
Revision ChangesPath
1.4 +9 -5
cocoon-2.1/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProgramGeneratorImpl.java 4 Aug 2003 03:20:54 - 1.3
+++ ProgramGeneratorImpl.java 12 Aug 2003 01:41:33 - 1.4
@@ -239,7 +239,7 @@
String markupLanguageName,
String programmingLanguageName,
SourceResolver resolver)
-throws Exception {
+throws Exception {
final String id = source.getURI();
@@ -275,7 +275,9 @@
if (programInstance == null this.preload) {
// Preloading: Load program if its source/[object file] is available
try {
-program = programmingLanguage.preload(normalizedName,
this.workDir, markupLanguage.getEncoding());
+program = programmingLanguage.preload(normalizedName,
+ this.workDir,
+
markupLanguage.getEncoding());
this.cache.addGenerator(newManager, normalizedName, program);
programInstance = (CompiledComponent)
this.cache.select(normalizedName);
@@ -284,8 +286,10 @@
getLogger().debug(Successfully preloaded serverpage [ +
id + ]);
}
} catch (Exception e) {
-if (getLogger().isErrorEnabled()) {
-getLogger().error(The serverpage [ + id + ] could not be
preloaded);
+if (getLogger().isInfoEnabled()) {
+getLogger().info(The serverpage [ + id
+ + ] could not be preloaded, will be
re-created (
+ + e + ));
}
}
}
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/xml/dom DOMStreamer.java
vgritsenko2003/08/01 10:48:44
Modified:src/java/org/apache/cocoon/xml/dom DOMStreamer.java
Log:
align
Revision ChangesPath
1.11 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Index: DOMStreamer.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMStreamer.java 19 Mar 2003 09:40:42 - 1.10
+++ DOMStreamer.java 1 Aug 2003 17:48:44 - 1.11
@@ -741,7 +741,7 @@
}
SAXResult result = new SAXResult(handler);
-result.setLexicalHandler(lexicalHandler);
+result.setLexicalHandler(lexicalHandler);
try {
transformer.transform(source, result);
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet CocoonServlet.java
vgritsenko2003/07/31 06:29:54
Modified:src/java/org/apache/cocoon/servlet CocoonServlet.java
Log:
Get message from exception
Revision ChangesPath
1.11 +8 -7 cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CocoonServlet.java31 Jul 2003 03:54:22 - 1.10
+++ CocoonServlet.java31 Jul 2003 13:29:54 - 1.11
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.servlet;
+import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -1113,18 +1114,18 @@
rse);
return;
-} catch ( SocketException se ) {
+} catch (ConnectionResetException cre) {
if (log.isDebugEnabled()) {
-log.debug(The connection was reset, se);
+log.debug(cre.getMessage(), cre);
} else if (log.isWarnEnabled()) {
-log.warn(se.getMessage());
+log.warn(cre.getMessage());
}
-} catch (ConnectionResetException cre) {
+} catch ( SocketException se ) {
if (log.isDebugEnabled()) {
-log.debug(cre.getMessage(), cre);
+log.debug(se.getMessage(), se);
} else if (log.isWarnEnabled()) {
-log.warn(cre.getMessage());
+log.warn(se.getMessage());
}
} catch (Exception e) {
cvs commit: cocoon-2.0/src/java/org/apache/cocoon/components/store JispFilesystemStore.java
vgritsenko2003/07/30 19:55:15
Modified:src/java/org/apache/cocoon/components/store
JispFilesystemStore.java
Log:
Fix eternal loop in the iterator (fix backported from excalibur).
Revision ChangesPath
1.3 +38 -31
cocoon-2.0/src/java/org/apache/cocoon/components/store/JispFilesystemStore.java
Index: JispFilesystemStore.java
===
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/store/JispFilesystemStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JispFilesystemStore.java 29 Jul 2003 17:41:30 - 1.2
+++ JispFilesystemStore.java 31 Jul 2003 02:55:15 - 1.3
@@ -74,6 +74,7 @@
import java.io.Serializable;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.NoSuchElementException;
import java.util.Vector;
/**
@@ -415,6 +416,7 @@
class BTreeObjectEnumeration implements Enumeration
{
+private Object m_Next;
private BTreeIterator m_Iterator;
private JispFilesystemStore m_Store;
@@ -422,54 +424,59 @@
{
m_Iterator = iterator;
m_Store = store;
+
+// Obtain first element. If any.
+try
+{
+m_Next = m_Iterator.getKey();
+}
+catch (IOException ioe)
+{
+m_Store.getLogger().error(store(..): Exception, ioe);
+m_Next = null;
+}
}
public boolean hasMoreElements()
{
-boolean hasMore = false;
-Object tmp = null;
+return (m_Next != null);
+}
-try
+public Object nextElement() throws NoSuchElementException
+{
+if (m_Next == null)
{
-tmp = m_Iterator.getKey();
+throw new NoSuchElementException();
+}
+
+// Save current element
+Object tmp = m_Next;
-if(m_Iterator.moveNext())
+// Advance to the next element
+try
+{
+if (m_Iterator.moveNext())
{
-hasMore = true;
+m_Next = m_Iterator.getKey();
}
-
-/* resets iterator to the old state **/
-m_Iterator.moveTo((KeyObject)tmp);
-}
+else
+{
+// Can't move to the next element - no more elements.
+m_Next = null;
+}
+}
catch (IOException ioe)
{
m_Store.getLogger().error(store(..): Exception, ioe);
+m_Next = null;
}
catch (ClassNotFoundException cnfe)
{
m_Store.getLogger().error(store(..): Exception, cnfe);
+m_Next = null;
}
-return hasMore;
-}
-public Object nextElement()
-{
-Object tmp = null;
-
-try
-{
-tmp = m_Iterator.getKey();
-m_Iterator.moveNext();
-}
-catch (IOException ioe)
-{
-m_Store.getLogger().error(store(..): Exception, ioe);
-}
-catch (ClassNotFoundException cnfe)
-{
-m_Store.getLogger().error(store(..): Exception, cnfe);
-}
-// return the real key
+// Return the real key
return tmp.toString();
}
}
cvs commit: cocoon-2.1 cocoon.bat
vgritsenko2003/07/30 20:19:10 Modified:.cocoon.bat Log: cleanup EXEC variable Revision ChangesPath 1.13 +2 -2 cocoon-2.1/cocoon.bat Index: cocoon.bat === RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cocoon.bat21 Jul 2003 05:08:57 - 1.12 +++ cocoon.bat31 Jul 2003 03:19:10 - 1.13 @@ -143,5 +143,5 @@ :end set CP= - +set EXEC=
cvs commit: cocoon-2.1/src/documentation/xdocs/developing/portal index.xml
vgritsenko2003/07/30 20:20:07 Modified:src/documentation/xdocs/developing/portal index.xml Log: add p/ placeholders under chapters. it looks better this way. Revision ChangesPath 1.6 +152 -140 cocoon-2.1/src/documentation/xdocs/developing/portal/index.xml Index: index.xml === RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/developing/portal/index.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.xml 27 Jun 2003 07:10:52 - 1.5 +++ index.xml 31 Jul 2003 03:20:07 - 1.6 @@ -1,5 +1,6 @@ ?xml version=1.0? !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.0//EN ../../dtd/document-v10.dtd + document header titleConfiguring the Cocoon Portal/title @@ -7,96 +8,106 @@ /authors noticeThis document is under development./notice abstract - This document describes the use and configuration - of the (new) cocoon portal block. +This document describes the use and configuration +of the (new) cocoon portal block. /abstract /header body +s1 title=Introducing the Cocoon Portal + p +This document describes the use and configuration +of the (new) cocoon portal that you can find in the portal block. +(Don't mix this with the older portal version that you can +find in the portal-fw block.) + /p + s2 title=Important parts of the Cocoon Portal +p +/p + /s2 + s2 title=How is a portal page created by Cocoon? +p +/p + /s2 + s2 title=I want to build my own portal! An approach +p +/p + /s2 +/s1 - s1 title=Introducing the Cocoon Portal +s1 title=Configuring the Portal contents + s2 title=Configuring Coplets p - This document describes the use and configuration - of the (new) cocoon portal that you can find in the portal block. - (Don't mix this with the older portal version that you can - find in the portal-fw block.) /p - s2 title=Important parts of the Cocoon Portal - /s2 - s2 title=How is a portal page created by Cocoon? - /s2 - s2 title=I want to build my own portal! An approach - /s2 - /s1 - - s1 title=Configuring the Portal contents - s2 title=Configuring Coplets - /s2 - s2 title=Configuring the arrangement of the defined Coplets - /s2 - s2 title=... - /s2 - /s1 - - s1 title=Create a new skin for your portal - - pThis section will explain the concepts of the portal layout, - considering the codeskins/basic//code skin provided with cocoon, - and will describe how to create a new skin by extending the - existing stylesheets./p - noteThe skin path can be changed in the portal's sitemap. There is - a codeglobal-variable/code specifying the path to the skin folder./note - pThe basic cocoon portal skin is a nice and simple example how to visualize a portal. - There are several elements that allow to customize the look and feel of the portal. - A portal with the basic skin consists of /p - ul - lia emheader/em/li - lia emtab row/em/li - lia emcontent section/em containing the coplet windows/li - liand a emfooter /em/li - /ul - figure alt=Parts of the portal height=300 src=/images/portal-parts.gif width=400/figure - pThe tab row is actually a part of the content section. As well, a tab row can - be provided to any coplet window./p - s2 title=The skinapos;s stylesheets - pIf we take a look at the codeskins/basic/styles/code directory, we - find a number of stylesheets: - /p - ul - licodeportal-page.xsl/code: Creates final HTML page/li - licodetab.xsl/code: layout of the tab row./li - licodewindow.xsl/code: coplet window layout/li - licodecolumn.xsl/code: layout of a column/li - licoderow.xsl/code: layout of a row/li - licodelogin-page.xsl/code: layout of the login page/li - /ul - pThe codewindow.xsl/code stylesheet determines the layout of a - coplet window. Normally, a coplet window
cvs commit: cocoon-2.1/src/java/org/apache/cocoon Processor.java
vgritsenko2003/07/30 20:20:37 Modified:src/java/org/apache/cocoon Processor.java Log: typo Revision ChangesPath 1.4 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/Processor.java Index: Processor.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Processor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Processor.java6 Jul 2003 11:44:30 - 1.3 +++ Processor.java31 Jul 2003 03:20:37 - 1.4 @@ -70,7 +70,7 @@ /** * Process the given codeEnvironment/code producing the output. * @return If the processing is successfull codetrue/code is returned. - * If not match is found in the sitemap codefalse/code + * If no match is found in the sitemap codefalse/code * is returned. * @throws ResourceNotFoundException If a sitemap component tries * to access a resource which can not
cvs commit: cocoon-2.0/src/scratchpad/src/org/apache/cocoon/storejanitor StoreJanitorImpl.java
vgritsenko2003/07/30 20:43:24 Removed: src/scratchpad/src/org/apache/cocoon/storejanitor StoreJanitorImpl.java Log: Adaptive interval calculation is now in excalibur
cvs commit: cocoon-2.1/src/scratchpad/src/org/apache/cocoon/storejanitor StoreJanitorImpl.java
vgritsenko2003/07/30 20:45:24 Removed: src/scratchpad/src/org/apache/cocoon/storejanitor StoreJanitorImpl.java Log: Adaptive interval calculation is now in excalibur
cvs commit: cocoon-2.1/src/webapp/stylesheets/system status2html.xslt
vgritsenko2003/07/30 20:51:18
Modified:src/webapp/stylesheets/system status2html.xslt
Log:
Use generate-id() instead of name. Name has duplicates.
Revision ChangesPath
1.6 +28 -27cocoon-2.1/src/webapp/stylesheets/system/status2html.xslt
Index: status2html.xslt
===
RCS file: /home/cvs/cocoon-2.1/src/webapp/stylesheets/system/status2html.xslt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- status2html.xslt 28 Apr 2003 08:38:32 - 1.5
+++ status2html.xslt 31 Jul 2003 03:51:18 - 1.6
@@ -1,12 +1,14 @@
?xml version=1.0?
-!--
- CVS $Id$
---
+!--+
+| Converts output of the StatusGenerator into HTML page
+|
+| CVS $Id$
++--
xsl:stylesheet version=1.0
- xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
- xmlns:status=http://apache.org/cocoon/status/2.0;
+xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
+xmlns:status=http://apache.org/cocoon/status/2.0;
xsl:param name=contextPath select=string('/cocoon')/
@@ -20,7 +22,7 @@
body
h1xsl:value-of select=@status:host/ - xsl:value-of
select=@status:date//h1
-xsl:apply-templates/
+xsl:apply-templates/
/body
/html
/xsl:template
@@ -33,7 +35,7 @@
xsl:template match=status:value
li
- span class=descriptionxsl:value-of select=@status:name/xsl:text:
/xsl:text/span
+ span class=descriptionxsl:value-of select=@status:name/xsl:text:
/xsl:text/span
xsl:choose
xsl:when test=contains(@status:name,'free') or
contains(@status:name,'total')
xsl:call-template name=suffix
@@ -44,8 +46,8 @@
xsl:value-of select=status:line/
/xsl:when
xsl:otherwise
- span class=switch id=[EMAIL PROTECTED]:name}-switch
onclick=toggle('[EMAIL PROTECTED]:name}')[show]/span
- ul id=[EMAIL PROTECTED]:name} style=display: none
+ span class=switch id={generate-id(.)}-switch
onclick=toggle('{generate-id(.)}')[show]/span
+ ul id={generate-id(.)} style=display: none
xsl:apply-templates /
/ul
/xsl:otherwise
@@ -57,23 +59,22 @@
lixsl:value-of select=.//li
/xsl:template
- xsl:template name=suffix
- xsl:param name=bytes/
- xsl:choose
- !-- More than 4 MB (=4194304) --
- xsl:when test=$bytes gt;= 4194304
- xsl:value-of select=round($bytes div 10485.76) div
100/ MB
- /xsl:when
- !-- More than 4 KB (=4096) --
- xsl:when test=$bytes gt; 4096
- xsl:value-of select=round($bytes div 10.24) div
100/ KB
- /xsl:when
- !-- Less --
- xsl:otherwise
- xsl:value-of select=$bytes/ B
- /xsl:otherwise
- /xsl:choose
- /xsl:template
+ xsl:template name=suffix
+xsl:param name=bytes/
+xsl:choose
+ !-- More than 4 MB (=4194304) --
+ xsl:when test=$bytes gt;= 4194304
+xsl:value-of select=round($bytes div 10485.76) div 100/ MB
+ /xsl:when
+ !-- More than 4 KB (=4096) --
+ xsl:when test=$bytes gt; 4096
+xsl:value-of select=round($bytes div 10.24) div 100/ KB
+ /xsl:when
+ !-- Less --
+ xsl:otherwise
+xsl:value-of select=$bytes/ B
+ /xsl:otherwise
+/xsl:choose
+ /xsl:template
/xsl:stylesheet
-
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet CocoonServlet.java
vgritsenko2003/07/30 20:54:22
Modified:src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
src/java/org/apache/cocoon/components/pipeline/impl
AbstractCachingProcessingPipeline.java
src/java/org/apache/cocoon/servlet CocoonServlet.java
Log:
Attemp to reduce amount of socket exception stacktraces in the error log.
To get bunch of them, go to
http://localhost:/samples/linkstatus/localhost//docs/index.html
Revision ChangesPath
1.6 +3 -2
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractProcessingPipeline.java 11 Jul 2003 08:59:03 - 1.5
+++ AbstractProcessingPipeline.java 31 Jul 2003 03:54:22 - 1.6
@@ -611,7 +611,8 @@
}
} catch ( SocketException se ) {
if (se.getMessage().indexOf(reset) 0
-|| se.getMessage().indexOf(aborted) 0) {
+|| se.getMessage().indexOf(aborted) 0
+|| se.getMessage().indexOf(connection abort) 0) {
throw new ConnectionResetException(Connection reset by peer, se);
} else {
throw new ProcessingException(Failed to execute reader pipeline.,
se);
1.9 +7 -4
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
Index: AbstractCachingProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractCachingProcessingPipeline.java14 Jul 2003 16:06:20 - 1.8
+++ AbstractCachingProcessingPipeline.java31 Jul 2003 03:54:22 - 1.9
@@ -242,7 +242,8 @@
}
} catch ( SocketException se ) {
if (se.getMessage().indexOf(reset) 0
-|| se.getMessage().indexOf(aborted) 0) {
+|| se.getMessage().indexOf(aborted) 0
+|| se.getMessage().indexOf(connection abort) 0) {
throw new ConnectionResetException(Connection reset by peer,
se);
} else {
throw new ProcessingException(Failed to execute reader
pipeline., se);
@@ -313,7 +314,8 @@
} catch ( SocketException se ) {
if (se.getMessage().indexOf(reset) 0
-|| se.getMessage().indexOf(aborted) 0) {
+|| se.getMessage().indexOf(aborted) 0
+|| se.getMessage().indexOf(connection abort) 0) {
throw new ConnectionResetException(Connection reset by peer,
se);
} else {
throw new ProcessingException(Failed to execute reader
pipeline., se);
@@ -853,7 +855,8 @@
}
} catch ( SocketException se ) {
if (se.getMessage().indexOf(reset) 0
-|| se.getMessage().indexOf(aborted) 0) {
+|| se.getMessage().indexOf(aborted) 0
+|| se.getMessage().indexOf(connection abort) 0) {
throw new ConnectionResetException(Connection reset by peer, se);
} else {
throw new ProcessingException(Failed to execute pipeline., se);
1.10 +25 -5 cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CocoonServlet.java9 Jul 2003 07:42:22 - 1.9
+++ CocoonServlet.java31 Jul 2003 03:54:22 - 1.10
@@ -58,6 +58,7 @@
import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
+import java.net.SocketException;
import java.net.URL;
import java.net.URLDecoder;
import java.util.ArrayList;
@@ -,11 +1112,19 @@
The requested resource \ +
request.getRequestURI() + \ could not be found,
rse);
return;
+
+} catch ( SocketException se
cvs commit: cocoon-2.1/src/webapp/samples/xsp sitemap.xmap
vgritsenko2003/07/30 21:25:48 Modified:src/webapp/samples/xsp sitemap.xmap Log: add views Revision ChangesPath 1.3 +20 -0 cocoon-2.1/src/webapp/samples/xsp/sitemap.xmap Index: sitemap.xmap === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/sitemap.xmap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sitemap.xmap 20 May 2003 00:54:12 - 1.2 +++ sitemap.xmap 31 Jul 2003 04:25:48 - 1.3 @@ -1,6 +1,26 @@ ?xml version=1.0? map:sitemap xmlns:map=http://apache.org/cocoon/sitemap/1.0; + +!-- === Views === -- + + map:views + map:view name=content from-label=content + map:serialize type=xml/ + /map:view + + map:view from-label=content name=pretty-content +map:transform src=context://stylesheets/system/xml2html.xslt/ +map:serialize type=html/ + /map:view + + map:view name=links from-position=last + map:serialize type=links/ + /map:view + /map:views + +!-- === Pipelines = -- + map:pipelines map:pipeline
cvs commit: cocoon-2.1/src/webapp/WEB-INF cocoon.xconf
vgritsenko2003/07/30 21:26:53 Modified:src/webapp/WEB-INF cocoon.xconf Log: * sun's 64mb is less then 64mb * increase free memory to 2mb * new janitor parameter Revision ChangesPath 1.24 +6 -3 cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf Index: cocoon.xconf === RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cocoon.xconf 15 Jul 2003 16:47:27 - 1.23 +++ cocoon.xconf 31 Jul 2003 04:26:53 - 1.24 @@ -459,12 +459,15 @@ +-- store-janitor logger=core.store.janitor !-- How much free memory shall be available in the jvm -- - parameter name=freememory value=100/ + parameter name=freememory value=2048000/ !-- Indicates the limit of the jvm memory consumption. The default max - heapsize for Sun's JVM is 64Mb -- - parameter name=heapsize value=67108864/ + heapsize for Sun's JVM is (almost) 64Mb -- + parameter name=heapsize value=6660/ !-- How often shall the cleanup thread check memory -- parameter name=cleanupthreadinterval value=10/ + !-- Experimental adaptive algorithm for cleanup interval + parameter name=adaptivethreadinterval value=true/ + -- !-- Indicates the thread priority of the cleanup thread -- parameter name=threadpriority value=5/ !-- How much percent of the elements of each registered Store
cvs commit: cocoon-2.0/lib/optional fop-0.20.5.jar fop-0.20.4.jar
vgritsenko2003/07/29 06:54:33 Modified:.changes.xml lib jars.xml Added: lib/optional fop-0.20.5.jar Removed: lib/optional fop-0.20.4.jar Log: Update FOP to the latest release Revision ChangesPath 1.30 +5 -2 cocoon-2.0/changes.xml Index: changes.xml === RCS file: /home/cvs/cocoon-2.0/changes.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- changes.xml 12 Jul 2003 14:58:13 - 1.29 +++ changes.xml 29 Jul 2003 13:54:28 - 1.30 @@ -43,7 +43,10 @@ /devs release version=@version@ date=@date@ - action dev=JH type=fix fixes-bug=4934 due-to=Ryder Rishel due-to-email= [EMAIL PROTECTED] + action dev=VG type=update +Updated FOP to the latest released version, 0.20.5. + /action + action dev=JH type=fix fixes-bug=4934 due-to=Ryder Rishel due-to-email=[EMAIL PROTECTED] Made JSPs working in Resin that don't end on *.jsp. /action action dev=JH type=fix fixes-bug=14327 1.8 +420 -422 cocoon-2.0/lib/jars.xml Index: jars.xml === RCS file: /home/cvs/cocoon-2.0/lib/jars.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jars.xml 4 Jun 2003 20:50:48 - 1.7 +++ jars.xml 29 Jul 2003 13:54:31 - 1.8 @@ -7,443 +7,441 @@ Date: May 23, 2002 -- jars - file - titleAvalon Excalibur DataSource/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development. (This JAR has been compiled on Java 1.3 to be run on JVM 1.3 or earlier.)/description - used-byCocoon/used-by - libcore/jvm1.2/excalibur-datasource-vm12-20021121.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur DataSource/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development. (This JAR has been compiled on Java 1.4 to be run on JVM 1.4.)/description - used-byCocoon/used-by - libcore/jvm1.4/excalibur-datasource-vm14-20021121.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur CLI/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development./description - used-byCocoon/used-by - libcore/excalibur-cli-1.0.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur Collections/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development./description - used-byCocoon/used-by - libcore/excalibur-collections-20020820.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur Component/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development./description - used-byCocoon/used-by - libcore/excalibur-component-20020916.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur Concurrent/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development./description - used-byCocoon/used-by - libcore/excalibur-concurrent-20020820.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur I18n/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development./description - used-byCocoon/used-by - libcore/excalibur-i18n-1.0.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur Instrument/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development./description - used-byCocoon/used-by - libcore/excalibur-instrument-20021108.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file - file - titleAvalon Excalibur Instrument Manager/title - descriptionPart of jakarta-avalon, it is a set of classes and patterns that - support high level server development./description - used-byCocoon/used-by - libcore/excalibur-instrument-manager-20021108.jar/lib - homepagehttp://jakarta.apache.org/avalon/excalibur//homepage - /file
cvs commit: cocoon-2.0/src/webapp sitemap.xmap
vgritsenko2003/07/29 11:02:57 Modified:src/webapp sitemap.xmap Log: Add comment about html4 doctype. Align serializer's definitions. Revision ChangesPath 1.6 +51 -48cocoon-2.0/src/webapp/sitemap.xmap Index: sitemap.xmap === RCS file: /home/cvs/cocoon-2.0/src/webapp/sitemap.xmap,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sitemap.xmap 10 Jun 2003 23:48:27 - 1.5 +++ sitemap.xmap 29 Jul 2003 18:02:57 - 1.6 @@ -185,58 +185,62 @@ logger=sitemap.serializer.html pool-max=32 pool-min=4 pool-grow=4 buffer-size1024/buffer-size + !-- Uncomment if you want to specify HTML4 doctype in your output document: + doctype-public-//W3C//DTD HTML 4.01 Transitional//EN/doctype-public + doctype-systemhttp://www.w3.org/TR/html4/strict.dtd/doctype-system + -- /map:serializer - map:serializer name=vrml mime-type=model/vrml logger=sitemap.serializer.vrml - src=org.apache.cocoon.serialization.TextSerializer/ +map:serializer name=vrml mime-type=model/vrml logger=sitemap.serializer.vrml +src=org.apache.cocoon.serialization.TextSerializer/ - map:serializer name=wmlmime-type=text/vnd.wap.wml logger=sitemap.serializer.wml - src=org.apache.cocoon.serialization.XMLSerializer -doctype-public-//WAPFORUM//DTD WML 1.1//EN/doctype-public -doctype-systemhttp://www.wapforum.org/DTD/wml_1.1.xml/doctype-system -encodingASCII/encoding -omit-xml-declarationyes/omit-xml-declaration - /map:serializer - - map:serializer name=svgxml mime-type=image/svg+xml logger=sitemap.serializer.svgxml - src=org.apache.cocoon.serialization.XMLSerializer -doctype-public-//W3C//DTD SVG 1.0//EN/doctype-public - doctype-systemhttp://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd/doctype-system - /map:serializer - - map:serializer name=xhtml mime-type=text/html logger=sitemap.serializer.xhtml - src=org.apache.cocoon.serialization.XMLSerializer - pool-max=64 pool-min=2 pool-grow=2 - !-- - You can choose from Strict, Transitional, or Frameset XHTML. - For Strict XHTML, set doctype to: - doctype-public-//W3C//DTD XHTML 1.0 Strict//EN/doctype-public - doctype-systemhttp://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd/doctype-system - For Transitional XHTML, set doctype to: - doctype-public-//W3C//DTD XHTML 1.0 Transitional//EN/doctype-public - doctype-systemhttp://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd/doctype-system - For Frameset XHTML, set doctype to: - doctype-public-//W3C//DTD XHTML 1.0 Frameset//EN/doctype-public - doctype-systemhttp://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd/doctype-system +map:serializer name=wmlmime-type=text/vnd.wap.wml logger=sitemap.serializer.wml +src=org.apache.cocoon.serialization.XMLSerializer + doctype-public-//WAPFORUM//DTD WML 1.1//EN/doctype-public + doctype-systemhttp://www.wapforum.org/DTD/wml_1.1.xml/doctype-system + encodingASCII/encoding + omit-xml-declarationyes/omit-xml-declaration +/map:serializer + +map:serializer name=svgxml mime-type=image/svg+xml logger=sitemap.serializer.svgxml +src=org.apache.cocoon.serialization.XMLSerializer + doctype-public-//W3C//DTD SVG 1.0//EN/doctype-public + doctype-systemhttp://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd/doctype-system +/map:serializer + +map:serializer name=xhtml mime-type=text/html logger=sitemap.serializer.xhtml +src=org.apache.cocoon.serialization.XMLSerializer +pool-max=64 pool-min=2 pool-grow=2 + !-- +You can choose from Strict, Transitional, or Frameset XHTML. +For Strict XHTML, set doctype to: + doctype-public-//W3C//DTD XHTML 1.0 Strict//EN/doctype-public + doctype-systemhttp://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd/doctype-system +For Transitional XHTML, set doctype to: + doctype-public-//W3C//DTD XHTML 1.0 Transitional//EN/doctype-public + doctype-systemhttp://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd/doctype-system +For Frameset XHTML, set doctype to: + doctype-public-//W3C//DTD XHTML 1.0 Frameset//EN/doctype-public + doctype-systemhttp://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd/doctype-system - Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one - XHTML DTD simulteneously, you can
cvs commit: cocoon-2.0/src/java/org/apache/cocoon/components/language/programming/java EclipseJavaCompiler.java JavaLanguage.java Jikes.java NullFormatter.java javac.xconf pizza.xconf
vgritsenko2003/07/29 11:49:30 Modified:.changes.xml build.xml lib jars.xml src/java/org/apache/cocoon/components/language/programming/java JavaLanguage.java Jikes.java NullFormatter.java javac.xconf pizza.xconf Added: src/java/org/apache/cocoon/components/language/programming/java EclipseJavaCompiler.java Log: backport eclipse compiler from 2.1 Revision ChangesPath 1.32 +4 -1 cocoon-2.0/changes.xml Index: changes.xml === RCS file: /home/cvs/cocoon-2.0/changes.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- changes.xml 29 Jul 2003 17:41:29 - 1.31 +++ changes.xml 29 Jul 2003 18:49:28 - 1.32 @@ -43,6 +43,9 @@ /devs release version=@version@ date=@date@ + action dev=VG type=add +Backported Eclipse JDT compiler from the 2.1. + /action action dev=VG type=update Updated Jisp to the latest released version, 2.5.1. /action 1.4 +21 -2 cocoon-2.0/build.xml Index: build.xml === RCS file: /home/cvs/cocoon-2.0/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 3 Jul 2003 00:54:43 - 1.3 +++ build.xml 29 Jul 2003 18:49:28 - 1.4 @@ -322,6 +322,10 @@ property=pizza.present classname=net.sf.pizzacompiler.compiler.Main/ +class-available classpathref=classpath + property=eclipse.present + classname=org.eclipse.jdt.internal.compiler.Compiler/ + class-available classpathref=classpath property=xmldb.present classname=org.xmldb.api.DatabaseManager/ @@ -676,6 +680,17 @@ /antcall /target + !-- Outputs a warning if org.eclipse.jdt.internal.compiler.* classes are missing during compilation -- + target name=eclipse-warn unless=eclipse.present depends=optional-tests +antcall target=op-warning + param name=thing value=Eclipse/ + param name=recovery +value=Get the Eclipse JDT package from http://www.eclipse.org/jdt and place the jar in the lib/optional dir/ + param name=message + value=Eclipse JDT is the Java compiler which works using classloader./ +/antcall + /target + !-- Outputs a warning if org.apache.poi.* classes are missing during compilation -- target name=poi-warn unless=poi.present depends=optional-tests antcall target=op-warning @@ -703,7 +718,7 @@ !-- Print out warnings for optional components -- !-- === -- target name=optional-warnings - depends=bsf-warn, rhino-warn, jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn, velocity-warn, hsqldb-warn, resolver-warn, jisp-warn, pizza-warn, poi-warn, commons-logging-warn + depends=bsf-warn, rhino-warn, jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn, velocity-warn, hsqldb-warn, resolver-warn, jisp-warn, pizza-warn, eclipse-warn, poi-warn, commons-logging-warn /target @@ -731,8 +746,12 @@ exclude name=**/java/Pizza.java unless=pizza.present/ exclude name=**/java/pizza.x* unless=pizza.present/ +exclude name=**/java/Eclipse*.java unless=eclipse.present/ +exclude name=**/java/eclipse.x* unless=eclipse.present/ -- exclude name=**/java/javac.x* if=pizza.present/ +exclude name=**/java/javac.x* if=eclipse.present/ +exclude name=**/java/pizza.x* if=eclipse.present/ !-- exclude name=**/JSP*.java unless=servlet.present/ exclude name=**/Jsp*.java unless=servlet.present/ 1.10 +12 -5 cocoon-2.0/lib/jars.xml Index: jars.xml === RCS file: /home/cvs/cocoon-2.0/lib/jars.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jars.xml 29 Jul 2003 17:41:30 - 1.9 +++ jars.xml 29 Jul 2003 18:49:29 - 1.10 @@ -192,7 +192,7 @@ libcore/commons-collections-2.1.jar/lib homepagehttp://jakarta.apache.org/commons/collections.html/homepage /file -file + file titleJakarta Commons Lang/title descriptionThe Lang Component provides a host of helper utilities
cvs commit: cocoon-2.0/lib/optional jdtcore-2.1.0.jar
vgritsenko2003/07/29 11:50:38 Added: legalLICENSE.jdtcore lib/optional jdtcore-2.1.0.jar Log: Backport eclipse compiler from 2.1 Revision ChangesPath 1.1 cocoon-2.0/legal/LICENSE.jdtcore Index: LICENSE.jdtcore === Eclipse.org Software User Agreement 17th June, 2002 ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY CONTENT). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT. Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 1.0 (CPL). A copy of the CPL is provided with this Content and is also available at http://www.eclipse.org/legal/cpl-v10.html. For purposes of the CPL, Program will mean the Content. Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (Repository) in CVS modules (Modules) and made available as downloadable archives (Downloads). Content may be apportioned into plug-ins (Plug-ins), plug-in fragments (Fragments), and features (Features). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named feature.xml may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories named plugins and Features are located in directories named features. Features may also include other Features (Included Features). Files named feature.xml may contain a list of the names and version numbers of Included Features. The terms and conditions governing Plug-ins and Fragments should be contained in files named about.html (Abouts). The terms and conditions governing Features and Included Features should be contained in files named license.html (Feature Licenses). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations: * The top-level (root) directory * Plug-in and Fragment directories * Subdirectories of the directory named src of certain Plug-ins * Feature directories Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license (Feature Update License) during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the license property of files named feature.properties. Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory. The Abouts, Feature Licenses and Feature Update Licenses may refer to the CPL or other license agreements, notices or terms and conditions . It is your obligation to read and accept all such all terms and conditions prior to use of the Content. If no About, Feature License or Feature Update License is provided, please contact Eclipse.org to determine what terms and conditions govern that particular Content. Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. Common Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE (AGREEMENT). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS Contribution means: a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and b) in the case of each
cvs commit: cocoon-2.0/src/java/org/apache/cocoon/components/language/programming/java eclipse.xconf
vgritsenko2003/07/29 11:55:42 Added: src/java/org/apache/cocoon/components/language/programming/java eclipse.xconf Log: Backport eclipse compiler from 2.1 Revision ChangesPath 1.1 cocoon-2.0/src/java/org/apache/cocoon/components/language/programming/java/eclipse.xconf Index: eclipse.xconf === ?xml version=1.0? xconf xpath=cocoon/programming-languages/java-language unless=[EMAIL PROTECTED]'compiler'] !-- Compiler parameter specifies which class to use to compile Java. Possible variants are: Javac. Requires javac.jar (included with JDK as lib/toools.jar). Pizza. Requires pizza.jar (included with Cocoon distribution). EclipseJavaCompiler. The Eclipse JTD java compiler (included with Cocoon distribution). Jikes. Requires IBM jikes compiler to be present in the PATH -- parameter name=compiler value=org.apache.cocoon.components.language.programming.java.EclipseJavaCompiler/ /xconf
cvs commit: cocoon-2.1/lib jars.xml
vgritsenko2003/07/28 19:07:32 Modified:.status.xml lib jars.xml Added: src/blocks/fop/lib fop-0.20.5.jar Removed: src/blocks/fop/lib fop-0.20.5rc3a.jar Log: Update FOP to the released version. Update todo list: remove some items. Revision ChangesPath 1.97 +11 -30cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- status.xml28 Jul 2003 11:28:22 - 1.96 +++ status.xml29 Jul 2003 02:07:31 - 1.97 @@ -7,7 +7,7 @@ !-- CVS $Id$:-- status - developers + developers !-- in strict alphabetical order -- person name=Donald Ball email=[EMAIL PROTECTED] id=DB/ person name=Nicola Ken Barozzi email=[EMAIL PROTECTED] id=NKB/ @@ -51,7 +51,7 @@ person name=Sylvain Wallez email=[EMAIL PROTECTED] id=SW/ person name=Carsten Ziegeler email=[EMAIL PROTECTED] id=CZ/ person name=Volunteer needed email=[EMAIL PROTECTED] id=open/ - /developers + /developers todo actions priority=high @@ -70,13 +70,9 @@ /action action context=code assigned-to=open - For 2.1: use (only) released versions of excalibur (xml, source, store etc). - This requires a release of those components in excalibur. -/action - -action context=code assigned-to=open - Complete (means put everything we know of into even if it has to be - commented) the cocoon.xconf file and put descriptions into it + For 2.1: use (only) released versions of excalibur (collections, + concurrent, source, store, xmlutil). This requires a release of those + components in excalibur. /action action context=build assigned-to=open @@ -92,7 +88,7 @@ action context=code assigned-to=NKB For 2.1: Make comprehensive samples with the handle-errors sitemap and real world use cases. Add also specific Selector and a FaqBuilder to be used by the - as a NotifyingBuilder. + NotifyingBuilder. /action action context=code assigned-to=open @@ -112,18 +108,6 @@ /action action context=code assigned-to=open - Move complete Source implementation to Excalibur. -/action - -action context=code assigned-to=open - Documentation to be published by Forrest. - See the - link href=http://wiki.cocoondev.org/Wiki.jsp?page=ForrestProposal;proposal/link - under development. (Note: the generation of the docs should be completely done by - Forrest. So we should remove the deprecated docs generation stuff within Cocoon.) -/action - -action context=code assigned-to=open Finish moving the scratchpad stuff in main trunk. /action @@ -145,7 +129,6 @@ a problem during the serialization of the transient store, if the servlet container were stopped. /action - /actions actions priority=medium @@ -167,13 +150,8 @@ /action action context=code -!-- FIXME: remove ... this already above -- - For 2.1: Make a guide on how to upgrade Cocoon, and see how this can be eased. -/action - -action context=code For 2.1: Redesign FragmentExtractorGenerator/Transformer so that it works on a clustered - server : store fragments in the session rather than in a local store. br/ + server: store fragments in the session rather than in a local store. br/ This couldn't work, because if you working with caching pipelines, you cannot be sure that the entries are in the session(Stephan). /action @@ -189,6 +167,9 @@ changes release version=@version@ date=@date@ + action dev=VG type=update +Updated FOP to the latest released version, 0.20.5. + /action action dev=GR type=add Added delete capabilities to the SourceWritingTransformer. /action 1.1 cocoon-2.1/src/blocks/fop/lib/fop-0.20.5.jar Binary file 1.71 +2 -2 cocoon-2.1/lib/jars.xml Index: jars.xml === RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- jars.xml 26 Jul 2003 13:26:47 - 1.70 +++ jars.xml 29 Jul 2003 02:07:32 - 1.71 @@ -430,7 +430,7 @@ the XSL recommendation and then turns it into a PDF document. /description used-byFOP serializer (fop block)/used-by - libfop/lib/fop-0.20.5rc3a.jar/lib + libfop/lib/fop-0.20.5.jar/lib homepagehttp://xml.apache.org/fop//homepage /file
cvs commit: cocoon-2.1/src/webapp/samples/i18n/translations menu.xml menu_de.xml menu_el.xml menu_en.xml menu_in.xml menu_ja.xml menu_ko.xml menu_ru.xml menu_zh_CN.xml menu_zh_TW.xml messages.xml messages_de.xml messages_el.xml messages_en.xml messages_es.xml messages_fr.xml messages_fr_CH.xml messages_hy.xml messages_in.xml messages_ja.xml messages_ko.xml messages_pl.xml messages_pt.xml messages_ru.xml messages_tr.xml messages_zh_CN.xml messages_zh_TW.xml
vgritsenko2003/07/28 19:36:31 Modified:src/webapp/samples/i18n/translations menu.xml menu_de.xml menu_el.xml menu_en.xml menu_in.xml menu_ja.xml menu_ko.xml menu_ru.xml menu_zh_CN.xml menu_zh_TW.xml messages.xml messages_de.xml messages_el.xml messages_en.xml messages_es.xml messages_fr.xml messages_fr_CH.xml messages_hy.xml messages_in.xml messages_ja.xml messages_ko.xml messages_pl.xml messages_pt.xml messages_ru.xml messages_tr.xml messages_zh_CN.xml messages_zh_TW.xml Log: Update japanese translation. Changed file headers to corporate standard while I was at it. Submitted by: Tetsuya Kitahata [EMAIL PROTECTED] Revision ChangesPath 1.2 +7 -2 cocoon-2.1/src/webapp/samples/i18n/translations/menu.xml Index: menu.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/translations/menu.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menu.xml 9 Mar 2003 00:11:11 - 1.1 +++ menu.xml 29 Jul 2003 02:36:30 - 1.2 @@ -1,6 +1,11 @@ ?xml version=1.0 encoding=UTF-8? -!-- Default (English) message catalogue file for menu in Cocoon 2 i18n sample -- -!-- $Id$ -- + +!--+ +| Default (English) message catalogue file for menu in Cocoon 2 i18n sample +| +| CVS $Id$ ++-- + catalogue xml:lang=en message key=Apache Cocoon i18n SamplesApache Cocoon i18n Samples/message message key=SamplesSamples/message 1.2 +6 -2 cocoon-2.1/src/webapp/samples/i18n/translations/menu_de.xml Index: menu_de.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/translations/menu_de.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menu_de.xml 26 Mar 2003 07:32:20 - 1.1 +++ menu_de.xml 29 Jul 2003 02:36:30 - 1.2 @@ -1,6 +1,10 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- German message catalogue file for menu in Cocoon 2 i18n sample -- -!-- $Id$ -- + +!--+ +| German message catalogue file for menu in Cocoon 2 i18n sample +| +| CVS $Id$ ++-- catalogue xml:lang=de message key=Apache Cocoon i18n SamplesApache Cocoon i18n Beispiele/message 1.2 +7 -3 cocoon-2.1/src/webapp/samples/i18n/translations/menu_el.xml Index: menu_el.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/translations/menu_el.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menu_el.xml 9 Mar 2003 00:11:11 - 1.1 +++ menu_el.xml 29 Jul 2003 02:36:30 - 1.2 @@ -1,7 +1,11 @@ ?xml version=1.0 encoding=UTF-8? -!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Stavros Kounis (private) -- -!-- Greek message catalogue file for menu in Cocoon 2 i18n sample -- -!-- $Id$ -- + +!--+ +| Greek message catalogue file for menu in Cocoon 2 i18n sample +| +| CVS $Id$ ++-- + catalogue xml:lang=gr message key=Apache Cocoon i18n SamplesApache Cocoon i18n Παραδείγματα/message message key=SamplesΠαραδείγματα/message 1.2 +7 -2 cocoon-2.1/src/webapp/samples/i18n/translations/menu_en.xml Index: menu_en.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/translations/menu_en.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menu_en.xml 9 Mar 2003 00:11:11 - 1.1 +++ menu_en.xml 29 Jul 2003 02:36:30 - 1.2 @@ -1,6 +1,11 @@ ?xml version=1.0 encoding=UTF-8? -!-- English message catalogue file for menu in Cocoon 2 i18n sample -- -!-- $Id$ -- + +!--+ +| English message catalogue file for menu in Cocoon 2 i18n sample +| +| CVS $Id$ ++-- + catalogue xml:lang=en message key=Apache Cocoon i18n SamplesApache Cocoon i18n Samples/message message key=SamplesSamples/message 1.2 +7 -2 cocoon-2.1/src/webapp/samples/i18n/translations/menu_in.xml Index: menu_in.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/translations/menu_in.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menu_in.xml 26 Mar 2003 07:32:20 - 1.1 +++ menu_in.xml 29 Jul 2003 02:36:30 - 1.2 @@ -1,6 +1,11 @@ ?xml version=1.0 encoding=UTF-8
cvs commit: cocoon-2.1/src/webapp/samples/xinclude sitemap.xmap
vgritsenko2003/07/28 20:15:48 Modified:src/blocks/authentication-fw/conf authentication-gen.xmap src/blocks/authentication-fw/samples sitemap.xmap src/blocks/batik/conf svg.generation.xmap src/blocks/batik/samples sitemap.xmap src/blocks/bsf/conf bsf.xmap src/blocks/databases/samples sitemap.xmap src/blocks/fop/samples sitemap.xmap src/blocks/html/conf tidy.xmap src/blocks/html/samples sitemap.xmap src/blocks/jsp/conf jsp.generator.xmap src/blocks/linotype/samples sitemap.source.xmap sitemap.xmap src/blocks/mail/samples sitemap.xmap src/blocks/petstore/samples sitemap.xmap src/blocks/php/conf php.xmap src/blocks/poi/samples sitemap.xmap src/blocks/portal-fw/conf portal-gen.xmap src/blocks/profiler/conf profiler.xmap src/blocks/profiler/samples sitemap.xmap src/blocks/proxy/conf proxy.xmap wsproxy.xmap src/blocks/slide/conf slide-generator.xmap src/blocks/slide/samples sitemap.xmap src/blocks/velocity/conf velocity.xmap src/blocks/web3/samples sitemap.xmap src/blocks/woody/samples sitemap.xmap src/blocks/xmldb/conf xmldb.deprecated.xmap src/webapp sitemap.xmap src/webapp/samples sitemap.xmap src/webapp/samples/hello-world sitemap.xmap src/webapp/samples/i18n sitemap.xmap src/webapp/samples/simpleform sitemap.xmap src/webapp/samples/sites sitemap.xmap src/webapp/samples/sources sitemap.xmap src/webapp/samples/stream sitemap.xmap src/webapp/samples/xinclude sitemap.xmap Log: Add views definitions to the samples sitemaps. Removed label data, it was almost identical to label content. data was used by content view, content was used by pretty-content (or was it the other way?). Now both views use same label which makes more sense. Revision ChangesPath 1.3 +1 -1 cocoon-2.1/src/blocks/authentication-fw/conf/authentication-gen.xmap Index: authentication-gen.xmap === RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/conf/authentication-gen.xmap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- authentication-gen.xmap 3 May 2003 16:12:23 - 1.2 +++ authentication-gen.xmap 29 Jul 2003 03:15:45 - 1.3 @@ -5,5 +5,5 @@ map:generator name=auth-conf src=org.apache.cocoon.webapps.authentication.generation.ConfigurationGenerator - label=content,data/ + label=content/ /xmap 1.5 +61 -72cocoon-2.1/src/blocks/authentication-fw/samples/sitemap.xmap Index: sitemap.xmap === RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/samples/sitemap.xmap,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sitemap.xmap 26 May 2003 07:54:09 - 1.4 +++ sitemap.xmap 29 Jul 2003 03:15:45 - 1.5 @@ -1,35 +1,27 @@ ?xml version=1.0? -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 +!--+ +| Authentiction block samples sitemap. +| +| CVS $Id$ ++-- +map:sitemap xmlns:map=http://apache.org/cocoon/sitemap/1.0; !-- === Pipelines = -- + map:pipelines +map:component-configurations + authentication-manager +handlers + handler name=demohandler +redirect-to uri=cocoon:/login/ +authentication uri=cocoon:raw:/authenticate/ + /handler +/handlers + /authentication-manager +/map:component-configurations - map:pipelines - map:component-configurations - authentication-manager -handlers - handler name=demohandler - redirect-to uri=cocoon:/login/ - authentication uri=cocoon:raw:/authenticate/ - /handler - /handlers - /authentication-manager - /map:component-configurations - - map:pipeline - +map:pipeline map:match pattern= map:redirect-to uri=login/ /map:match @@ -39,13 +31,13
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java xsp.xsl
vgritsenko2003/07/13 10:16:55 Modified:.status.xml src/java/org/apache/cocoon/components/language/markup/xsp/java xsp.xsl Log: backport 2.0 changes: decouple core xsp logicsheet from DB block Revision ChangesPath 1.91 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- status.xml12 Jul 2003 18:39:48 - 1.90 +++ status.xml13 Jul 2003 17:16:54 - 1.91 @@ -184,6 +184,11 @@ changes release version=@version@ date=@date@ + action dev=VG type=update +Decouple core XSP logicsheet from database classes to allow XSP deployment +without excalibur datasource JAR file. If your XSP pages use datasources +directly (and not through ESQL logicsheet), add xsp:include. + /action action dev=CZ type=update The authentication framework now uses a configurable component to try to authenticate a user. This allows to drop in own authentication services or e.g. the servlet authentication mechanism. 1.3 +2 -3 cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl Index: xsp.xsl === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xsp.xsl 26 Mar 2003 15:37:09 - 1.2 +++ xsp.xsl 13 Jul 2003 17:16:54 - 1.3 @@ -108,7 +108,6 @@ import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentSelector; import org.apache.avalon.framework.context.Context; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; //import org.apache.avalon.framework.util.*; import org.apache.cocoon.Constants;
cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/validationruleimpl RegExpValidationRule.java RegExpValidationRuleBuilder.java
vgritsenko2003/07/12 18:27:48
Modified:
src/blocks/woody/java/org/apache/cocoon/woody/datatype/validationruleimpl
RegExpValidationRule.java
RegExpValidationRuleBuilder.java
Log:
Fix line endings
Revision ChangesPath
1.2 +96 -96
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/validationruleimpl/RegExpValidationRule.java
Index: RegExpValidationRule.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/validationruleimpl/RegExpValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegExpValidationRule.java 9 Jul 2003 12:17:21 - 1.1
+++ RegExpValidationRule.java 13 Jul 2003 01:27:48 - 1.2
@@ -1,96 +1,96 @@
-/*
-
-
- 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.woody.datatype.validationruleimpl;
-
-import org.apache.cocoon.woody.datatype.ValidationError;
-import org.apache.cocoon.woody.datatype.validationruleimpl.AbstractValidationRule;
-import org.apache.oro.text.regex.Pattern;
-import org.apache.oro.text.regex.PatternMatcher;
-import org.apache.oro.text.regex.Perl5Matcher;
-import org.outerj.expression.ExpressionContext;
-
-
-/**
- * Checks that a String matches a regular expression.
- *
- * pThe a href=http://jakarta.apache.org/oro/;Jakarta ORO/a library
- * is used as regexp engine.
- */
-public class RegExpValidationRule extends AbstractValidationRule {
- /** Compiled regular expression. */
- private Pattern pattern;
-/** Original string representation of the regexp, used for informational
purposes only. */
-private String regexp;
-
-public ValidationError validate(Object value, ExpressionContext
expressionContext) {
- String string = (String)value;
-
- if(matchesRegExp(string))
- return null;
- else
- return hasFailMessage() ? getFailMessage() : new
ValidationError(validation.string.regexp, new String[] {regexp});
-}
-
-private boolean
cvs commit: cocoon-2.1/src/blocks/linotype/samples/styles main.css
vgritsenko2003/07/11 17:26:45
Modified:src/blocks/linotype/samples/styles main.css
Log:
align
Revision ChangesPath
1.2 +1 -1 cocoon-2.1/src/blocks/linotype/samples/styles/main.css
Index: main.css
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/styles/main.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.css 17 Jun 2003 01:32:45 - 1.1
+++ main.css 12 Jul 2003 00:26:45 - 1.2
@@ -46,7 +46,7 @@
body {
margin: 0px;
padding: 0px;
- font-family: georgia, times, times new roman, serif;
+font-family: georgia, times, times new roman, serif;
color: #222;
background-color: #fff;
font-size: 12px;
cvs commit: cocoon-1/xdocs contrib.xml docs-book.xml patches.xml site-book.xml
vgritsenko2003/07/09 17:44:26 Modified:xdocscontrib.xml docs-book.xml patches.xml site-book.xml Log: Fix bugs in *-book files and fix broken links Revision ChangesPath 1.5 +2 -1 cocoon-1/xdocs/contrib.xml Index: contrib.xml === RCS file: /home/cvs/cocoon-1/xdocs/contrib.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- contrib.xml 11 May 2003 02:40:00 - 1.4 +++ contrib.xml 10 Jul 2003 00:44:26 - 1.5 @@ -29,7 +29,8 @@ /p p To begin with, we suggest you to subscribe to the - connect href=mail-lists.xmlCocoon mailing lists/connect + link href=http://cocoon.apache.org/community/mail-lists.html;Cocoon + mailing lists/link (follow the link for information on how to subscribe and to access the mail list archives), to checkout the link href=http://cvs.apache.org/viewcvs.cgi/cocoon-1/; latest and greatest code/link (which you find in the cocoon-1 module in 1.31 +2 -2 cocoon-1/xdocs/docs-book.xml Index: docs-book.xml === RCS file: /home/cvs/cocoon-1/xdocs/docs-book.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- docs-book.xml 9 Jul 2003 19:14:40 - 1.30 +++ docs-book.xml 10 Jul 2003 00:44:26 - 1.31 @@ -44,8 +44,8 @@ separator/ external label=Bug Database href=http://nagoya.apache.org/bugzilla// external label=Code Repository href=http://cvs.apache.org/viewcvs.cgi/cocoon-1// - page id=mail-lists label=Mail Lists source=http://cocoon.apache.org/community/mail-lists.html/ - page id=mail-archives label=Mail Archives source=http://cocoon.apache.org/community/mail-archives.html/ + external label=Mail Lists source=http://cocoon.apache.org/community/mail-lists.html/ + external label=Mail Archives source=http://cocoon.apache.org/community/mail-archives.html/ separator/ external label=Cocoon 2.0 Site href=http://cocoon.apache.org/2.0// external label=Cocoon 2.1 Site href=http://cocoon.apache.org/2.1// 1.6 +1 -1 cocoon-1/xdocs/patches.xml Index: patches.xml === RCS file: /home/cvs/cocoon-1/xdocs/patches.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- patches.xml 19 Jan 2001 23:00:21 - 1.5 +++ patches.xml 10 Jul 2003 00:44:26 - 1.6 @@ -52,7 +52,7 @@ pstrong [Under Construction] /strong Archive links will be added later. strongPlease do not bother the patch submitters/authors/strong without first reading the -relevant post(s) in the connect href=mail-archives.xmlmailing list archives./connect +relevant post(s) in the link href=http://cocoon.apache.org/community/mail-archives.html;mailing list archives./link /p pVapourware will not be listed./p 1.34 +2 -2 cocoon-1/xdocs/site-book.xml Index: site-book.xml === RCS file: /home/cvs/cocoon-1/xdocs/site-book.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- site-book.xml 9 Jul 2003 20:51:25 - 1.33 +++ site-book.xml 10 Jul 2003 00:44:26 - 1.34 @@ -46,8 +46,8 @@ separator/ external label=Bug Database href=http://nagoya.apache.org/bugzilla// external label=Code Repository href=http://cvs.apache.org/viewcvs.cgi/cocoon-1// - page id=mail-lists label=Mail Lists source=http://cocoon.apache.org/community/mail-lists.html/ - page id=mail-archives label=Mail Archives source=http://cocoon.apache.org/community/mail-archives.html/ + external label=Mail Lists source=http://cocoon.apache.org/community/mail-lists.html/ + external label=Mail Archives source=http://cocoon.apache.org/community/mail-archives.html/ separator/ external label=Cocoon 2.0 Site href=http://cocoon.apache.org/2.0// external label=Cocoon 2.1 Site href=http://cocoon.apache.org/2.1//
cvs commit: cocoon-site/site/1.x mail-archives.html mail-lists.html
vgritsenko2003/07/09 17:48:52 Removed: site/1.x mail-archives.html mail-lists.html Log: update site (removed mail list and archive pages)
cvs commit: cocoon-site/site/1.x 3rdparty.html caching.html changes.html connection-pool.html contrib.html dynamic.html esql.html faqs.html fp.html guide.html hosting.html how-it-works.html index.html infrastructure.html install.html ldap.html license.html livesites.html patches.html sql.html sqltaglib.html technologies.html todo.html wd-xsp.html xmlfragment.html xsp.html
vgritsenko2003/07/09 17:54:12 Modified:xdocsdocs-book.xml site-book.xml site/1.x 3rdparty.html caching.html changes.html connection-pool.html contrib.html dynamic.html esql.html faqs.html fp.html guide.html hosting.html how-it-works.html index.html infrastructure.html install.html ldap.html license.html livesites.html patches.html sql.html sqltaglib.html technologies.html todo.html wd-xsp.html xmlfragment.html xsp.html Log: Oops. Fix one more bug in the *-book. Revision ChangesPath 1.32 +2 -2 cocoon-1/xdocs/docs-book.xml Index: docs-book.xml === RCS file: /home/cvs/cocoon-1/xdocs/docs-book.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- docs-book.xml 10 Jul 2003 00:44:26 - 1.31 +++ docs-book.xml 10 Jul 2003 00:54:10 - 1.32 @@ -44,8 +44,8 @@ separator/ external label=Bug Database href=http://nagoya.apache.org/bugzilla// external label=Code Repository href=http://cvs.apache.org/viewcvs.cgi/cocoon-1// - external label=Mail Lists source=http://cocoon.apache.org/community/mail-lists.html/ - external label=Mail Archives source=http://cocoon.apache.org/community/mail-archives.html/ + external label=Mail Lists href=http://cocoon.apache.org/community/mail-lists.html/ + external label=Mail Archives href=http://cocoon.apache.org/community/mail-archives.html/ separator/ external label=Cocoon 2.0 Site href=http://cocoon.apache.org/2.0// external label=Cocoon 2.1 Site href=http://cocoon.apache.org/2.1// 1.35 +2 -2 cocoon-1/xdocs/site-book.xml Index: site-book.xml === RCS file: /home/cvs/cocoon-1/xdocs/site-book.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- site-book.xml 10 Jul 2003 00:44:26 - 1.34 +++ site-book.xml 10 Jul 2003 00:54:10 - 1.35 @@ -46,8 +46,8 @@ separator/ external label=Bug Database href=http://nagoya.apache.org/bugzilla// external label=Code Repository href=http://cvs.apache.org/viewcvs.cgi/cocoon-1// - external label=Mail Lists source=http://cocoon.apache.org/community/mail-lists.html/ - external label=Mail Archives source=http://cocoon.apache.org/community/mail-archives.html/ + external label=Mail Lists href=http://cocoon.apache.org/community/mail-lists.html/ + external label=Mail Archives href=http://cocoon.apache.org/community/mail-archives.html/ separator/ external label=Cocoon 2.0 Site href=http://cocoon.apache.org/2.0// external label=Cocoon 2.1 Site href=http://cocoon.apache.org/2.1// 1.3 +2 -2 cocoon-site/site/1.x/3rdparty.html Index: 3rdparty.html === RCS file: /home/cvs/cocoon-site/site/1.x/3rdparty.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 3rdparty.html 10 Jul 2003 00:48:17 - 1.2 +++ 3rdparty.html 10 Jul 2003 00:54:10 - 1.3 @@ -71,8 +71,8 @@ TRTD align=left bgcolor=#959595 valign=topIMG border=0 height=6 hspace=0 src=resources/separator.gif vspace=0 width=120BR/TD/TR TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=http://nagoya.apache.org/bugzilla/;Bug Database/ABR/TD/TR TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=http://cvs.apache.org/viewcvs.cgi/cocoon-1/;Code Repository/ABR/TD/TR - TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=Mail Lists/ABR/TD/TR - TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=Mail Archives/ABR/TD/TR + TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=http://cocoon.apache.org/community/mail-lists.html;Mail Lists/ABR/TD/TR + TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=http://cocoon.apache.org/community/mail-archives.html;Mail Archives/ABR/TD/TR TRTD align=left bgcolor=#959595 valign=topIMG border=0 height=6 hspace=0 src=resources/separator.gif vspace=0 width=120BR/TD/TR TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=http://cocoon.apache.org/2.0/;Cocoon 2.0 Site/ABR/TD/TR TRTD align=left background=resources/label-background_a.gif bgcolor=#959595 valign=topA class=menu href=http://cocoon.apache.org/2.1/;Cocoon 2.1 Site/ABR/TD/TR
cvs commit: cocoon-2.1 build.bat build.properties
vgritsenko2003/07/03 12:50:40 Modified:.build.bat build.properties Log: remove not used anywhere properties; swap env variables order... Revision ChangesPath 1.4 +5 -5 cocoon-2.1/build.bat Index: build.bat === RCS file: /home/cvs/cocoon-2.1/build.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.bat 30 Apr 2003 14:11:56 - 1.3 +++ build.bat 3 Jul 2003 19:50:40 - 1.4 @@ -42,6 +42,10 @@ 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= + rem - Restore ANT_HOME set ANT_HOME=%OLD_ANT_HOME% set OLD_ANT_HOME= @@ -53,7 +57,3 @@ rem - Restore CLASSPATH set CLASSPATH=%OLD_CLASSPATH% set OLD_CLASSPATH= - -rem - Restore ANT_OPTS -set ANT_OPTS=%OLD_ANT_OPTS% -set OLD_ANT_OPTS= 1.24 +0 -5 cocoon-2.1/build.properties Index: build.properties === RCS file: /home/cvs/cocoon-2.1/build.properties,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- build.properties 3 Jul 2003 12:50:48 - 1.23 +++ build.properties 3 Jul 2003 19:50:40 - 1.24 @@ -88,11 +88,6 @@ compiler.optimize=on compiler.deprecation=off compiler.nowarn=on -compiler.emacs=on -compiler.warnings=on -compiler.pedantic=off -compiler.depend=on -compiler.fulldepend=on # -- System Properties -
cvs commit: cocoon-2.1/lib/optional commons-jxpath-1.1.jar
vgritsenko2003/07/03 13:51:15 Modified:lib jars.xml Added: lib/core commons-jxpath-1.1.jar Removed: lib/optional commons-jxpath-1.1.jar Log: Move commons-jxpath-1.1.jar to the core: flow depends on it. Revision ChangesPath 1.56 +3 -3 cocoon-2.1/lib/jars.xml Index: jars.xml === RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- jars.xml 1 Jul 2003 23:44:47 - 1.55 +++ jars.xml 3 Jul 2003 20:51:14 - 1.56 @@ -564,8 +564,8 @@ file titleJakarta Commons JXPath/title descriptionXPath interpreter. Work with JavaBeans and DOM nodes/description - used-byJXPath logicsheet and XMLForm/used-by - liboptional/commons-jxpath-1.1.jar/lib + used-byFlow, JXPath logicsheet, and XMLForm/used-by + libcore/commons-jxpath-1.1.jar/lib homepagehttp://jakarta.apache.org/commons/jxpath//homepage /file 1.1 cocoon-2.1/lib/core/commons-jxpath-1.1.jar Binary file
cvs commit: cocoon-2.0 build.properties build.xml database.properties
vgritsenko2003/07/02 17:54:43
Modified:.build.xml
Added: .build.properties
Removed: .database.properties
Log:
update build script: move properties out into the build.properties file
Revision ChangesPath
1.3 +153 -233 cocoon-2.0/build.xml
Index: build.xml
===
RCS file: /home/cvs/cocoon-2.0/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 15 May 2003 14:24:19 - 1.2
+++ build.xml 3 Jul 2003 00:54:43 - 1.3
@@ -98,7 +98,7 @@
Happy hacking from the Apache Cocoon Dev Team :)
-CVS: $Id:
+CVS: $Id$
--
@@ -108,24 +108,14 @@
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
--
- property file=.ant.properties/
- property file=${user.home}/.ant.properties/
-
- !--
-these are here only for those who use jikes compiler. For other
-developers this part makes no difference.
- --
- property name=build.compiler.emacs value=on/
- !-- property name=build.compiler.warnings value=true/ --
- property name=build.compiler.pedantic value=false/
- property name=build.compiler.depend value=true/
- property name=build.compiler.fulldepend value=true/
+ property file=local.build.properties/
+ property file=${user.home}/cocoon.build.properties/
+ property file=build.properties/
!-- === --
!-- Initialization target --
!-- === --
target name=init
-
tstamp/
!-- Detecting the current jvm --
@@ -194,17 +184,6 @@
pathelement path=./build/cocoon/classes/
/path
-!-- === --
-!-- Properties --
-!-- === --
-
-property name=fullname value=Apache Cocoon/
-property name=Name value=Cocoon/
-property name=name value=cocoon/
-property name=version value=2.0.5-dev/ !-- This is the current
CVS version --
-property name=released.version value=2.0.4/ !-- This is the latest
official release --
-property name=year value=1999-2003/
-
echo message=--/
echo message=${fullname} ${version} [${year}] /
echo message=--/
@@ -219,61 +198,7 @@
echo message= /
echo message=--/
-property name=debug value=on/
-property name=optimize value=off/
-property name=deprecationvalue=off/
-property name=nowarn value=on/
-!-- property name=build.compiler value=classic/ --
-
-property name=src.dir value=./src/
-property name=java.dir value=${src.dir}/java/
-property name=mocks.dir value=${src.dir}/mocks/
-property name=test.dir value=${src.dir}/test/
-property name=lib.dir value=./lib/
-property name=tools.dirvalue=./tools/
-property name=docs.dir value=${src.dir}/documentation/xdocs/
-property name=images.dir value=${src.dir}/documentation/images/
-property name=webapp.dir value=${src.dir}/webapp/
-property name=resource.dir value=${src.dir}/resources/
-property name=packages value=org.apache/
-property name=context.dir value=${src.dir}/documentation/
-
-property name=scratchpad.dir value=${src.dir}/scratchpad/
-property name=scratchpad.src value=${scratchpad.dir}/src/
-property name=scratchpad.lib value=${scratchpad.dir}/lib/
-property name=scratchpad.webapp value=${scratchpad.dir}/webapp/
-property name=scratchpad.namevalue=cocoon-scratchpad/
-
-property name=build.root value=./build/
-property name=build.dir value=${build.root}/${name}/
-property name=build.src value=${build.dir}/src/
-property name=build.test value=${build.dir}/test/
-property name=build.dest value=${build.dir}/classes/
-property name=build.mocksvalue=${build.dir}/mock-classes/
-property name=build.docs value=${build.dir}/docs/
-property name=build.xdocsvalue=${build.dir}/xdocs/
-property name=build.docs.printer value=${build.dir
cvs commit: cocoon-2.0 build.bat
vgritsenko2003/07/02 18:26:22 Modified:.build.bat Log: ignore system classpath Revision ChangesPath 1.2 +10 -1 cocoon-2.0/build.bat Index: build.bat === RCS file: /home/cvs/cocoon-2.0/build.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.bat 8 Mar 2003 23:59:51 - 1.1 +++ build.bat 3 Jul 2003 01:26:22 - 1.2 @@ -18,6 +18,10 @@ rem - Verify and Set Required Environment Variables +rem - Ignore system CLASSPATH variable +set OLD_CLASSPATH=%CLASSPATH% +set CLASSPATH= + rem - Use Java in JAVA_HOME if JAVA_HOME is set. set OLD_PATH=%PATH% if %JAVA_HOME% == goto noJavaHome @@ -38,3 +42,8 @@ rem - Restore PATH set PATH=%OLD_PATH% set OLD_PATH= + +rem - Restore CLASSPATH +set CLASSPATH=%OLD_CLASSPATH% +set OLD_CLASSPATH= +
cvs commit: cocoon-2.0/src/java/org/apache/cocoon/sitemap ErrorNotifier.java
vgritsenko2003/07/02 19:10:01 Modified:.changes.xml src/java/org/apache/cocoon/components/language/markup/sitemap/java sitemap.xsl src/java/org/apache/cocoon/components/pipeline AbstractEventPipeline.java CachingEventPipeline.java EventPipeline.java Removed: src/java/org/apache/cocoon Notificable.java Notifier.java Notification.java src/java/org/apache/cocoon/sitemap ErrorNotifier.java Log: Removed deprecated notification classes (deprecated 1.5 years ago) Revision ChangesPath 1.28 +22 -13cocoon-2.0/changes.xml Index: changes.xml === RCS file: /home/cvs/cocoon-2.0/changes.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- changes.xml 3 Jul 2003 01:16:07 - 1.27 +++ changes.xml 3 Jul 2003 02:10:01 - 1.28 @@ -43,29 +43,38 @@ /devs release version=@version@ date=@date@ + action dev=VG type=remove +Removed deprecated notification classes in org.apache.cocoon and in +org.apache.cocoon.sitemap packages. Removed deprecated methods in +EventPipeline and in org.apache.cocoon.components.notification.Notifier. + /action action dev=VG type=update -Decouple core XSP logicsheet from database classes to allow XSP deployment without excalibur -datasource JAR file. If your XSP pages use datasources directly (and not through ESQL logicsheet), -add xsp:include. +Decouple core XSP logicsheet from database classes to allow XSP deployment +without excalibur datasource JAR file. If your XSP pages use datasources +directly (and not through ESQL logicsheet), add xsp:include. /action action dev=VG type=update -Build script updated: build properties extracted into build.properties file, database.properties -file removed. Override build.properties with local.build.properties or with ~/cocoon.build.properties +Build script updated: build properties extracted into build.properties +file, database.properties file removed. Override build.properties with +local.build.properties or with ~/cocoon.build.properties /action action dev=JH type=fix fixes-bug=20682 due-to=Wolfgang Kowarschick due-to-email=[EMAIL PROTECTED] -Fixed return of different DirValidity objects on multiple calls on getValidity() in the DirectoryGenerator. +Fixed return of different DirValidity objects on multiple calls on +getValidity() in the DirectoryGenerator. /action action dev=JH type=update fixes-bug=20911 due-to=Jorg Heymans due-to-email=[EMAIL PROTECTED] -Backported the caching from Cocoon 2.1, fixed cache key generation, fixed the root pattern handling -(if not matching directory found leave out the ancestors), fixed empty src attribute handling. +Backported the caching from Cocoon 2.1, fixed cache key generation, fixed +the root pattern handling (if not matching directory found leave out the +ancestors), fixed empty src attribute handling. /action action dev=JH type=fix fixes-bug=15365 due-to=Maciek Kaminski due-to-email=[EMAIL PROTECTED] -Added/fixed internationalization support for HSSFSerializer by setting the output encoding -hardcoded to UTF-16. It's obviously only a hack, but so it's at least usable for more people. +Added/fixed internationalization support for HSSFSerializer by setting the +output encoding hardcoded to UTF-16. It's obviously only a hack, but so +it's at least usable for more people. /action action dev=JH type=fix fixes-bug=20658 due-to=Alfred Nathaniel due-to-email=[EMAIL PROTECTED] -Fixed usage of deprecated(?)/possibly removed method XSPUtil.include() in ESQL logicsheet -lt;esql:get-xml/gt; by usage of convenience methods (bug 20658). +Fixed usage of deprecated(?)/possibly removed method XSPUtil.include() in +ESQL logicsheet lt;esql:get-xml/gt; by usage of convenience methods (bug 20658). /action action dev=JH type=fix fixes-bug=14977 due-to=Tony Culshaw due-to-email=[EMAIL PROTECTED] Fixed NPE in SQLTransformer.serializeData(). 1.2 +3 -6 cocoon-2.0/src/java/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl Index: sitemap.xsl === RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sitemap.xsl 9 Mar 2003 00:01:55 - 1.1 +++ sitemap.xsl 3 Jul 2003 02:10:01 - 1.2 @@ -791,13 +791,10 @@ final boolean debug_enabled
cvs commit: cocoon-2.0/src/java/org/apache/cocoon/components/profiler ProfilingCachingEventPipeline.java ProfilingNonCachingEventPipeline.java
vgritsenko2003/07/02 19:12:25
Modified:src/java/org/apache/cocoon/components/profiler
ProfilingCachingEventPipeline.java
ProfilingNonCachingEventPipeline.java
Log:
Removed deprecated notification classes (deprecated 1.5 years ago)
Revision ChangesPath
1.2 +1 -10
cocoon-2.0/src/java/org/apache/cocoon/components/profiler/ProfilingCachingEventPipeline.java
Index: ProfilingCachingEventPipeline.java
===
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/profiler/ProfilingCachingEventPipeline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProfilingCachingEventPipeline.java9 Mar 2003 00:02:23 - 1.1
+++ ProfilingCachingEventPipeline.java3 Jul 2003 02:12:25 - 1.2
@@ -95,15 +95,6 @@
this.manager = null;
}
-public void setGenerator (String role, String source, Parameters param,
Exception e)
-throws Exception {
-super.setGenerator(role, source, param, e);
-
-if(this.data == null)
-this.data = new ProfilerData();
-this.data.setGenerator(super.generator, role, source);
-}
-
public void setGenerator (String role, String source, Parameters param)
throws Exception {
super.setGenerator(role, source, param);
1.2 +1 -10
cocoon-2.0/src/java/org/apache/cocoon/components/profiler/ProfilingNonCachingEventPipeline.java
Index: ProfilingNonCachingEventPipeline.java
===
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/profiler/ProfilingNonCachingEventPipeline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProfilingNonCachingEventPipeline.java 9 Mar 2003 00:02:23 - 1.1
+++ ProfilingNonCachingEventPipeline.java 3 Jul 2003 02:12:25 - 1.2
@@ -95,15 +95,6 @@
this.manager = null;
}
-public void setGenerator (String role, String source, Parameters param,
Exception e)
-throws Exception {
-super.setGenerator(role, source, param, e);
-
-if(this.data == null)
-this.data = new ProfilerData();
-this.data.setGenerator(super.generator, role, source);
-}
-
public void setGenerator (String role, String source, Parameters param)
throws Exception {
super.setGenerator(role, source, param);
