Re: cvs commit: cocoon-2.1 status.xml
[EMAIL PROTECTED] wrote: cziegeler2004/06/09 04:59:23 ... Log: Add profiling/debugging API for the sitemap. :-D -- Nicola Ken Barozzi [EMAIL PROTECTED] - verba volant, scripta manent - (discussions get forgotten, just code remains) -
Re: cvs commit: cocoon-2.1 status.xml
[EMAIL PROTECTED] wrote: !-- repeater requires unique identification mechanism of the row-nodes -- !-- (it is of course possible to implement other binding strategies) -- + !-- important note: the row-path is used inside jxpath-createPath context, + as a consequence it cannot have dependent children or predicates -- fb:repeater id=contacts parent-path=. row-path=contacts unique-row-id=id unique-path=@id Why did you change that? Currently in my application I have: row-path=member[position() lt; 3] row-path=.[member/gender = 'female'] row-path=.[count(../member) gt; 1] row-path=member[id != $id] and list goes on. With your change, this app won't work anymore. So what do I do in this position? Vadim
Re: cvs commit: cocoon-2.1 status.xml
Vadim wrote: Hello Vadim, as I can not reply to your mail (gmane does not list those mails replying to a mail on [EMAIL PROTECTED]) I answer with an extra mail for now: Now moving it back to list. + !-- important note: the row-path is used inside jxpath-createPath context, + as a consequence it cannot have dependent children or predicates -- Why did you change that? Currently in my application I have: row-path=member[position() 3] row-path=.[member/gender = 'female'] row-path=.[count(../member) 1] row-path=member[id != $id] and list goes on. With your change, this app won't work anymore. So what do I do in this position? Are you refering directly to the comment? I did not add it, I just moved it around. Ok, can you at least tell me whether above example row-paths will work with this new CForms or not? AFAIU/K it's a limitation of JXPath and has nothing to do with Woody/CForms. This should mean if it works til now it will work in future. Maybe you have provided an additional @row-path-insert? I also found this issue when reading the threads about repeater bindings, but don't no more which and who exactly: http://marc.theaimsgroup.com/?t=10697645531r=1w=2 http://marc.theaimsgroup.com/?l=xml-cocoon-devm=107049618519927w=2 http://marc.theaimsgroup.com/?t=10705082112r=1w=2 Maybe Marc can tell us more about it. And maybe you can just test the upgrade task and test it with cforms :) I will add a stylesheet for the changed syntax to it too. Joerg
Re: cvs commit: cocoon-2.1 status.xml
Joerg Heinicke wrote: Ok, can you at least tell me whether above example row-paths will work with this new CForms or not? AFAIU/K it's a limitation of JXPath and has nothing to do with Woody/CForms. This should mean if it works til now it will work in future. Maybe you have provided an additional @row-path-insert? I don't do inserts there :-) I guess this remark applicable only when repeater tries to insert row. I have to test this and improve the comment Thanks, Vadim
Re: cvs commit: cocoon-2.1 status.xml
On 09.03.2004 11:57, [EMAIL PROTECTED] wrote: + action dev=RP type=update + Renaming Woody to CocoonForms + - The Woody block (src/blocks/woody) has moved into the new Cocoon Forms +block (src/blocks/forms). + - new namespaces: + * from xmlns:wd=http://apache.org/cocoon/woody/definition/1.0; + to xmlns:fd=http://apache.org/cocoon/forms/1.0#definition; + * from xmlns:wb=http://apache.org/cocoon/woody/binding/1.0; + to xmlns:fb=http://apache.org/cocoon/forms/1.0#binding; + * from xmlns:wi=http://apache.org/cocoon/woody/instance/1.0; + to xmlns:fi=http://apache.org/cocoon/forms/1.0#instance; + * from xmlns:wt=http://apache.org/cocoon/woody/template/1.0; + to xmlns:ft=http://apache.org/cocoon/forms/1.0#template; + - Java packages moved from org.apache.cocoon.woody to +org.apache.cocoon.forms + - Petstore and Apples examples have been renamed + /action The spaces won't be preserved, so the final HTML will look ugly. I guess ul/li will work as this document is transformed to XDocs, isn't it? Joerg
Re: cvs commit: cocoon-2.1 status.xml
On 09.03.2004 02:39, Vadim Gritsenko wrote:
public void characters(char[] ch, int start, int length) {
if (ch.length 0 start = 0 length 1) {
-String text = new String(ch, start, length);
if (elementStack.size() 0) {
IndexHelperField tos = (IndexHelperField)
elementStack.peek();
-tos.appendText(text);
+tos.appendText(ch, start, length);
}
-bodyText.append(text);
+bodyText.append(' ');
+bodyText.append(ch, start, length);
}
}
What will happen when keyword text is streamed as two characters
events, key and word? I think it will become key word, and
indexing will break.
IIUC, idea was to add a space in between tags, i.e. so
psome/pptext/p is not indexed as sometext. If that's
correct, then better fix would be to add space only if boolean flag
had_start_or_end_element_in_between_char_events set.
Joerg?
Your mail was neither ignored nor accidently deleted - I just didn't
know what really to write, but marked it as important in nice red color
in Mozilla :)
Yes, I see your objection - and asked for them already in the bug
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25934 ;)
So what are the practical use cases this might occure? Maybe it's only a
theoretical problem depending on the thing the index is created from?
On which SAX stream the LuceneIndexHandler operates?
I also don't get your implications for
had_start_or_end_element_in_between_char_events. But I had a look on
the endElement(). It gets the elements from a stack and already tests
for text:
if (text != null text.length() 0) {
Would it make sense to add the space in endElement, if the element
contains text, i.e. the above is true?
Joerg
Re: cvs commit: cocoon-2.1 status.xml
Joerg Heinicke wrote:
On 09.03.2004 02:39, Vadim Gritsenko wrote:
public void characters(char[] ch, int start, int length) {
if (ch.length 0 start = 0 length 1) {
-String text = new String(ch, start, length);
if (elementStack.size() 0) {
IndexHelperField tos = (IndexHelperField)
elementStack.peek();
-tos.appendText(text);
+tos.appendText(ch, start, length);
}
-bodyText.append(text);
+bodyText.append(' ');
+bodyText.append(ch, start, length);
}
}
What will happen when keyword text is streamed as two characters
events, key and word? I think it will become key word, and
indexing will break.
IIUC, idea was to add a space in between tags, i.e. so
psome/pptext/p is not indexed as sometext. If that's
correct, then better fix would be to add space only if boolean flag
had_start_or_end_element_in_between_char_events set.
Joerg?
Your mail was neither ignored nor accidently deleted - I just didn't
know what really to write, but marked it as important in nice red
color in Mozilla :)
:-)
Yes, I see your objection - and asked for them already in the bug
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25934 ;)
So what are the practical use cases this might occure? Maybe it's only
a theoretical problem depending on the thing the index is created
from? On which SAX stream the LuceneIndexHandler operates?
I remember there were issues already in other components with text being
splitted up onto multiple character events. So, think of this as of
preventive maintenance.
I also don't get your implications for
had_start_or_end_element_in_between_char_events. But I had a look on
the endElement(). It gets the elements from a stack and already tests
for text:
if (text != null text.length() 0) {
Would it make sense to add the space in endElement, if the element
contains text, i.e. the above is true?
This was my first though... But then, multiple closing tags will cause
multiple spaces... So, I thought, this should work:
startElement:
flag = true;
endElement:
flag = true;
characters:
if (flag)
x.append(' ');
flag = false;
Does it solves the problem?
Vadim
Re: cvs commit: cocoon-2.1 status.xml
Vadim Gritsenko wrote:
[EMAIL PROTECTED] wrote:
public void characters(char[] ch, int start, int length) {
if (ch.length 0 start = 0 length 1) {
-String text = new String(ch, start, length);
if (elementStack.size() 0) {
IndexHelperField tos = (IndexHelperField)
elementStack.peek();
-tos.appendText(text);
+tos.appendText(ch, start, length);
}
-bodyText.append(text);
+bodyText.append(' ');
+bodyText.append(ch, start, length);
}
}
What will happen when keyword text is streamed as two characters
events, key and word? I think it will become key word, and
indexing will break.
IIUC, idea was to add a space in between tags, i.e. so
psome/pptext/p is not indexed as sometext. If that's
correct, then better fix would be to add space only if boolean flag
had_start_or_end_element_in_between_char_events set.
Joerg?
Vadim
Re: cvs commit: cocoon-2.1 status.xml
[EMAIL PROTECTED] wrote:
public void characters(char[] ch, int start, int length) {
if (ch.length 0 start = 0 length 1) {
-String text = new String(ch, start, length);
if (elementStack.size() 0) {
IndexHelperField tos = (IndexHelperField) elementStack.peek();
-tos.appendText(text);
+tos.appendText(ch, start, length);
}
-bodyText.append(text);
+bodyText.append(' ');
+bodyText.append(ch, start, length);
}
}
What will happen when keyword text is streamed as two characters
events, key and word? I think it will become key word, and
indexing will break.
IIUC, idea was to add a space in between tags, i.e. so
psome/pptext/p is not indexed as sometext. If that's correct,
then better fix would be to add space only if boolean flag
had_start_or_end_element_in_between_char_events set.
Vadim
Re: cvs commit: cocoon-2.1 status.xml
[EMAIL PROTECTED] wrote: [EMAIL PROTECTED] off - -REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights -REM reserved. ... [EMAIL PROTECTED] off + +REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights +REM reserved. Antonio, you copied a file from the dark side? Vadim
Re: cvs commit: cocoon-2.1 status.xml
Hi Vadim: Nope. I just rewrote files from the ant distribution. Best Regards, Antonio Gallardo
Re: cvs commit: cocoon-2.1 status.xml
Antonio Gallardo wrote: Hi Vadim: Nope. I just rewrote files from the ant distribution. Then you must have picked up wrong combination of files / tools. You should use windows files with windows tools and unix files with unix tools, don't mix and match, this causes problems like this one. Hope you'll fix it, Thanks, Vadim
Re: cvs commit: cocoon-2.1 status.xml
Vadim Gritsenko dijo: Antonio Gallardo wrote: Hi Vadim: Nope. I just rewrote files from the ant distribution. Then you must have picked up wrong combination of files / tools. You should use windows files with windows tools and unix files with unix tools, don't mix and match, this causes problems like this one. ??? How I could pick a wrong combination? There was just one file of each one. :-D I don't edited them. I just untar and then copy them. I will go down to the windows world and download the zip version after that I will copy the bat files from them. Is this correct? Best Regards, Antonio Gallardo
Re: cvs commit: cocoon-2.1 status.xml
Vadim Gritsenko dijo: No, it will be easier if you just convert all the wrong files to unix, either by using dos2unix or any other tool. Hi Vadim: OK. Thanks for the tip. I will do it. But a question remains in my mind: How this happens? I just downloaded a tar.bz2 file. untar it using ark (from KDE) and then copy the files to cocoon dirs (using Konqueror). I never opened to edit or somethng similar. Maybe there is an error in the distribution. Who knows? Best Regards, Antonio Gallardo
Re: cvs commit: cocoon-2.1 status.xml
Antonio Gallardo wrote: Vadim Gritsenko dijo: No, it will be easier if you just convert all the wrong files to unix, either by using dos2unix or any other tool. Hi Vadim: OK. Thanks for the tip. I will do it. But a question remains in my mind: How this happens? I just downloaded a tar.bz2 file. untar it using ark (from KDE) and then copy the files to cocoon dirs (using Konqueror). I never opened to edit or somethng similar. Maybe there is an error in the distribution. Who knows? Perhaps the Ant project has a corrupted CVS like our was. They might have dos line-endings in their ant.bat etc. One side-effect of this commit is that we have no idea what the real changes were. It appears that every line is changed. --David
Re: cvs commit: cocoon-2.1 status.xml
David Crossley dijo: Perhaps the Ant project has a corrupted CVS like our was. They might have dos line-endings in their ant.bat etc. One side-effect of this commit is that we have no idea what the real changes were. It appears that every line is changed. Yes. You are right. I don't wanted to cause this troubles at all. :-( Best Regards, Antonio Gallardo
Re: cvs commit: cocoon-2.1 status.xml
David Crossley dijo: Perhaps the Ant project has a corrupted CVS like our was. They might have dos line-endings in their ant.bat etc. I thought .bat files must have line ending as DOS: 0x0D 0x0A And Linux files must have just 0x0A Is this correct? The files in the ant distribution follow this. I think the files we had before does not follow this. But if our standard said all files need to be UNIX line ending style and we need UNIX line ending syle in DOS .bat files I will change them to UNIX line ending. Please answer, because I am confused about the original Vadim request. Best Regards, Antonio Gallardo.
Re: cvs commit: cocoon-2.1 status.xml
Antonio Gallardo wrote: David Crossley dijo: Perhaps the Ant project has a corrupted CVS like our was. They might have dos line-endings in their ant.bat etc. I thought .bat files must have line ending as DOS: 0x0D 0x0A And Linux files must have just 0x0A Is this correct? No, not correct. I have moved this discussion over to the thread whitespace cleanup and efficiency drive http://marc.theaimsgroup.com/?l=xml-cocoon-devm=107189347901919 to try to keep the discussion in one place. --David
cvs commit: cocoon-2.1 status.xml
joerg 2003/08/20 10:29:07
Modified:
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
EPCell.java CellType.java Cell.java
.status.xml
Log:
POI: fixed formula support (Bug 22574, thanks to Neil Bacon)
Revision ChangesPath
1.4 +3 -2
cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
Index: EPCell.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EPCell.java 14 Jun 2003 00:26:27 - 1.3
+++ EPCell.java 20 Aug 2003 17:29:07 - 1.4
@@ -233,7 +233,8 @@
*/
public void initialize(final Attribute[] attributes, final ElementProcessor
parent) throws IOException {
super.initialize(attributes, parent);
-int cellType = -1;
+// default value (when gmr:Cell has no ValueType attribute)
+int cellType = CellType.CELL_TYPE_FORMULA;
try {
cellType = getCellType();
} catch (NullPointerException ignored) {
1.3 +13 -24
cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/CellType.java
Index: CellType.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/CellType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CellType.java 11 Mar 2003 19:05:01 - 1.2
+++ CellType.java 20 Aug 2003 17:29:07 - 1.3
@@ -52,8 +52,6 @@
package org.apache.cocoon.components.elementprocessor.impl.poi.hssf.elements;
-
-
import org.apache.poi.hssf.usermodel.HSSFCell;
/**
@@ -62,8 +60,10 @@
* @author Marc Johnson ([EMAIL PROTECTED])
* @version CVS $Id$
*/
-public class CellType
-{
+public class CellType {
+
+
+public static final int CELL_TYPE_FORMULA = -1;
public static final int CELL_TYPE_EMPTY = 10;
public static final int CELL_TYPE_BOOLEAN = 20;
public static final int CELL_TYPE_INTEGER = 30;
@@ -73,33 +73,27 @@
public static final int CELL_TYPE_CELLRANGE = 70;
public static final int CELL_TYPE_ARRAY = 80;
-private CellType()
-{
+private CellType() {
}
/**
* Is this a valid cell type?
*
* @param val value to be checked
- *
* @return true if valid, false otherwise
*/
-
-public static boolean isValid(final int val)
-{
-switch (val)
-{
-
+public static boolean isValid(final int val) {
+switch (val) {
case CELL_TYPE_EMPTY :
case CELL_TYPE_BOOLEAN :
case CELL_TYPE_INTEGER :
case CELL_TYPE_FLOAT :
case CELL_TYPE_ERROR :
case CELL_TYPE_STRING :
+case CELL_TYPE_FORMULA :
case CELL_TYPE_CELLRANGE :
case CELL_TYPE_ARRAY :
return true;
-
default :
return false;
}
@@ -109,22 +103,17 @@
* Convert a CellType enum into an HSSFCell enum
*
* @param val the value to be converted
- *
* @return the converted value
*/
-
-static int convertCellType(final int val)
-{
-switch (val)
-{
-
+static int convertCellType(final int val) {
+switch (val) {
case CELL_TYPE_INTEGER :
case CELL_TYPE_FLOAT :
return HSSFCell.CELL_TYPE_NUMERIC;
-
case CELL_TYPE_STRING :
return HSSFCell.CELL_TYPE_STRING;
-
+case CELL_TYPE_FORMULA :
+return HSSFCell.CELL_TYPE_FORMULA;
default :
return HSSFCell.CELL_TYPE_BLANK;
}
1.5 +1 -8
cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Cell.java
Index: Cell.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Cell.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Cell.java 8 Aug 2003 13:42:47 - 1.4
+++ Cell.java 20 Aug 2003 17:29:07 - 1.5
@@ -108,13 +108,6 @@
* @exception IOException
*/
void setContent(final String content) throws
cvs commit: cocoon-2.1 status.xml
bruno 2003/08/06 08:54:13
Modified:src/blocks/apples/java/org/apache/cocoon/components/flow/apples
ApplesProcessor.java
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java
src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
src/documentation/xdocs/userdocs/flow api.xml
src/blocks/apples/samples sitemap.xmap
.status.xml
Log:
Cleaned up the situation with regards to the uri argument to
the sendPage, sendPageAndWait, and processPipelineTo functions.
URI's starting with a slash are resolved against the root sitemap,
URI's not starting with a slash are resolved against the current sitemap.
Revision ChangesPath
1.3 +0 -6
cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
Index: ApplesProcessor.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplesProcessor.java 4 Aug 2003 09:15:50 - 1.2
+++ ApplesProcessor.java 6 Aug 2003 15:54:13 - 1.3
@@ -58,7 +58,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.excalibur.source.SourceUtil;
/**
* ApplesProcessor is the core Cocoon component that provides the 'Apples'
@@ -148,12 +147,7 @@
env.redirect(false, res.getURI());
} else {
String uri = res.getURI();
-if (SourceUtil.indexOfSchemeColon(uri) == -1) {
-uri = cocoon:/ + uri;
-}
-
getLogger().debug(Apple forwards to + uri + with bizdata= +
res.getData());
-
this.forwardTo(uri, res.getData(), wk, env);
}
1.9 +3 -6
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FOM_Cocoon.java 4 Aug 2003 21:07:47 - 1.8
+++ FOM_Cocoon.java 6 Aug 2003 15:54:13 - 1.9
@@ -158,10 +158,7 @@
String redUri = uri;
-if(! uri.startsWith( cocoon:// ) ) {
-redUri = cocoon:// + this.environment.getURIPrefix() + uri;
-}
-FOM_WebContinuation fom_wk =
+FOM_WebContinuation fom_wk =
new FOM_WebContinuation(wk);
fom_wk.setParentScope(getParentScope());
fom_wk.setPrototype(getClassPrototype(getParentScope(),
@@ -916,7 +913,7 @@
throws Exception {
interpreter.forwardTo(getTopLevelScope(this),
this,
- cocoon:// + environment.getURIPrefix() + uri,
+ uri,
bean,
fom_wk,
environment);
1.7 +17 -2
cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
Index: AbstractInterpreter.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractInterpreter.java 31 Jul 2003 17:30:13 - 1.6
+++ AbstractInterpreter.java 6 Aug 2003 15:54:13 - 1.7
@@ -63,6 +63,7 @@
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
+import org.apache.excalibur.source.SourceUtil;
import java.io.OutputStream;
import java.util.ArrayList;
@@ -177,9 +178,18 @@
throw new NullPointerException(No outputstream specified for process);
}
+// if the uri starts with a slash, then assume that the uri contains an
absolute
+// path, starting from the root sitemap. Otherwise, the uri is relative to
the current
+// sitemap.
+if (uri.length() 0 uri.charAt(0) == '/') {
+uri = uri.substring(1);
+} else {
+uri = env.getURIPrefix() + uri;
+}
+
// Create a wrapper environment for the subrequest to be processed.
EnvironmentWrapper
cvs commit: cocoon-2.1 status.xml
cziegeler2003/08/11 02:09:22 Modified:.status.xml Log: Simply DTD which is better than nothing Revision ChangesPath 1.113 +36 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- status.xml9 Aug 2003 18:21:49 - 1.112 +++ status.xml11 Aug 2003 09:09:22 - 1.113 @@ -1,5 +1,40 @@ ?xml version=1.0? !DOCTYPE status [ +!ELEMENT status (developers, todo, changes) +!ELEMENT developers (person+) +!ELEMENT person EMPTY +!ATTLIST person + name CDATA #REQUIRED + email CDATA #REQUIRED + id CDATA #REQUIRED + +!ELEMENT todo (actions+) +!ELEMENT actions (action+) +!ATTLIST actions + priority (high | medium | low) #REQUIRED + +!ELEMENT action (#PCDATA | link | br | code)* +!ATTLIST action + context (build | code | docs) #IMPLIED + assigned-to CDATA #IMPLIED + dev CDATA #IMPLIED + type (add | fix | remove | update) #IMPLIED + fixes-bug CDATA #IMPLIED + due-to CDATA #IMPLIED + due-to-email CDATA #IMPLIED + +!ELEMENT changes (release+) +!ELEMENT code (#PCDATA) +!ELEMENT br EMPTY +!ELEMENT link (#PCDATA) +!ATTLIST link + href CDATA #REQUIRED + +!ELEMENT release (action+) +!ATTLIST release + version CDATA #REQUIRED + date CDATA #REQUIRED + !ENTITY eacute #x000E9; !ENTITY ouml #x000F6; !ENTITY uuml #x000FC;
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 status.xml
joerg 2003/08/13 13:03:13 Modified:.status.xml Log: @fixes-bug added to i18n backwards compitability fix Revision ChangesPath 1.120 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- status.xml13 Aug 2003 17:12:25 - 1.119 +++ status.xml13 Aug 2003 20:03:13 - 1.120 @@ -202,7 +202,7 @@ changes release version=@version@ date=@date@ - action dev=SW type=fix + action dev=SW type=fix fixes-bug=20445 Update the I18nTransformer so that it also accepts the 2.0 namespace. This ensures backwards compatibility for 2.0 applications. Additionally, attributes on i18n: elements can now be in the default namespace (meaning we can now write lt;i8n:text key=foogt; instead of lt;i18n:text i18n:key=foogt;)
cvs commit: cocoon-2.1 status.xml
bruno 2003/08/13 01:54:44 Modified:.status.xml Log: fix document locator problem in SVG serializer Revision ChangesPath 1.118 +9 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- status.xml12 Aug 2003 15:50:40 - 1.117 +++ status.xml13 Aug 2003 08:54:44 - 1.118 @@ -202,6 +202,14 @@ changes release version=@version@ date=@date@ + action dev=BRD type=fix + Fix in the SVG serializer: if setDocumentLocator wasn't called on the + serializer (which can happen if you have e.g. an XSLT transformer in the + pipeline), then the base URI for the SVG document wasn't set which could + cause exceptions. Now it is set to http://localhost/ in such cases. Also + fixed a problem with the document locator not being reset between + subsequent retrievals of the serializer from the pool. + /action 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.
cvs commit: cocoon-2.1 status.xml
joerg 2003/08/07 09:54:16 Modified:.status.xml Log: Making instrumentation work again (bug 19839). Revision ChangesPath 1.111 +6 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- status.xml7 Aug 2003 13:37:23 - 1.110 +++ status.xml7 Aug 2003 16:54:16 - 1.111 @@ -167,7 +167,11 @@ changes release version=@version@ date=@date@ - action dev=JH type=fix due-to=Nicolas Maisonneuve due-to-email=[EMAIL PROTECTED] + action dev=JH type=fix fixes-bug=19839 +Instrumentation support: Updated client libraries to make instrumentation work again. +Added a target start-instrumentation-client to Cocoon's ant files and removed runclient shell scripts. + /action + action dev=JH type=fix fixes-bug=22064 due-to=Nicolas Maisonneuve due-to-email=[EMAIL PROTECTED] XMLDBTransformer: retrieving auto-generated resource id. /action action dev=BD type=add due-to=Mark Leicester due-to.email=[EMAIL PROTECTED]
cvs commit: cocoon-2.1 status.xml
cziegeler2003/08/14 22:47:41 Modified:.status.xml Log: Updated status.xml Revision ChangesPath 1.122 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- status.xml14 Aug 2003 13:20:35 - 1.121 +++ status.xml15 Aug 2003 05:47:41 - 1.122 @@ -116,7 +116,7 @@ /action action context=code assigned-to=SW - For 2.1: Views must start not from the first encountered label, but from the last one + For 2.2: Views must start not from the first encountered label, but from the last one (see http://marc.theaimsgroup.com/?l=xml-cocoon-devamp;m=101784499622172amp;w=2) /action
cvs commit: cocoon-2.1 status.xml
bdelacretaz2003/08/07 00:00:24 Modified:.status.xml Log: slop block added Revision ChangesPath 1.108 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- status.xml7 Aug 2003 03:33:00 - 1.107 +++ status.xml7 Aug 2003 07:00:24 - 1.108 @@ -167,6 +167,9 @@ changes release version=@version@ date=@date@ + action dev=BD type=add +slop block added (Simple Line Oriented Parser) + /action action dev=JH type=fix fixes-bug=21931, 22173 due-to=Unico Hommes due-to-email=[EMAIL PROTECTED] LDAPTransformer now handles multiple attribute values.
cvs commit: cocoon-2.1 status.xml
joerg 2003/08/07 06:37:23 Modified:.status.xml Log: fixing bug 22064 (thanks to Nicolas Maisonneuve): retrieving auto-generated resource id Revision ChangesPath 1.110 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- status.xml7 Aug 2003 07:27:01 - 1.109 +++ status.xml7 Aug 2003 13:37:23 - 1.110 @@ -167,6 +167,9 @@ changes release version=@version@ date=@date@ + action dev=JH type=fix due-to=Nicolas Maisonneuve due-to-email=[EMAIL PROTECTED] +XMLDBTransformer: retrieving auto-generated resource id. + /action action dev=BD type=add due-to=Mark Leicester due-to.email=[EMAIL PROTECTED] midi block added /action
cvs commit: cocoon-2.1 status.xml
bruno 2003/08/06 07:45:02 Modified:.status.xml Log: Fixed bug 19841: untranslated-text doesn't work for i18n:text Revision ChangesPath 1.104 +5 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- status.xml4 Aug 2003 13:48:41 - 1.103 +++ status.xml6 Aug 2003 14:45:02 - 1.104 @@ -167,6 +167,10 @@ changes release version=@version@ date=@date@ + action dev=BRD type=fix fixes-bug=19841 +I18nTransformer: if content of i18n:text is empty and translation is not +found, use untranslated-text. + /action action dev=CH type=fix fixes-bug=22050 due-to=Gildas Guillemot due-to-email=[EMAIL PROTECTED] ESQL: explicitly release database resources.
cvs commit: cocoon-2.1 status.xml
haul2003/08/04 06:48:41 Modified:.status.xml Log: Fix Bug 22050 inspired by gguillemot.at.rennes.jouve.fr (Gildas Guillemot) esql does not release database resources explicitly but rely on GC. Revision ChangesPath 1.103 +5 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- status.xml1 Aug 2003 10:52:20 - 1.102 +++ status.xml4 Aug 2003 13:48:41 - 1.103 @@ -167,6 +167,10 @@ changes release version=@version@ date=@date@ + action dev=CH type=fix fixes-bug=22050 due-to=Gildas Guillemot +due-to-email=[EMAIL PROTECTED] +ESQL: explicitly release database resources. + /action action dev=CZ type=fix fixes-bug=21213 due-to=Frank Taffelt due-to-email=[EMAIL PROTECTED] Paginator now caches dynamic pagesheet correctly.
cvs commit: cocoon-2.1 status.xml forrest.properties
cziegeler2003/07/29 02:01:01 Modified:src/java/org/apache/cocoon cocoon.properties .status.xml forrest.properties Log: Starting next version Revision ChangesPath 1.12 +1 -1 cocoon-2.1/src/java/org/apache/cocoon/cocoon.properties Index: cocoon.properties === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/cocoon.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cocoon.properties 29 Jul 2003 08:26:35 - 1.11 +++ cocoon.properties 29 Jul 2003 09:01:01 - 1.12 @@ -4,7 +4,7 @@ # very high chance of breaking the build system. Do it only if you know what # you're doing. -version=2.1rc1 +version=2.1rc2-dev released.version=2.0.4 year=1999-2003 name=cocoon 1.98 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- status.xml29 Jul 2003 02:07:31 - 1.97 +++ status.xml29 Jul 2003 09:01:01 - 1.98 @@ -167,6 +167,9 @@ changes release version=@version@ date=@date@ + action dev=NN type=addDummy action/action + /release + release version=2.1rc1 date=July 29 2003 action dev=VG type=update Updated FOP to the latest released version, 0.20.5. /action 1.19 +1 -1 cocoon-2.1/forrest.properties Index: forrest.properties === RCS file: /home/cvs/cocoon-2.1/forrest.properties,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- forrest.properties29 Jul 2003 08:26:36 - 1.18 +++ forrest.properties29 Jul 2003 09:01:01 - 1.19 @@ -6,7 +6,7 @@ #forrest.echo=true # Project name (used to name .war file) -project.name=cocoon-2.1rc1 +project.name=cocoon-2.1rc2-dev # Specifies name of Forrest skin to use #project.skin=forrest-site
Re: cvs commit: cocoon-2.1 status.xml
[EMAIL PROTECTED] wrote:
gianugo 2003/07/28 04:28:22
Modified:src/java/org/apache/cocoon/transformation
SourceWritingTransformer.java
src/documentation/xdocs/userdocs/transformers
sourcewriting-transformer.xml
.status.xml
Log:
Added delete capabilities to the SourceWritingTransformer, while solving
a DOM bug(?) with new documents creation.
Revision ChangesPath
1.5 +77 -9 cocoon-2.1/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
...
@@ -647,7 +706,7 @@
// import the fragment
Node importNode = resource.importNode(fragment, true);
if ( path.equals() ) { // this is allowed in write
-resource.appendChild(importNode);
+resource.appendChild(importNode.getFirstChild());
message = entire source overwritten;
Was this bit the DOM bug? Was it caused by whitespace outside root
node when overwriting the whole document? There was some discussion
about 9 months ago where some (at least one) thought that was mandatory
behavior and the responsibility of the fragment author (or pipeline) to
remove whitespace.
If you've changed that behavior I'm personally very +1 but it may be
worth a discussion.
Geoff
Re: cvs commit: cocoon-2.1 status.xml
Geoff Howard wrote:
@@ -647,7 +706,7 @@
// import the fragment
Node importNode = resource.importNode(fragment, true);
if ( path.equals() ) { // this is allowed in write
-resource.appendChild(importNode);
+resource.appendChild(importNode.getFirstChild());
message = entire source overwritten;
Was this bit the DOM bug? Was it caused by whitespace outside root
node when overwriting the whole document? There was some discussion
about 9 months ago where some (at least one) thought that was mandatory
behavior and the responsibility of the fragment author (or pipeline) to
remove whitespace.
If you've changed that behavior I'm personally very +1 but it may be
worth a discussion.
I don't think it's a matter of whitespace. I'm not a DOM guru, but if
the firstChild is a whitespace node it should be returned by the
getFistChild() call as well. Actually, I am a bit puzzled too, since the
SWT wasn't working on my setup but it was on others (I suspect it has to
do with the latest JVM that I'm using), no matter what sample documents
I gave to him. With this one liner, everything was working OK, so I just
thought to change it. But I'm more than open to any discussion. :-)
Ciao,
--
Gianugo Rabellino
Pro-netics s.r.l. - http://www.pro-netics.com
Orixo, the XML business alliance - http://www.orixo.com
(Now blogging at: http://blogs.cocoondev.org/gianugo/)
cvs commit: cocoon-2.1 status.xml
cziegeler2003/07/11 07:20:35 Modified:.status.xml Log: Adding global request lifecycle component Revision ChangesPath 1.86 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- status.xml11 Jul 2003 08:59:03 - 1.85 +++ status.xml11 Jul 2003 14:20:35 - 1.86 @@ -184,6 +184,9 @@ changes release version=@version@ date=@date@ + action dev=CZ type=add + Adding global request lifecycle component. + /action action dev=CZ type=update The cache used by the caching processing pipeline is now configurable allowing to use different caches in different pipelines.
