cvs commit: cocoon-2.1 status.xml gump.xml blocks.properties
antonio 2004/07/11 10:43:57 Modified:.status.xml gump.xml blocks.properties Log: Fixing bug #30038: lucene-block samples dependends on xsp and forms Revision ChangesPath 1.393 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.392 retrieving revision 1.393 diff -u -r1.392 -r1.393 --- status.xml11 Jul 2004 15:28:46 - 1.392 +++ status.xml11 Jul 2004 17:43:57 - 1.393 @@ -204,6 +204,9 @@ changes release version=@version@ date=@date@ + action dev=AG type=fix fixes-bug=30038 due-to=Jorg Heymans due-to-email=[EMAIL PROTECTED] + Fixing lucene-block samples dependencies. + /action action dev=AG type=update Update lucene to 1.4. /action 1.172 +3 -1 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- gump.xml 11 Jul 2004 07:54:30 - 1.171 +++ gump.xml 11 Jul 2004 17:43:57 - 1.172 @@ -452,6 +452,8 @@ depend project=cocoon inherit=all/ depend project=jakarta-lucene/ +depend project=cocoon-block-xsp type=samples/ +depend project=cocoon-block-forms type=samples/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/ 1.83 +5 -4 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- blocks.properties 2 Jul 2004 08:47:18 - 1.82 +++ blocks.properties 11 Jul 2004 17:43:57 - 1.83 @@ -67,6 +67,7 @@ #include.block.jfor=false #include.block.jsp=false #include.block.linkrewriter=false +#-[dependency]: lucene depends on forms (for samples), xsp (for samples). #include.block.lucene=false #include.block.naming=false #include.block.paranoid=false @@ -85,7 +86,7 @@ #include.block.web3=false #-[dependency]: xmldb depends on databases. #include.block.xmldb=false -#-[dependency]: xsp is needed by chaperon, databases, eventcache, forms, python, scratchpad, session-fw, woody. +#-[dependency]: xsp is needed by chaperon, databases, eventcache, forms, lucene, python, scratchpad, session-fw, woody. #include.block.xsp=false # Unstable blocks -- @@ -107,15 +108,15 @@ #include.block.cron=false #include.block.deli=false #-[dependency]: eventcache depends on jms, xsp (for samples). -#-[dependency]: eventcache is needed by jms, repository. +#-[dependency]: eventcache is needed by repository. #include.block.eventcache=false #-[dependency]: forms depends on xsp (for samples). -#-[dependency]: forms is needed by apples, javaflow, ojb, petstore, tour. +#-[dependency]: forms is needed by apples, javaflow, lucene, ojb, petstore, tour. #include.block.forms=false #-[dependency]: javaflow depends on forms, ojb. #-[dependency]: javaflow is needed by scratchpad. #include.block.javaflow=false -#-[dependency]: jms depends on databases (for samples), eventcache (for samples), hsqldb. +#-[dependency]: jms depends on databases (for samples), hsqldb. #-[dependency]: jms is needed by eventcache, slide. #include.block.jms=false #include.block.linotype=false
cvs commit: cocoon-2.1 status.xml
unico 2004/07/10 02:06:18 Modified:.status.xml Log: - describe two recent actions - fix missing action end tag Revision ChangesPath 1.390 +15 -3 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- status.xml8 Jul 2004 10:11:38 - 1.389 +++ status.xml10 Jul 2004 09:06:18 - 1.390 @@ -203,7 +203,19 @@ changes - release version=@version@ date=@date@ + release version=@version@ date=@date@ + action dev=UH type=add + Enhanced JMS support by adding a JMSConnectionManager component to the JMS block. + This component replaces the JMSConnection component which only supported + publish/subscribe messaging and which mixed some concerns. Two abstract classes: + AbstractMessageListener and AbstractMessagePublisher should be used as basis for + custom publish/subscribe components. + /action + action dev=UH type=add + Still in the scratchpad area at the time of this writing, added a + CachedSource proxy subclass for Sources that implement TraversableSource and + InspectableSource (for instance WebDAVSource). + /action action dev=UV type=add Added a NekoHTMLGenerator to HTML block. This is a simpler HTML parser than JTidy, which preserves more of the original HTML, primarily just balancing @@ -211,7 +223,7 @@ /action action dev=TC type=add fixes-bug=29935 due-to=Leszek Gawron due-to-email=[EMAIL PROTECTED] added support for stripping root elements in the CIncludeTransformer - action + /action action dev=CZ type=add New getSitemapPath() method on the Request object to get the path to the current sitemap even if you are in a sub sitemap. Added an abstract request
cvs commit: cocoon-2.1 status.xml
tcurdt 2004/07/08 00:22:35
Modified:src/java/org/apache/cocoon/transformation
CIncludeTransformer.java
.status.xml
Log:
fixes bug 29935 due to Leszek Gawron ([EMAIL PROTECTED])
added support for stripping root elements in the CIncludeTransformer
Revision ChangesPath
1.13 +12 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CIncludeTransformer.java 17 Jun 2004 14:55:24 - 1.12
+++ CIncludeTransformer.java 8 Jul 2004 07:22:33 - 1.13
@@ -31,6 +31,7 @@
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceParameters;
@@ -134,6 +135,7 @@
public static final String CINCLUDE_INCLUDE_ELEMENT_SELECT_ATTRIBUTE =
select;
public static final String CINCLUDE_INCLUDE_ELEMENT_NS_ATTRIBUTE = ns;
public static final String CINCLUDE_INCLUDE_ELEMENT_PREFIX_ATTRIBUTE =
prefix;
+public static final String CINCLUDE_INCLUDE_ELEMENT_STRIP_ROOT_ATTRIBUTE
= strip-root;
public static final String CINCLUDE_INCLUDEXML_ELEMENT= includexml;
public static final String
CINCLUDE_INCLUDEXML_ELEMENT_IGNORE_ERRORS_ATTRIBUTE = ignoreErrors;
@@ -253,11 +255,15 @@
throws ProcessingException ,IOException, SAXException {
if (name.equals(CINCLUDE_INCLUDE_ELEMENT)) {
+String stripRootValue =
attr.getValue(,CINCLUDE_INCLUDE_ELEMENT_STRIP_ROOT_ATTRIBUTE);
+boolean stripRoot = StringUtils.equals( stripRootValue, true );
+
this.processCIncludeElement(attr.getValue(,CINCLUDE_INCLUDE_ELEMENT_SRC_ATTRIBUTE),
attr.getValue(,CINCLUDE_INCLUDE_ELEMENT_ELEMENT_ATTRIBUTE),
attr.getValue(,CINCLUDE_INCLUDE_ELEMENT_SELECT_ATTRIBUTE),
attr.getValue(,CINCLUDE_INCLUDE_ELEMENT_NS_ATTRIBUTE),
attr.getValue(,CINCLUDE_INCLUDE_ELEMENT_PREFIX_ATTRIBUTE),
+stripRoot,
false);
// Element: include
@@ -311,6 +317,7 @@
null,
null,
null,
+false,
this.cacheManager !=
null);
if (this.compiling) {
this.srcAttributes.addAttribute(,
CINCLUDE_INCLUDE_ELEMENT_SRC_ATTRIBUTE, CINCLUDE_SRC_ELEMENT, CDATA, src);
@@ -458,7 +465,8 @@
protected String processCIncludeElement(String src, String element,
String select, String ns, String
prefix,
-boolean cache)
+boolean stripRoot,
+boolean cache )
throws SAXException, IOException {
if (src == null) {
@@ -476,6 +484,7 @@
+ , select= + select
+ , ns= + ns
+ , prefix= + prefix
+ + , stripRoot= + stripRoot
+ , caching=+cache);
}
@@ -542,6 +551,7 @@
if ( this.compiling ) {
SourceUtil.toSAX(source, mimeType, new
IncludeXMLConsumer(this.contentHandler, this.lexicalHandler));
} else {
+this.filter.setIgnoreRootElement( stripRoot );
SourceUtil.toSAX(source, mimeType, this.filter);
}
}
1.388 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- status.xml7 Jul 2004 07:58:47 - 1.387
+++ status.xml8 Jul 2004 07:22:34 - 1.388
@@ -204,6 +204,9 @@
changes
release version=@version@ date=@date@
+ action dev=TC type=add fixes-bug=29935 due-to=Leszek Gawron
cvs commit: cocoon-2.1 status.xml
tcurdt 2004/07/05 11:38:03
Modified:
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
EPCell.java
.status.xml
Log:
fixes-bug 28015 due to Frank Taffelt ([EMAIL PROTECTED])
POI: cell spanning
Revision ChangesPath
1.6 +24 -17
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EPCell.java 5 Mar 2004 13:02:03 - 1.5
+++ EPCell.java 5 Jul 2004 18:38:03 - 1.6
@@ -25,7 +25,7 @@
import org.apache.cocoon.components.elementprocessor.types.NumericConverter;
import org.apache.cocoon.components.elementprocessor.types.NumericResult;
import org.apache.cocoon.components.elementprocessor.types.Validator;
-
+import org.apache.poi.hssf.util.Region;
/**
* Implementation of ElementProcessor to handle the Cell tag.
* This element has several attributes and may contain other elements.
@@ -129,15 +129,16 @@
* @exception IOException
* @exception NullPointerException
*/
-public int getColumns() throws IOException, NullPointerException {
-if (!_cols_fetched) {
-String valueString = getValue(_cols_attribute);
-if (valueString != null) {
-_cols = NumericConverter.extractPositiveInteger(valueString);
+ public int getColumns() throws IOException, NullPointerException {
+ if (!_cols_fetched) {
+ String valueString = getValue(_cols_attribute);
+ if (valueString != null) {
+ _cols = NumericConverter.extractPositiveInteger(valueString);
+ _cols_fetched = true;
}
-_cols_fetched = true;
+
}
-return _cols.intValue();
+return _cols_fetched ?_cols.intValue() : -1;
}
/**
@@ -146,15 +147,16 @@
* @exception IOException
* @exception NullPointerException
*/
-public int getRows() throws IOException, NullPointerException {
-if (!_rows_fetched) {
-String valueString = getValue(_rows_attribute);
-if (valueString != null) {
-_rows = NumericConverter.extractPositiveInteger(valueString);
-}
-_rows_fetched = true;
+ public int getRows() throws IOException, NullPointerException {
+ if (!_rows_fetched) {
+ String valueString = getValue(_rows_attribute);
+ if (valueString != null) {
+ _rows = NumericConverter.extractPositiveInteger(valueString);
+_rows_fetched = true;
+ }
+
}
-return _rows.intValue();
+return _rows_fetched ? _rows.intValue() : -1 ;
}
/**
@@ -227,6 +229,11 @@
if (content != null !content.trim().equals()) {
getCell().setContent(getContent());
}
+
+if(getColumns() != -1 getRows() != -1) {
+getSheet().addMergedRegion(new
Region(getRow(),(short)getColumn(),getRow() + getRows() - 1,(short)(getColumn()
+ getColumns() - 1)));
+}
+
}
/**
1.385 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- status.xml4 Jul 2004 20:57:02 - 1.384
+++ status.xml5 Jul 2004 18:38:03 - 1.385
@@ -204,6 +204,9 @@
changes
release version=@version@ date=@date@
+ action dev=TC type=add fixes-bug=28015 due-to=Frank Taffelt
due-to-email=[EMAIL PROTECTED]
+ POI: cell spanning
+ /action
action dev=AG type=fix fixes-bug=23002 due-to=Viktor Skladovs
due-to-email=[EMAIL PROTECTED]
POI: processing of tags vcenter, hcenter, monochrome, draft,
Header, Footer in gmr:PrintInformation.
Initial support for Margins (top, bottom, left, right,
header, footer).
cvs commit: cocoon-2.1 status.xml
antonio 2004/07/04 02:45:33 Modified:lib jars.xml .status.xml Added: legaldb-ojb-1.0.0.jar.license.txt commons-pool-1.2.jar.license.txt commons-dbcp-1.2.1.jar.license.txt src/blocks/ojb/lib db-ojb-1.0.0.jar commons-dbcp-1.2.1.jar commons-pool-1.2.jar Removed: legaldb-ojb-1.0.rc6.jar.license.txt commons-dbcp-1.1.jar.license.txt commons-pool-1.1.jar.license.txt src/blocks/ojb/lib db-ojb-1.0.rc6.jar commons-pool-1.1.jar commons-dbcp-1.1.jar Log: Updated commons-dbcp to 1.2.1, commons-pool to 1.2 and db-ojb to 1.0.0 Revision ChangesPath 1.1 cocoon-2.1/legal/db-ojb-1.0.0.jar.license.txt Index: db-ojb-1.0.0.jar.license.txt === Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. Legal Entity shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. You (or Your) shall mean an individual or Legal Entity exercising permissions granted by this License. Source form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. Object form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. Work shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). Derivative Works shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. Contribution shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, submitted means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as Not a Contribution. Contributor shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object
cvs commit: cocoon-2.1 status.xml
joerg 2004/07/04 08:01:11 Modified:.status.xml Log: forms: upload.setValue(), FormattingDateConvertor Revision ChangesPath 1.382 +14 -12cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- status.xml4 Jul 2004 09:45:33 - 1.381 +++ status.xml4 Jul 2004 15:01:11 - 1.382 @@ -204,29 +204,31 @@ changes release version=@version@ date=@date@ + action dev=JH type=add + Forms block: Implement setValue method for the upload widget. + /action + action dev=JH type=fix fixes-bug=29881 due-to=Colin Adams due-to-email=[EMAIL PROTECTED] + Forms block: Handle variants of datatype date correctly (i18n, styling). + /action action dev=AG type=update - Updated commons-digester to 1.5, commons-betwixt to 0.5, commons-pool to 1.2, - commons-dbcp to 1.2.1 and db-ojb to 1.0.0 + Update commons-digester to 1.5, commons-betwixt to 0.5, commons-pool to 1.2, + commons-dbcp to 1.2.1 and db-ojb to 1.0.0. /action action dev=CZ type=update Update to servlet specification 2.3. /action action dev=AG type=update - Updated commons-collections to 3.1 + Update commons-collections to 3.1 /action action dev=AG type=fix fixes-bug=27133 - Fix JxTemplateGenerator eats backslash-characters + Fix JXTemplateGenerator eating backslash characters. /action action dev=AG type=fix fixes-bug=25083 - Add new lt;jx:commentgt; tag. XML comments are no more parsed. Sample: - - lt;!-- This text will not be parsed as it is a comment node. --gt; - - lt;jx:commentgt;This text will be parsed as it is a text node. It will end as - lt;!-- --gt; in the result.lt;/jx:commentgt; + Add new lt;jx:commentgt; tag. XML comments are no more parsed. + See the bug description for a sample. /action action dev=AG type=fix fixes-bug=29369 due-to=Juan Jose Pablos - Move commons-logging-1.0.4.jar to lib/core as jcs.jar depends on it + Move commons-logging-1.0.4.jar to lib/core as jcs.jar depends on it. /action action dev=AG type=fix fixes-bug=17924 due-to=Jorg Heymans Apply patch: Cached resources don't have Expires-Header.
cvs commit: cocoon-2.1 status.xml
antonio 2004/07/04 08:22:00 Modified:.status.xml Log: Add fix notice for bug #24433 Revision ChangesPath 1.383 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- status.xml4 Jul 2004 15:01:11 - 1.382 +++ status.xml4 Jul 2004 15:22:00 - 1.383 @@ -204,6 +204,9 @@ changes release version=@version@ date=@date@ + action dev=AG type=fix fixes-bug=24433 + Fix JXTemplate generator does not handle format-number(number, '$#,##0.00'). + /action action dev=JH type=add Forms block: Implement setValue method for the upload widget. /action
cvs commit: cocoon-2.1 status.xml
antonio 2004/07/04 13:57:03
Modified:
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
EP_Right.java EP_Grid.java Sheet.java
EP_Footer.java EP_HCenter.java EP_Orientation.java
EP_Top.java EPFooter.java EP_Monochrome.java
EP_VCenter.java EP_Header.java EPHeader.java
EP_Paper.java EP_Draft.java EP_Bottom.java
EP_Left.java
.status.xml
Log:
POI: Adding support for gmr:PrintInformation
Revision ChangesPath
1.6 +11 -7
cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Right.java
Index: EP_Right.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Right.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EP_Right.java 5 Mar 2004 13:02:04 - 1.5
+++ EP_Right.java 4 Jul 2004 20:57:02 - 1.6
@@ -26,8 +26,6 @@
*
* This element has two attributes: Points and PrefUnit
*
- * This element is not used in HSSFSerializer 1.0
- *
* @author Marc Johnson ([EMAIL PROTECTED])
* @version CVS $Id$
*/
@@ -54,8 +52,7 @@
double getPoints() throws IOException {
if (_points == null) {
-_points =
-NumericConverter.extractDouble(getValue(_points_attribute));
+_points =
NumericConverter.extractDouble(getValue(_points_attribute));
}
return _points.doubleValue();
}
@@ -68,9 +65,16 @@
int getPrefUnit() throws IOException {
if (_pref_unit == null) {
-_pref_unit =
-PrintUnits.extractPrintUnits(getValue(_pref_unit_attribute));
+_pref_unit =
PrintUnits.extractPrintUnits(getValue(_pref_unit_attribute));
}
return _pref_unit.intValue();
+}
+
+/**
+ * Setup the right margin
+ * @exception IOException
+ */
+public void endProcessing() throws IOException{
+this.getSheet().setRightMargin(getPoints());
}
} // end public class EP_Right
1.6 +19 -13
cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Grid.java
Index: EP_Grid.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Grid.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EP_Grid.java 5 Mar 2004 13:02:04 - 1.5
+++ EP_Grid.java 4 Jul 2004 20:57:02 - 1.6
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,22 +26,21 @@
*
* This element has a single attribute, value, which is boolean.
*
- * This element is not used in HSSFSerializer 1.0
*
* @author Marc Johnson ([EMAIL PROTECTED])
+ * @author Victor Skladovs ([EMAIL PROTECTED])
* @version CVS $Id$
*/
public class EP_Grid extends BaseElementProcessor {
private static final String _value_attribute = value;
-private BooleanResult _value;
+private BooleanResult showGrid;
/**
* constructor
*/
-
public EP_Grid() {
super(null);
-_value = null;
+showGrid = null;
}
/**
@@ -49,12 +48,19 @@
*
* @exception IOException if the value is malformed or missing
*/
-
public boolean getValue() throws IOException {
-if (_value == null) {
-_value =
-BooleanConverter.extractBoolean(getValue(_value_attribute));
+if (showGrid == null) {
+showGrid =
BooleanConverter.extractBoolean(this.getValue(_value_attribute));
}
-return _value.booleanValue();
+return showGrid.booleanValue();
}
+
+/**
+ * set whether or not the grid is printed for the worksheet
+ * @exception IOException
+ */
+public void endProcessing() throws IOException{
+
cvs commit: cocoon-2.1 status.xml
crossley2004/07/02 09:13:17 Modified:.status.xml Log: Fix old wiki URL. Revision ChangesPath 1.379 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- status.xml2 Jul 2004 09:10:15 - 1.378 +++ status.xml2 Jul 2004 16:13:16 - 1.379 @@ -931,7 +931,7 @@ Woody: in the form definition, for widgets that have child widgets, those child widgets should now be embedded inside a wd:widgets element. Practical update information can be found - link href=http://wiki.cocoondev.org/Wiki.jsp?page=WoodySyntaxUpdateForWidgetsElement; + link href=http://wiki.apache.org/cocoon/WoodySyntaxUpdateForWidgetsElement; in the wiki/link. /action action dev=AG type=update
cvs commit: cocoon-2.1 status.xml
vgritsenko2004/06/16 07:32:32 Modified:.status.xml Log: typo Revision ChangesPath 1.366 +3 -3 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- status.xml12 Jun 2004 19:31:29 - 1.365 +++ status.xml16 Jun 2004 14:32:32 - 1.366 @@ -201,11 +201,11 @@ /actions /todo - changes + changes release version=@version@ date=@date@ action dev=AG type=update - Updated quartx to 1.4 + Updated quartz to 1.4 /action action dev=CZ type=add Add configuration support for log4j.
cvs commit: cocoon-2.1 status.xml
antonio 2004/06/12 12:31:29 Modified:.status.xml Log: Updated quartz to 1.4 Revision ChangesPath 1.365 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs//cocoon-2.1/status.xml,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- status.xml11 Jun 2004 20:29:29 - 1.364 +++ status.xml12 Jun 2004 19:31:29 - 1.365 @@ -204,6 +204,9 @@ changes release version=@version@ date=@date@ + action dev=AG type=update + Updated quartx to 1.4 + /action action dev=CZ type=add Add configuration support for log4j. /action
cvs commit: cocoon-2.1 status.xml
vgritsenko2004/06/11 05:05:48 Modified:.status.xml Log: nitpicking Revision ChangesPath 1.363 +4 -5 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- status.xml10 Jun 2004 01:24:21 - 1.362 +++ status.xml11 Jun 2004 12:05:48 - 1.363 @@ -156,7 +156,6 @@ action context=code assigned-to=open Finish moving the scratchpad stuff in main trunk. /action - /actions actions priority=medium @@ -199,7 +198,6 @@ action context=code assigned-to=MPO Remove ContainerWidget concept from cforms. /action - /actions /todo @@ -267,7 +265,7 @@ Remove deprecated methods from XMLUtils, DOMUtil, DOMBuilder and SourceUtil. /action action dev=DC type=update fixes-bug=28809 due-to=Dave Brondsema - Chaperon: Improvements for Chaperon JSPWiki to xdocs conversion: + Chaperon block: Improvements for Chaperon JSPWiki to xdocs conversion: ul liHandle nested bullet lists (number lists already supported)/li liIf 'name' parameter is specified, use it as title (and add spaces between @@ -282,7 +280,8 @@ /ul /action action dev=CZ type=update - Session-fw: Remove deprecated class AbstractSessionComponent from session block. + Session-fw block: Remove deprecated class AbstractSessionComponent from session + block. /action action dev=CZ type=update Redesign the internal environment handling (request processing) and moved
cvs commit: cocoon-2.1 status.xml
vgritsenko2004/06/09 18:24:21 Modified:.status.xml Log: typo Revision ChangesPath 1.362 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- status.xml9 Jun 2004 11:59:23 - 1.361 +++ status.xml10 Jun 2004 01:24:21 - 1.362 @@ -787,7 +787,7 @@ Do not double decode URI in CocoonServlet /action action dev=JH type=fix - Resurrected the XMLDB samples including XIndice 1.1b1 in Cocoon. + Resurrected the XMLDB samples including Xindice 1.1b1 in Cocoon. /action action dev=VG type=remove I18n transformer does not support old configuration syntax anymore
cvs commit: cocoon-2.1 status.xml build.properties
joerg 2004/06/08 13:21:39
Modified:tools/targets compile-build.xml
tools/src blocks-build.xsl
.status.xml build.properties
Log:
build.archive-sources renamed to include.sources-in-jars to match our naming
scheme and added to build.properties
Revision ChangesPath
1.13 +3 -3 cocoon-2.1/tools/targets/compile-build.xml
Index: compile-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/targets/compile-build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- compile-build.xml 7 Jun 2004 08:55:25 - 1.12
+++ compile-build.xml 8 Jun 2004 20:21:38 - 1.13
@@ -125,7 +125,7 @@
/jar
!-- optionally add source files to the core jar --
if
- istrue value=${build.archive-sources}/
+ istrue value=${include.sources-in-jars}/
then
jar jarfile=${build}/${name}.jar update=yes
fileset dir=${java}
@@ -144,7 +144,7 @@
/jar
!-- optionally add source files to the jar --
if
- istrue value=${build.archive-sources}/
+ istrue value=${include.sources-in-jars}/
then
jar jarfile=${build}/${name}-deprecated.jar update=yes
fileset dir=${deprecated.src}
@@ -167,7 +167,7 @@
/jar
!-- optionally add source files to the jar --
if
- istrue value=${build.archive-sources}/
+ istrue value=${include.sources-in-jars}/
then
jar jarfile=${build}/${name}-testcase.jar update=yes
fileset dir=${test}
1.72 +1 -1 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- blocks-build.xsl 7 Jun 2004 08:55:25 - 1.71
+++ blocks-build.xsl 8 Jun 2004 20:21:38 - 1.72
@@ -439,7 +439,7 @@
/jar
if
-istrue value=${{build.archive-sources}}/
+istrue value=${{include.sources-in-jars}}/
then
jar jarfile=${{build.blocks}}/{$block-name}-block.jar
update=true
fileset dir=${{blocks}}/{$block-name}/java
1.358 +2 -2 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- status.xml8 Jun 2004 13:09:24 - 1.357
+++ status.xml8 Jun 2004 20:21:38 - 1.358
@@ -218,7 +218,7 @@
Portal: Fix problem with bookmarks and CachingURICoplet
/action
action dev=SW type=update
- A new build property, build.archive-sources, allows to include java
source files
+ A new build property, include.sources-in-jars, allows to include java
source files
in jar archives. Useful when using a non-released version to know what
sources
are used.
/action
1.41 +1 -0 cocoon-2.1/build.properties
Index: build.properties
===
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.properties 3 Jun 2004 12:31:30 - 1.40
+++ build.properties 8 Jun 2004 20:21:39 - 1.41
@@ -33,6 +33,7 @@
#exclude.deprecated=true
#exclude.documentation=true
#exclude.javadocs=true
+#include.sources-in-jars=true
# Configuration
---
cvs commit: cocoon-2.1 status.xml
tony2004/06/08 14:44:43 Modified:.status.xml Log: updating status to reflect new inputmodules Revision ChangesPath 1.359 +5 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.358 retrieving revision 1.359 diff -u -r1.358 -r1.359 --- status.xml8 Jun 2004 20:21:38 - 1.358 +++ status.xml8 Jun 2004 21:44:42 - 1.359 @@ -67,6 +67,7 @@ person name=Ross Burton email=[EMAIL PROTECTED] id=RB/ person name=Mark Butler email=[EMAIL PROTECTED] id=MB/ person name=Ugo Cei email=[EMAIL PROTECTED] id=UC/ + person name=Tony Collen email=[EMAIL PROTECTED] id=ATC/ person name=Marcus Crafter email=[EMAIL PROTECTED] id=MC/ person name=David Crossley email=[EMAIL PROTECTED] id=DC/ person name=Torsten Curdt email=[EMAIL PROTECTED] id=TC/ @@ -205,6 +206,9 @@ changes release version=@version@ date=@date@ + action dev=ATC type=add due-to=Leszek Gawron + New Input modules: URLEncodeModule and URLDecodeModule + /action action dev=CZ type=fix fixes-bug=27066 Apply patch to fix some memory leaks in the tree processor. /action
cvs commit: cocoon-2.1 status.xml
joerg 2004/06/04 02:55:16 Modified:.status.xml Log: restored block information, removed thanks to as this is added by the XSLT from @due-to Revision ChangesPath 1.351 +7 -7 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- status.xml4 Jun 2004 09:22:16 - 1.350 +++ status.xml4 Jun 2004 09:55:16 - 1.351 @@ -206,20 +206,20 @@ release version=@version@ date=@date@ action dev=BD type=add due-to=Stavros Kounis fixes-bug=28834 - tour block: added Java shapes sample, with thanks to Stavros! + Tour block: added Java shapes sample. /action action dev=AG type=update - updated Groovy to 1.0-beta5, qdox to 1.4 an util.concurrent to 1.3.4 + Updated Groovy to 1.0-beta5, qdox to 1.4 and util.concurrent to 1.3.4. /action action dev=TC type=remove - Removed the deprecated SWF block and added - a flash sample in the hello world section. + SWF block: Removed the deprecated block and added a flash sample in the + hello world section. /action action dev=TC type=fix - Fixed the namespace handling of the new XMLSerializer. + Serializers block: Fixed the namespace handling of the XMLSerializer. /action action dev=TC type=add - Added support for indentation to the new XMLSerializer. + Serializers block: Added support for indentation to the XMLSerializer. /action action dev=CZ type=update Remove deprecated methods from SimpleCharStream, Notifier,
cvs commit: cocoon-2.1 status.xml
tcurdt 2004/06/02 00:42:27
Modified:
src/blocks/serializers/java/org/apache/cocoon/components/serializers/util
Namespaces.java
.status.xml
Log:
fixed the namespace handling
Revision ChangesPath
1.2 +6 -4
cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/Namespaces.java
Index: Namespaces.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/Namespaces.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Namespaces.java 21 Apr 2004 09:33:27 - 1.1
+++ Namespaces.java 2 Jun 2004 07:42:27 - 1.2
@@ -83,14 +83,15 @@
*/
public synchronized void pop(String prefix)
throws SAXException {
-for (int x = this.position(prefix, pre); x (--this.depth); x++) {
+for (int x = this.position(prefix, pre); x this.depth; x++) {
int k = (x + 1);
this.pre[x] = this.pre[k];
this.uri[x] = this.uri[k];
}
-this.pre[this.depth] = null;
-this.uri[this.depth] = null;
+//this.pre[this.depth] = null;
+//this.uri[this.depth] = null;
this.last--;
+this.depth--;
}
/**
@@ -180,4 +181,5 @@
}
throw new SAXException(Unable to map \ + check + \);
}
+
}
1.345 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- status.xml1 Jun 2004 17:16:28 - 1.344
+++ status.xml2 Jun 2004 07:42:27 - 1.345
@@ -205,6 +205,9 @@
changes
release version=@version@ date=@date@
+ action dev=TC type=fix
+ Fixed the namespace handling.
+ /action
action dev=TC type=add
Added support for indentation to the new XML Serializer.
/action
cvs commit: cocoon-2.1 status.xml
tcurdt 2004/06/01 10:16:28
Modified:
src/blocks/serializers/java/org/apache/cocoon/components/serializers
EncodingSerializer.java XMLSerializer.java
.status.xml
Log:
added indentation support
Revision ChangesPath
1.3 +67 -4
cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java
Index: EncodingSerializer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EncodingSerializer.java 30 Apr 2004 22:52:43 - 1.2
+++ EncodingSerializer.java 1 Jun 2004 17:16:28 - 1.3
@@ -19,6 +19,7 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -39,8 +40,7 @@
* @author a href=mailto:[EMAIL PROTECTED]Pier Fumagalli/a, February
2003
* @version CVS $Id$
*/
-public abstract class EncodingSerializer
-implements Serializer, Locator, Recyclable, Configurable {
+public abstract class EncodingSerializer implements Serializer, Locator,
Recyclable, Configurable {
/** The line separator string */
private static final char S_EOL[] =
@@ -80,6 +80,12 @@
/** Flag indicating if the document is being processed. */
private boolean processing = false;
+/** Current nesting level */
+private int level = 0;
+
+/** Whitespace buffer for indentation */
+private char[] indentBuffer = null;
+
/*
== */
/** The codeCharset/code associated with the character encoding. */
@@ -88,6 +94,8 @@
/** The codeNamespace/code associated with this instance. */
protected Namespaces namespaces = new Namespaces();
+/** Per level indent spaces */
+protected int indentPerLevel = 0;
/*
== */
/**
@@ -144,10 +152,23 @@
throw new ConfigurationException(Encoding not supported:
+ encoding, exception);
}
+
+indentPerLevel = conf.getChild(indent).getValueAsInteger(0);
+if (indentPerLevel 0) {
+assureIndentBuffer(indentPerLevel * 6);
+}
}
/*
== */
-
+
+private char[] assureIndentBuffer( int size ) {
+if (indentBuffer == null || indentBuffer.length size) {
+indentBuffer = new char[size];
+Arrays.fill(indentBuffer,' ');
+}
+return indentBuffer;
+}
+
/**
* Encode and write a codeString/code
*/
@@ -355,6 +376,19 @@
}
}
+/**
+ * Write out character to indent the output according
+ * to the level of nesting
+ * @param indent
+ * @throws SAXException
+ */
+protected void writeIndent(int indent) throws SAXException {
+this.charactersImpl(\n.toCharArray(),0,1);
+if (indent 0) {
+this.charactersImpl(assureIndentBuffer(indent),0,indent);
+}
+}
+
/*
== */
/**
@@ -363,6 +397,7 @@
public void startDocument()
throws SAXException {
this.processing = true;
+this.level = 0;
}
/**
@@ -396,6 +431,11 @@
public void startElement(String nsuri, String local, String qual,
Attributes attributes)
throws SAXException {
+if (indentPerLevel 0) {
+this.writeIndent(indentPerLevel*level);
+level++;
+}
+
String name = this.namespaces.qualify(nsuri, local, qual);
if (this.prolog) {
@@ -419,11 +459,24 @@
this.startElementImpl(nsuri, local, name, ns, at);
}
+public void characters (char ch[], int start, int length)
+throws SAXException {
+if (indentPerLevel 0) {
+this.writeIndent(indentPerLevel*level + 1);
+}
+this.charactersImpl(ch, start, length);
+}
+
/**
* Receive notification of the end of an element.
*/
public void endElement(String nsuri, String local, String qual)
throws SAXException {
+if (indentPerLevel 0) {
+level--;
+
cvs commit: cocoon-2.1 status.xml
cziegeler2004/05/27 01:36:16 Modified:.status.xml Log: Remove finished item Revision ChangesPath 1.341 +1 -7 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.340 retrieving revision 1.341 diff -u -r1.340 -r1.341 --- status.xml25 May 2004 14:24:00 - 1.340 +++ status.xml27 May 2004 08:36:15 - 1.341 @@ -156,12 +156,6 @@ Finish moving the scratchpad stuff in main trunk. /action -action context=code assigned-to=SMS - Enable the 'use-store' parameter of the XSLT processor component. Test for occuring - memory leaks. Seems only occuring if the xalan transformer is used. There also seems to be - a problem during the serialization of the transient store, if the servlet container were - stopped. -/action /actions actions priority=medium
cvs commit: cocoon-2.1 status.xml
cziegeler2004/05/27 06:30:59 Modified:.status.xml Log: Typo :) Revision ChangesPath 1.343 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- status.xml27 May 2004 13:20:42 - 1.342 +++ status.xml27 May 2004 13:30:59 - 1.343 @@ -205,7 +205,7 @@ changes release version=@version@ date=@date@ - action dev=CZ type=udpate + action dev=CZ type=update Remove deprecated methods from SimpleCharStream, Notifier, AbstractComplementaryConfigurableAction, StringUtils. Remove deprecated parser constant from Constants and remove deprecated class DefaultsMetaModule.
cvs commit: cocoon-2.1 status.xml
cziegeler2004/05/25 00:28:26 Modified:src/java/org/apache/cocoon Processor.java Cocoon.java ProcessorWrapper.java cocoon.roles src/blocks/profiler/java/org/apache/cocoon/components/profiler ProfilingNonCachingProcessingPipeline.java ProfilingCachingProcessingPipeline.java src/blocks/cron/java/org/apache/cocoon/components/cron QuartzJobExecutor.java TestCronJob.java src/java/org/apache/cocoon/environment/commandline AbstractCommandLineEnvironment.java src/blocks/forms/java/org/apache/cocoon/forms/binding JavaScriptJXPathBinding.java src/java/org/apache/cocoon/environment ForwardRedirector.java Environment.java AbstractEnvironment.java Redirector.java src/java/org/apache/cocoon/components/source/impl SitemapSource.java SitemapSourceFactory.java src/java/org/apache/cocoon/components ContextHelper.java src/java/org/apache/cocoon/components/treeprocessor/sitemap ComponentsSelector.java MountNodeBuilder.java SitemapLanguage.java MountNode.java src/java/org/apache/cocoon/environment/wrapper EnvironmentWrapper.java MutableEnvironmentFacade.java src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java ProcessingPipeline.java src/test/org/apache/cocoon/environment/mock MockEnvironment.java src/blocks/linotype/java/org/apache/cocoon/components SourceRepository.java src/java/org/apache/cocoon/environment/http HttpEnvironment.java src/java/org/apache/cocoon/components/treeprocessor InvokeContext.java TreeProcessor.java src/documentation/xdocs/plan updating.xml src/java/org/apache/cocoon/bean CocoonWrapper.java src/test/org/apache/cocoon/transformation CIncludeTransformerTestCase.java XIncludeTransformerTestCase.java I18NTransformerTestCase.java src/blocks/woody/java/org/apache/cocoon/woody/event/impl JavaScriptWidgetListener.java src/blocks/portal/java/org/apache/cocoon/environment/portlet PortletEnvironment.java src/blocks/woody/java/org/apache/cocoon/woody/binding JavaScriptJXPathBinding.java src/java/org/apache/cocoon/components/source SourceUtil.java src/blocks/cron/java/org/apache/cocoon/environment/background BackgroundEnvironment.java src/java/org/apache/cocoon/servlet CocoonServlet.java .status.xml Added: src/java/org/apache/cocoon/components/container ComponentLocatorImpl.java DefaultSitemapConfigurationHolder.java CocoonComponentManager.java ComponentContext.java ComponentManagerWrapper.java src/java/org/apache/cocoon/components/source/impl SitemapSourceInfo.java src/java/org/apache/cocoon/environment/internal EnvironmentInfo.java EnvironmentStack.java EnvironmentHelper.java src/java/org/apache/cocoon/components/source CocoonSourceResolver.java Removed: src/java/org/apache/cocoon/sitemap SitemapRedirector.java XSLTFactoryLoader.java src/java/org/apache/cocoon/components GlobalRequestLifecycleComponent.java DefaultSitemapConfigurationHolder.java CocoonComponentManager.java RequestLifecycleComponent.java EnvironmentStack.java ComponentLocatorImpl.java ComponentContext.java src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components AbstractSessionComponent.java Log: Remove deprecated class AbstractSessionComponent from session block. Redesign the internal environment handling (request processing) and moved private classes into own packages. Remove deprecated RequestLifecycleComponent and GlobalRequestLifecycleComponent. This is a port of the changes done in the cocoon-2.2 repository. It is not finished/tested yet, so some things might not work at the moment Revision ChangesPath 1.8 +49 -4
cvs commit: cocoon-2.1 status.xml forrest.properties
cziegeler2004/05/24 02:56:53 Modified:src/java/org/apache/cocoon cocoon.properties .status.xml forrest.properties Log: Next version Revision ChangesPath 1.26 +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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- cocoon.properties 24 May 2004 09:50:28 - 1.25 +++ cocoon.properties 24 May 2004 09:56:53 - 1.26 @@ -19,7 +19,7 @@ # very high chance of breaking the build system. Do it only if you know what # you're doing. -version=2.1.5 +version=2.2.0-dev released.version=2.1.5 year=1999-2004 name=cocoon 1.332 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- status.xml19 May 2004 11:34:31 - 1.331 +++ status.xml24 May 2004 09:56:53 - 1.332 @@ -211,6 +211,11 @@ changes release version=@version@ date=@date@ + action dev=NN type=fix + Dummy placeholder + /action + /release + release version=2.1.5 date=May 24 2004 action dev=CZ type=update The store/caching system now uses JCS instead of Jisp. /action 1.32 +1 -1 cocoon-2.1/forrest.properties Index: forrest.properties === RCS file: /home/cvs/cocoon-2.1/forrest.properties,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- forrest.properties24 May 2004 09:50:28 - 1.31 +++ forrest.properties24 May 2004 09:56:53 - 1.32 @@ -20,7 +20,7 @@ #forrest.echo=true # Project name (used to name .war file) -project.name=cocoon-2.1.5 +project.name=cocoon-2.2.0-dev # Specifies name of Forrest skin to use #project.skin=forrest-site
cvs commit: cocoon-2.1 status.xml
cziegeler2004/05/19 01:42:40
Modified:src/java/org/apache/cocoon/caching PipelineCacheKey.java
ComponentCacheKey.java
.status.xml
Log:
Fixing bug in hash code calculation - persistence is now working
Revision ChangesPath
1.3 +3 -4
cocoon-2.1/src/java/org/apache/cocoon/caching/PipelineCacheKey.java
Index: PipelineCacheKey.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/caching/PipelineCacheKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PipelineCacheKey.java 5 Mar 2004 13:02:45 - 1.2
+++ PipelineCacheKey.java 19 May 2004 08:42:40 - 1.3
@@ -30,10 +30,10 @@
implements Serializable {
/** The keys */
-private List keys;
+private final List keys;
/** the hash code */
-private int hashCode = 0;
+private int hashCode;
/**
* Constructor
@@ -116,7 +116,6 @@
* Generate a hash code
*/
public int hashCode() {
-// FIXME - this is not very safe
if (this.hashCode == 0) {
final int len = this.keys.size();
for(int i=0; i len; i++) {
1.3 +10 -16
cocoon-2.1/src/java/org/apache/cocoon/caching/ComponentCacheKey.java
Index: ComponentCacheKey.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/caching/ComponentCacheKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentCacheKey.java5 Mar 2004 13:02:45 - 1.2
+++ ComponentCacheKey.java19 May 2004 08:42:40 - 1.3
@@ -41,15 +41,15 @@
private static final String[] COMPONENTS = { X, G, X, T, X,
S, X, R };
/** The component type */
-private int type;
+private final int type;
/** The component identifier */
-private String identifier;
+private final String identifier;
/** The unique key */
-private Serializable key;
+private final Serializable key;
/** the hash code */
-private int hashCode = 0;
+private final int hashCode;
/** cachePoint */
-private boolean cachePoint = false;
+private final boolean cachePoint;
/**
* Constructor
@@ -57,10 +57,7 @@
public ComponentCacheKey(int componentType,
String componentIdentifier,
Serializable cacheKey) {
-this.type = componentType;
-this.identifier = componentIdentifier;
-this.key = cacheKey;
-
+this(componentType, componentIdentifier, cacheKey, false);
}
/**
@@ -75,6 +72,9 @@
this.key = cacheKey;
/** cachePoint */
this.cachePoint = cachePoint;
+this.hashCode = this.type +
+(this.identifier.length() 3) +
+this.key.hashCode();
}
/**
@@ -96,12 +96,6 @@
* HashCode
*/
public int hashCode() {
-// FIXME - this is not very safe
-if (this.hashCode == 0) {
-this.hashCode = this.type +
-(this.identifier.length() 3) +
-(this.key.hashCode() 10);
-}
return this.hashCode;
}
1.330 +5 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- status.xml18 May 2004 16:19:58 - 1.329
+++ status.xml19 May 2004 08:42:40 - 1.330
@@ -211,6 +211,10 @@
changes
release version=@version@ date=@date@
+ action dev=CZ type=fix
+ The persistent store is now really persistent between two application
runs. (Fixed
+ a bug in the hash code calculation of the keys).
+ /action
action dev=AG type=update
Updated Apache JCS to 1.0 dev 20040516 and util.concurrent to 1.3.3
/action
cvs commit: cocoon-2.1 status.xml
cziegeler2004/05/19 04:34:31 Modified:.status.xml Log: Update status Revision ChangesPath 1.331 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- status.xml19 May 2004 08:42:40 - 1.330 +++ status.xml19 May 2004 11:34:31 - 1.331 @@ -211,6 +211,9 @@ changes release version=@version@ date=@date@ + action dev=CZ type=update + The store/caching system now uses JCS instead of Jisp. + /action action dev=CZ type=fix The persistent store is now really persistent between two application runs. (Fixed a bug in the hash code calculation of the keys).
cvs commit: cocoon-2.1 status.xml
bdelacretaz2004/05/18 08:11:48 Modified:.status.xml Log: typo Revision ChangesPath 1.328 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.327 retrieving revision 1.328 diff -u -r1.327 -r1.328 --- status.xml17 May 2004 15:12:40 - 1.327 +++ status.xml18 May 2004 15:11:48 - 1.328 @@ -220,7 +220,7 @@ to be used. /action action dev=MPO type=update - Deprectated getWidget from the Widget interface in cforms. + Deprecated getWidget from the Widget interface in cforms. People should consider using getChild(id) or lookupWidget(path) instead. On the level of the flowscript 'Form' API a semantical distinct getWidget() (notice: no arguments!) is still avalaible to return the actual wrapped
cvs commit: cocoon-2.1 status.xml
joerg 2004/05/18 09:19:59 Modified:.status.xml Log: yet another typo, saw it in Bertrand's typo fix commit message :) Revision ChangesPath 1.329 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- status.xml18 May 2004 15:11:48 - 1.328 +++ status.xml18 May 2004 16:19:58 - 1.329 @@ -223,7 +223,7 @@ Deprecated getWidget from the Widget interface in cforms. People should consider using getChild(id) or lookupWidget(path) instead. On the level of the flowscript 'Form' API a semantical distinct getWidget() - (notice: no arguments!) is still avalaible to return the actual wrapped + (notice: no arguments!) is still available to return the actual wrapped Java form instance. /action action dev=AG type=fix fixes-bug=28889 due-to=Juan Jose Pablos due-to-email=[EMAIL PROTECTED]
cvs commit: cocoon-2.1 status.xml
crossley2004/05/11 00:01:35 Modified:.status.xml Log: Rename the supersonic block to the tour block. Revision ChangesPath 1.321 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- status.xml11 May 2004 03:20:19 - 1.320 +++ status.xml11 May 2004 07:01:35 - 1.321 @@ -238,7 +238,7 @@ CForms: Remove custom flow level forms validators. /action action dev=BD type=add - Supersonic block added: the Supersonic Tour of Apache Cocoon. + Added the tour block: Supersonic Tour of Apache Cocoon. Tutorial/example app focused on the Power Trio: Pipelines, Flow, Forms. /action action dev=DC type=fix due-to=Ralph Goers fixes-bug=27878
cvs commit: cocoon-2.1 status.xml
mpo 2004/05/11 02:56:50 Modified:.status.xml Log: Mentioning the getWidget() deprecation. Revision ChangesPath 1.322 +12 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- status.xml11 May 2004 07:01:35 - 1.321 +++ status.xml11 May 2004 09:56:50 - 1.322 @@ -200,6 +200,10 @@ This couldn't work, because if you working with caching pipelines, you cannot be sure that the entries are in the session(Stephan). /action + +action context=code assigned-to=MPO + Remove ContainerWidget concept from cforms. +/action /actions /todo @@ -207,6 +211,13 @@ changes release version=@version@ date=@date@ + action dev=MPO type=update + Deprectated getWidget from the Widget interface in cforms. + People should consider using getChild(id) or lookupWidget(path) in stead. + On the level of the flowscript 'Form' API a semantical distinct getWidget() + (notice: no arguments!) is still avalaible to return the actual wrapped + Java form instance. + /action action dev=AG type=fix fixes-bug=28889 due-to=Juan Jose Pablos due-to-email=[EMAIL PROTECTED] Fixed jetty-4.2.19.jar compiled for +jdk1.4. The new version can run in 1.3 /action
cvs commit: cocoon-2.1 status.xml
vgritsenko2004/05/11 05:57:45 Modified:.status.xml Log: sp Revision ChangesPath 1.323 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- status.xml11 May 2004 09:56:50 - 1.322 +++ status.xml11 May 2004 12:57:44 - 1.323 @@ -213,7 +213,7 @@ release version=@version@ date=@date@ action dev=MPO type=update Deprectated getWidget from the Widget interface in cforms. - People should consider using getChild(id) or lookupWidget(path) in stead. + People should consider using getChild(id) or lookupWidget(path) instead. On the level of the flowscript 'Form' API a semantical distinct getWidget() (notice: no arguments!) is still avalaible to return the actual wrapped Java form instance.
cvs commit: cocoon-2.1 status.xml
crossley2004/05/08 03:57:17 Modified:.status.xml Log: Remove an old todo item. The Precept and XMLForm are gone. Revision ChangesPath 1.317 +1 -6 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- status.xml8 May 2004 02:19:24 - 1.316 +++ status.xml8 May 2004 10:57:16 - 1.317 @@ -201,11 +201,6 @@ that the entries are in the session(Stephan). /action -action context=code - Examples are broken, if you went first to precept example - (samples/precept/app/example1.html) - and then to the xmlform example (samples/xmlform/wizard). -/action /actions /todo
cvs commit: cocoon-2.1 status.xml
upayavira2004/05/07 07:42:20
Modified:src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java
.status.xml
Log:
Adding cocoon.redirectTo(url, isGlobal), to allow FOM to do global redirects.
Revision ChangesPath
1.34 +7 -3
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Index: FOM_Cocoon.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FOM_Cocoon.java 25 Apr 2004 12:12:08 - 1.33
+++ FOM_Cocoon.java 7 May 2004 14:42:20 - 1.34
@@ -281,8 +281,12 @@
(OutputStream)unwrap(outputStream));
}
-public void jsFunction_redirectTo(String uri) throws Exception {
-this.currentCall.redirector.redirect(false, uri);
+public void jsFunction_redirectTo(String uri, boolean isGlobal) throws
Exception {
+if (isGlobal) {
+this.currentCall.redirector.globalRedirect(false, uri);
+} else {
+this.currentCall.redirector.redirect(false, uri);
+}
}
public void jsFunction_sendStatus(int sc) {
1.314 +11 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- status.xml6 May 2004 14:23:04 - 1.313
+++ status.xml7 May 2004 14:42:20 - 1.314
@@ -212,6 +212,16 @@
changes
release version=@version@ date=@date@
+ action dev=UV type=add
+ Extended FOM so that cocoon.redirectTo(url, true) will do a global
+ redirect. cocoon.redirectTo(url) will act as before. This enables
+ FOM to redirect when it is called from within cocoon: protocol
+ requests, aggregations, etc.
+ /action
+ action dev=UV type=fix
+ Moving check on number of specified targets within CocoonBean. This was
+ preventing the processURI(uri, outputStream) method from working.
+ /action
action dev=VG type=remove
CForms: Remove custom flow level forms validators.
/action
cvs commit: cocoon-2.1 status.xml
bdelacretaz2004/05/04 10:27:20 Modified:.status.xml Log: supersonic block added Revision ChangesPath 1.311 +5 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- status.xml1 May 2004 00:49:29 - 1.310 +++ status.xml4 May 2004 17:27:20 - 1.311 @@ -212,6 +212,10 @@ changes release version=@version@ date=@date@ + action dev=BD type=add + Supersonic block added: the Supersonic Tour of Apache Cocoon. + Tutorial/example app focused on the Power Trio: Pipelines, Flow, Forms. + /action action dev=JH type=update Made JSPGenerator cacheable by simply extending the FileGenerator. /action
cvs commit: cocoon-2.1 status.xml
joerg 2004/04/30 17:49:30
Modified:src/blocks/jsp/java/org/apache/cocoon/generation
JSPGenerator.java
.status.xml
Log:
Made JSPGenerator cacheable by simply extending the FileGenerator.
Revision ChangesPath
1.5 +3 -6
cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JSPGenerator.java
Index: JSPGenerator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JSPGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JSPGenerator.java 24 Apr 2004 01:57:19 - 1.4
+++ JSPGenerator.java 1 May 2004 00:49:29 - 1.5
@@ -37,7 +37,7 @@
* @author a href=mailto:[EMAIL PROTECTED]Davanum Srinivas/a
* @version CVS $Id$
*/
-public class JSPGenerator extends ServiceableGenerator {
+public class JSPGenerator extends FileGenerator {
/**
* Generate XML data from JSPEngine output.
@@ -58,13 +58,11 @@
JSPEngine engine = null;
SAXParser parser = null;
-Source inputSource = null;
Source contextSource = null;
try {
-inputSource = this.resolver.resolveURI(this.source);
contextSource = this.resolver.resolveURI(context:/);
-String inputSourceURI = inputSource.getURI();
+String inputSourceURI = this.inputSource.getURI();
String contextSourceURI = contextSource.getURI();
if (!inputSourceURI.startsWith(contextSourceURI)) {
@@ -104,7 +102,6 @@
} finally {
super.manager.release(parser);
super.manager.release(engine);
-this.resolver.release(inputSource);
this.resolver.release(contextSource);
}
}
1.310 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- status.xml29 Apr 2004 01:00:43 - 1.309
+++ status.xml1 May 2004 00:49:29 - 1.310
@@ -212,6 +212,9 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=update
+ Made JSPGenerator cacheable by simply extending the FileGenerator.
+ /action
action dev=DC type=fix due-to=Ralph Goers fixes-bug=27878
XMLResourceBundleFactory was stopping when it encountered the first
bundle name that does not have a locale, missing those that might be
cvs commit: cocoon-2.1 status.xml
joerg 2004/04/23 18:57:19
Modified:src/blocks/jsp/java/org/apache/cocoon/generation
JSPGenerator.java
src/blocks/jsp/java/org/apache/cocoon/reading JSPReader.java
.status.xml
Log:
Hopefully fixed the source resolving in JSP components finally by using
standard Cocoon/Avalon Excalibur source resolving. This allows to use all
known protocols and Cocoon pseudo protocols as long as the JSP file is
inside the servlet's context.
Revision ChangesPath
1.4 +29 -26
cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JSPGenerator.java
Index: JSPGenerator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JSPGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JSPGenerator.java 5 Mar 2004 13:01:57 - 1.3
+++ JSPGenerator.java 24 Apr 2004 01:57:19 - 1.4
@@ -15,21 +15,22 @@
*/
package org.apache.cocoon.generation;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.jsp.JSPEngine;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.http.HttpEnvironment;
+import org.apache.excalibur.source.Source;
import org.apache.excalibur.xml.sax.SAXParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
/**
* Allows Servlets and JSPs to be used as a generator.
*
@@ -52,35 +53,35 @@
// ensure that we are running in a servlet environment
if (servletResponse == null || servletRequest == null ||
servletContext == null) {
-throw new ProcessingException(JSPReader can only be used from
within a Servlet environment.);
+throw new ProcessingException(JSPGenerator can only be used
from within a Servlet environment.);
}
JSPEngine engine = null;
SAXParser parser = null;
+Source inputSource = null;
+Source contextSource = null;
try {
-// TODO (KP): Should we exclude not supported protocols, say
'context'?
-String url = super.source;
-// absolute path is processed as is
-if (!url.startsWith(/)) {
-// get current request path
-String servletPath = servletRequest.getServletPath();
-// remove sitemap URI part
-String sitemapURI =
ObjectModelHelper.getRequest(objectModel).getSitemapURI();
-if (sitemapURI != null) {
-servletPath = servletPath.substring(0,
servletPath.indexOf(sitemapURI));
-} else {
-// for example when using cocoon:/ pseudo protocol
-servletPath = servletPath.substring(0,
servletPath.lastIndexOf(/) + 1);
-}
-url = servletPath + url;
+inputSource = this.resolver.resolveURI(this.source);
+contextSource = this.resolver.resolveURI(context:/);
+
+String inputSourceURI = inputSource.getURI();
+String contextSourceURI = contextSource.getURI();
+
+if (!inputSourceURI.startsWith(contextSourceURI)) {
+throw new ProcessingException(You must not reference a file
++ outside of the servlet context at +
contextSourceURI + .);
}
-engine = (JSPEngine) super.manager.lookup(JSPEngine.ROLE);
+String url = inputSourceURI.substring(contextSourceURI.length());
+if (url.charAt(0) != '/') {
+url = / + url;
+}
if (getLogger().isDebugEnabled()) {
getLogger().debug(JSPGenerator executing: + url);
}
+engine = (JSPEngine) super.manager.lookup(JSPEngine.ROLE);
byte[] bytes = engine.executeJSP(url, servletRequest,
servletResponse, servletContext);
InputSource input = new InputSource(new
ByteArrayInputStream(bytes));
@@ -103,6 +104,8 @@
} finally {
super.manager.release(parser);
super.manager.release(engine);
+this.resolver.release(inputSource);
+
cvs commit: cocoon-2.1 status.xml
mpo 2004/04/22 07:45:56 Modified:.status.xml Log: Mentioning the change in fi:form generation. Revision ChangesPath 1.306 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- status.xml22 Apr 2004 12:15:48 - 1.305 +++ status.xml22 Apr 2004 14:45:56 - 1.306 @@ -212,6 +212,11 @@ changes release version=@version@ date=@date@ + action dev=MPO type=update + [cforms] change to generated instance xml lt;fi:formgt;. + Nested widgets are now grouped in lt;fi:widgetsgt; and no longer in lt;fi:childrengt;. + This aligns with other container-widgets. + /action action dev=VG type=update LinkRewriter: Added support for rewriting URLs which are embedded into the attribute values (example: style attribute with background image URL).
cvs commit: cocoon-2.1 status.xml
antonio 2004/04/12 18:34:09 Modified:lib jars.xml .status.xml Added: src/blocks/xmldb/lib xmldb-api-20030701.jar xmldb-common-20030701.jar xindice-1.1b4.jar xmldb-xupdate-20040205.jar legalxmldb-api-20030701.jar.license.txt xindice-1.1b4.jar.license.txt xmldb-xupdate-20040205.jar.license.txt xmldb-common-20030701.jar.license.txt Removed: src/blocks/xmldb/lib xindice-1.1b3.jar xmldb-api-20021118.jar xmldb-xupdate-20021220.jar xmldb-common-20021220.jar legalxindice-1.1b3.jar.license.txt xmldb-xupdate-20021220.jar.license.txt xmldb-api-20021118.jar.license.txt xmldb-common-20021220.jar.license.txt Log: Update xindice to 1.1b4 Revision ChangesPath 1.1 cocoon-2.1/src/blocks/xmldb/lib/xmldb-api-20030701.jar Binary file 1.1 cocoon-2.1/src/blocks/xmldb/lib/xmldb-common-20030701.jar Binary file 1.1 cocoon-2.1/src/blocks/xmldb/lib/xindice-1.1b4.jar Binary file 1.1 cocoon-2.1/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar Binary file 1.1 cocoon-2.1/legal/xmldb-api-20030701.jar.license.txt Index: xmldb-api-20030701.jar.license.txt === The XML:DB Initiative Software License, Version 1.0 Copyright (c) 2000-2001 The XML:DB Initiative. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: This product includes software developed by the XML:DB Initiative (http://www.xmldb.org/). Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The name XML:DB Initiative 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 XML:DB, nor may XML:DB appear in their name, without prior written permission of the XML:DB Initiative. 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 (INCLUDING, 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 XML:DB Initiative. For more information on the XML:DB Initiative, please see http://www.xmldb.org/. 1.1 cocoon-2.1/legal/xindice-1.1b4.jar.license.txt Index: xindice-1.1b4.jar.license.txt === Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. Legal Entity shall mean the union of the acting entity and all other entities
cvs commit: cocoon-2.1 status.xml
bruno 2004/04/10 06:49:33 Modified:.status.xml Log: Added some recent updates done by me. Revision ChangesPath 1.298 +11 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- status.xml4 Apr 2004 04:44:09 - 1.297 +++ status.xml10 Apr 2004 13:49:33 - 1.298 @@ -212,6 +212,16 @@ changes release version=@version@ date=@date@ + action dev=BRD type=fix + CForms: lt;fi:styling type=date/gt; is not needed (nor supported) + anymore, the required information about the datatype and the pattern is + now included in the widget instance XML. + /action + action dev=BRD type=add + CForms: it is now possible to store arbitrary data with each widget + instance by using the new setAttribute and getAttribute methods of the + Widget interface. + /action action dev=AG type=add Groovy script generator support in BSF block /action
cvs commit: cocoon-2.1 status.xml
joerg 2004/04/02 12:52:48
Modified:.status.xml
Log:
fixed well-formedness; exclude = include.block.blockname in blocks.properties
Revision ChangesPath
1.293 +14 -8 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- status.xml2 Apr 2004 20:22:07 - 1.292
+++ status.xml2 Apr 2004 20:52:47 - 1.293
@@ -1,4 +1,4 @@
-?xml version=1.0?
+?xml version=1.0?
!--
Copyright 1999-2004 The Apache Software Foundation
@@ -212,19 +212,24 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=update
+ Changed blocks selection handling to allow more intuitive
+ include.block.blockname syntax in (local.)blocks.properties. Old syntax
+ exclude.block.blockname is still supported.
+ /action
action dev=UV type=update
Enabled use of nested sitemap variables, e.g. {request-param:{1}}.
/action
- action dev=AG type=update
+ action dev=AG type=update
Updated antlr to 2.7.3
/action
-action dev=AG type=update
+ action dev=AG type=update
Deprecated Tokenizer and the methods count(), matchStrings(),
- repleaceTokens() and both split() in StringUtils. The functionality of
all this
- was replaced in favor of Apache commons.lang lib.
- They will be removed in Cocoon 2.2
+ replaceTokens() and both split() in StringUtils. The functionality of
all
+ this was replaced in favor of Apache commons-lang lib. They will be
removed
+ in Cocoon 2.2
/action
-action dev=AG type=update
+ action dev=AG type=update
Updated batik to 1.5.1, db-ojb to 1.0RC6
/action
action dev=TC type=remove
@@ -232,6 +237,7 @@
/action
action dev=TC type=remove
Removed precept block. Was dead code.
+ /action
action dev=AG type=update
Updated jdtcore to 2.1.3, update castor-xml to 0.9.5.3
/action
cvs commit: cocoon-2.1 status.xml
cziegeler2004/03/16 05:19:32 Modified:.status.xml Log: Fix finally bug 27217 by using properties Revision ChangesPath 1.283 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- status.xml16 Mar 2004 10:35:33 - 1.282 +++ status.xml16 Mar 2004 13:19:32 - 1.283 @@ -216,7 +216,7 @@ Databases: The xml-encoding for the SQLTransformer is now configurable. /action action dev=CZ type=fix fixes-bug=27217 due-to=Andreas Hartmann due-to-email=[EMAIL PROTECTED] - Build System: Apply filtering to patched configurations coming from the different blocks (loglevel etc.) + Build System: New property loglevel that can be used in the patch files. /action action dev=CZ type=fix fixes-bug=27518 due-to=Michal Durdina due-to-email=[EMAIL PROTECTED] Portal: Fix problems with minimizing/maximizing of portlets.
cvs commit: cocoon-2.1 status.xml
joerg 2004/03/11 19:31:40 Modified:src/blocks/forms/samples/forms form2_bind_bean.xml form2_bind_xml.xml src/blocks/forms/java/org/apache/cocoon/forms/binding RepeaterJXPathBindingBuilder.java ValueJXPathBinding.java RepeaterJXPathBinding.java .status.xml Removed: src/blocks/forms/java/org/apache/cocoon/forms/binding UniqueFieldJXPathBinding.java UniqueFieldJXPathBindingBuilder.java Log: issue 17600: syntax update for repeater row identity handling Revision ChangesPath 1.2 +6 -3 cocoon-2.1/src/blocks/forms/samples/forms/form2_bind_bean.xml Index: form2_bind_bean.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/form2_bind_bean.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- form2_bind_bean.xml 9 Mar 2004 10:33:48 - 1.1 +++ form2_bind_bean.xml 12 Mar 2004 03:31:39 - 1.2 @@ -48,16 +48,19 @@ !-- 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 - !-- compare to xml-binding: the convertor is not needed here -- +fb:identity + !-- compare to xml-binding: the convertor is not needed here -- + fb:value id=id path=@id/ +/fb:identity -!-- important note: the row-path is used inside jxpath-createPath context, -as a consequence it cannot have dependent children or predicates -- fb:on-bind !-- executed on updates AND right after the insert -- 1.2 +11 -10 cocoon-2.1/src/blocks/forms/samples/forms/form2_bind_xml.xml Index: form2_bind_xml.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/form2_bind_xml.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- form2_bind_xml.xml9 Mar 2004 10:33:48 - 1.1 +++ form2_bind_xml.xml12 Mar 2004 03:31:39 - 1.2 @@ -69,18 +69,19 @@ fb:multi-value id=drinks parent-path=drinks row-path=drink/ !-- repeater requires unique identification mechanism of the row-nodes -- + !-- 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=contacts -row-path=contact -unique-row-id=id -unique-path=@id - - -!-- optional convertor to use for mapping the unique id -- -fd:convertor datatype=long / - -!-- important note: the row-path is used inside jxpath-createPath context, - as a consequence it cannot have dependent children or predicates -- +row-path=contact + +fb:identity + fb:value id=id path=@id +!-- optional convertor to use for mapping the unique id -- +fd:convertor datatype=long / + /fb:value +/fb:identity + fb:on-bind !-- executed on updates AND right after the insert -- 1.3 +12 -48 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBindingBuilder.java Index: RepeaterJXPathBindingBuilder.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBindingBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RepeaterJXPathBindingBuilder.java 9 Mar 2004 13:08:46 - 1.2 +++ RepeaterJXPathBindingBuilder.java 12 Mar 2004 03:31:39 - 1.3 @@ -15,12 +15,7 @@ */ package org.apache.cocoon.forms.binding; -import java.util.Locale; - -import org.apache.cocoon.forms.Constants; -import org.apache.cocoon.forms.datatype.convertor.Convertor; import org.apache.cocoon.forms.util.DomHelper; -import org.apache.cocoon.i18n.I18nUtils; import org.w3c.dom.Element; /** @@ -76,30 +71,9 @@ String rowPath = DomHelper.getAttribute(bindingElm, row-path); String rowPathForInsert = DomHelper.getAttribute(bindingElm, row-path-insert, rowPath); -String uniqueRowId = -DomHelper.getAttribute(bindingElm, unique-row-id, null); -String uniqueRowIdPath = -
cvs commit: cocoon-2.1 status.xml
reinhard2004/03/10 03:06:20 Modified:.status.xml Log: formatting Revision ChangesPath 1.271 +17 -15cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- status.xml9 Mar 2004 11:32:41 - 1.270 +++ status.xml10 Mar 2004 11:06:20 - 1.271 @@ -230,20 +230,22 @@ /action 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 + ul + liThe Woody block (src/blocks/woody) has moved into the new Cocoon Forms + block (src/blocks/forms)./li + linew namespaces:br/ + ul + lifrom xmlns:wd=http://apache.org/cocoon/woody/definition/1.0; + to xmlns:fd=http://apache.org/cocoon/forms/1.0#definition;/li + lifrom xmlns:wb=http://apache.org/cocoon/woody/binding/1.0; + to xmlns:fb=http://apache.org/cocoon/forms/1.0#binding;/li + lifrom xmlns:wi=http://apache.org/cocoon/woody/instance/1.0; + to xmlns:fi=http://apache.org/cocoon/forms/1.0#instance;/li + lifrom xmlns:wt=http://apache.org/cocoon/woody/template/1.0; + to xmlns:ft=http://apache.org/cocoon/forms/1.0#template;/li + /ul/li + liJava packages moved from org.apache.cocoon.woody to org.apache.cocoon.forms/li + /ul /action action dev=AG type=update Updated Velocity engine to 1.4-rc1
cvs commit: cocoon-2.1 status.xml
reinhard2004/03/09 02:57:37 Modified:.status.xml Log: Woody--CocoonForms Revision ChangesPath 1.268 +29 -3 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- status.xml9 Mar 2004 07:39:26 - 1.267 +++ status.xml9 Mar 2004 10:57:37 - 1.268 @@ -206,11 +206,37 @@ /action /actions /todo - - + changes release version=@version@ date=@date@ + action dev=RP type=update + Apples use the new CocoonForms classes + /action + action dev=RP type=update + Petstore samples use the new CocoonForms names + /action + action dev=RP type=add + New Ant task (woody2CocoonForms-renaming) that updates namespaces, sitemap components and + flowscript functions (details see tools/target/upgrade-build.xml) + /action + 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 action dev=AG type=update Updated Velocity engine to 1.4-rc1 /action
cvs commit: cocoon-2.1 status.xml
reinhard2004/03/09 03:06:54 Modified:.status.xml Log: Ant task that corrects linefeeds Revision ChangesPath 1.269 +5 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- status.xml9 Mar 2004 10:57:37 - 1.268 +++ status.xml9 Mar 2004 11:06:53 - 1.269 @@ -210,6 +210,10 @@ changes release version=@version@ date=@date@ + action dev=RP type=add + Ant task (correctLinefeed) that corrects linefeed characters according to + our standard (LF). + /action action dev=RP type=update Apples use the new CocoonForms classes /action
cvs commit: cocoon-2.1 status.xml
bdelacretaz2004/03/09 03:32:41 Modified:.status.xml Log: mention ASF 2.0 license replacement Revision ChangesPath 1.270 +5 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- status.xml9 Mar 2004 11:06:53 - 1.269 +++ status.xml9 Mar 2004 11:32:41 - 1.270 @@ -210,6 +210,10 @@ changes release version=@version@ date=@date@ + action dev=BD type=update + Licenses changed to ASF 2.0 in all source files which had a license, using + the ReplaceLicense tool from the committers CVS module. + /action action dev=RP type=add Ant task (correctLinefeed) that corrects linefeed characters according to our standard (LF).
cvs commit: cocoon-2.1 status.xml
joerg 2004/03/08 13:21:20
Modified:src/java/org/apache/cocoon/generation
LinkStatusGenerator.java
.status.xml
Log:
fixed bug 26851, thanks to Marco Rolappe: LinkStatusGenerator now handles
also links with a specified charset.
Revision ChangesPath
1.8 +3 -2
cocoon-2.1/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java
Index: LinkStatusGenerator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LinkStatusGenerator.java 5 Mar 2004 13:02:55 - 1.7
+++ LinkStatusGenerator.java 8 Mar 2004 21:21:19 - 1.8
@@ -447,7 +447,8 @@
getLogger().debug(Content-type: + content_type);
}
-if (content_type.equals(linkContentType)) {
+if (content_type.equals(linkContentType) ||
+content_type.startsWith(linkContentType + ;)) {
url_links = new ArrayList();
InputStream is = conn.getInputStream();
1.264 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- status.xml8 Mar 2004 06:07:14 - 1.263
+++ status.xml8 Mar 2004 21:21:19 - 1.264
@@ -211,6 +211,9 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=fix fixes-bug=26851 due-to=Marco Rolappe
due-to-email=[EMAIL PROTECTED]
+ LinkStatusGenerator now handles also links with a specified charset.
+ /action
action dev=JH type=fix fixes-bug=25934 due-to=Philipp Matthias
Hahn due-to-email=[EMAIL PROTECTED]
Avoid CLOBs when indexing XML without superfluous whitespace (Lucene).
/action
cvs commit: cocoon-2.1 status.xml
joerg 2004/03/06 06:44:46
Modified:src/blocks/lucene/java/org/apache/cocoon/components/search
LuceneIndexContentHandler.java
.status.xml
Log:
fix bug 25934, thanks to Philipp Matthias Hahn: Avoid CLOBs when indexing
XML without superfluous whitespace (Lucene).
Revision ChangesPath
1.5 +6 -6
cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java
Index: LuceneIndexContentHandler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LuceneIndexContentHandler.java5 Mar 2004 13:01:59 - 1.4
+++ LuceneIndexContentHandler.java6 Mar 2004 14:44:46 - 1.5
@@ -120,12 +120,12 @@
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);
}
}
@@ -166,10 +166,10 @@
String atts_value = atts.getValue(i);
bodyDocument.add(Field.UnStored(lname + @ + atts_lname,
atts_value));
if (attributesToText) {
-text.append(atts_value);
text.append(' ');
-bodyText.append(atts_value);
+text.append(atts_value);
bodyText.append(' ');
+bodyText.append(atts_value);
}
}
1.262 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- status.xml6 Mar 2004 14:05:04 - 1.261
+++ status.xml6 Mar 2004 14:44:46 - 1.262
@@ -196,6 +196,9 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=fix fixes-bug=25934 due-to=Philipp Matthias
Hahn due-to-email=[EMAIL PROTECTED]
+ Avoid CLOBs when indexing XML without superfluous whitespace (Lucene).
+ /action
action dev=JH type=fix fixes-bug=25594 due-to=Gernot Koller
due-to-email=[EMAIL PROTECTED]
Allow streaming of uploaded files into a pipeline using StreamGenerator.
/action
cvs commit: cocoon-2.1 status.xml
cziegeler2004/02/22 10:17:16 Modified:.status.xml Log: Update status Revision ChangesPath 1.245 +7 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- status.xml16 Feb 2004 04:42:18 - 1.244 +++ status.xml22 Feb 2004 18:17:16 - 1.245 @@ -196,6 +196,12 @@ changes release version=@version@ date=@date@ + action dev=CZ type=update fixes-bug=25093 due-to-email=[EMAIL PROTECTED] due-to=Alfred.Nathaniel + Patch for allowing empty values in configuration of defaults input module. + /action + action dev=CZ type=update fixes-bug=26896 due-to-email=[EMAIL PROTECTED] due-to=Marco Rolappe + Patch for disposing components in the properties in xml file module. + /action action dev=AG type=update Updated commons-httpclient to 2.0-final /action
cvs commit: cocoon-2.1 status.xml
vgritsenko2004/02/12 16:34:05 Modified:.status.xml Log: Start new release. Take out old non-FOM flow. Revision ChangesPath 1.240 +13 -7 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- status.xml10 Feb 2004 15:15:34 - 1.239 +++ status.xml13 Feb 2004 00:34:05 - 1.240 @@ -196,19 +196,25 @@ changes release version=@version@ date=@date@ -action dev=AG type=update + action dev=VG type=remove + Remove non-FOM flow classes and system.js + /action + /release + release version=2.1.4 date=February 12 2004 + action dev=AG type=update Updated iText to 1.02 /action action dev=SW type=add - Woody block: every widget can now have a validator. This allows for example repeaters to perform - inter-row validation or overall form-level validation. + Woody block: every widget can now have a validator. This allows for example + repeaters to perform inter-row validation or overall form-level validation. /action action dev=UC type=add - Woody block: added support for rich text editing using InteractiveTools' HTMLArea. + Woody block: added support for rich text editing using InteractiveTools' HTMLArea. /action action dev=CZ type=update - ResourceReader: Is now configurable as well. All parameters can be defined during configuration - of the reader. Fixed also a minor bug in the last-modified detection. + ResourceReader: Is now configurable as well. All parameters can be defined + during configuration of the reader. Fixed also a minor bug in the last-modified + detection. /action action dev=GP type=add OJB-Block: Added our own OJB ConnectionFactory which uses the
cvs commit: cocoon-2.1 status.xml
sylvain 2004/02/10 07:15:34 Modified:.status.xml Log: Cleanup status file Revision ChangesPath 1.239 +1 -13 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- status.xml10 Feb 2004 05:00:11 - 1.238 +++ status.xml10 Feb 2004 15:15:34 - 1.239 @@ -206,11 +206,6 @@ action dev=UC type=add Woody block: added support for rich text editing using InteractiveTools' HTMLArea. /action - action dev=SW type=update - Batik block: a lt;svg:image xlink:href=.../ can now use any of the protocols handled - by Cocoon. This also indirectly benefits the FOP block as XSL-FO documents can use images from - any source by embedding them in an SVG drawing. - /action action dev=CZ type=update ResourceReader: Is now configurable as well. All parameters can be defined during configuration of the reader. Fixed also a minor bug in the last-modified detection. @@ -358,13 +353,6 @@ /action action dev=AG type=update Update libs Xerces to 2.6.0 and xml-apis.jar. - /action - action dev=SW type=add - The cocoon object in flowscript has a new setup(object) method that - honors the various Avalon lifecycle interfaces implemented by an object. - This allows Java classes instanciated by a flowscript to access e.g. - request, response and components without requiring a dependency on the - FOM_Cocoon class. /action action dev=SW type=add Woody: new double-list styling for MultivalueField.
cvs commit: cocoon-2.1 status.xml
joerg 2004/01/29 02:41:13 Modified:.status.xml Log: Bug 14327: JSPReader: The output encoding of the reader is now configurable. Revision ChangesPath 1.231 +5 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- status.xml28 Jan 2004 19:14:23 - 1.230 +++ status.xml29 Jan 2004 10:41:12 - 1.231 @@ -196,6 +196,9 @@ changes release version=@version@ date=@date@ + action dev=JH type=add fixes-bug=14327 due-to=Marco Rolappe due-to-email=[EMAIL PROTECTED] + JSPReader: The output encoding of the reader is now configurable. + /action action dev=VG type=remove woody.js has been removed. Please use woody2.js instead. /action @@ -203,7 +206,7 @@ Resurrected the Slide block and made it to work with current developement version of Slide (2.0-b1). Complete revamping of the Slide sample admin app. /action - action dev=CZ type=fix fixes-bug=26450 due-to-email=[EMAIL PROTECTED] due-to=Ralph Goers + action dev=CZ type=fix fixes-bug=26450 due-to-email=[EMAIL PROTECTED] due-to=Ralph Goers Allow the Authentication Framework to invoke a pipeline during logout /action action dev=AG type=update
cvs commit: cocoon-2.1 status.xml
cziegeler2004/01/23 02:26:26 Modified:.status.xml Log: Update status Revision ChangesPath 1.226 +5 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- status.xml19 Jan 2004 07:50:04 - 1.225 +++ status.xml23 Jan 2004 10:26:25 - 1.226 @@ -196,7 +196,10 @@ changes release version=@version@ date=@date@ - action dev=AG type=update + action dev=CZ type=add + First version of the JSR-168 support in the portal engine. + /action + action dev=AG type=update Updated commons-httpclient to the version 2.0-RC3 /action action dev=UH type=update
cvs commit: cocoon-2.1 status.xml
unico 2004/01/16 06:01:22 Modified:.status.xml Log: renamed JspGenerator to JSPGenerator Revision ChangesPath 1.224 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- status.xml14 Jan 2004 17:54:27 - 1.223 +++ status.xml16 Jan 2004 14:01:22 - 1.224 @@ -196,6 +196,9 @@ changes release version=@version@ date=@date@ + action dev=UH type=update + Renamed JspGenerator to JSPGenerator to match JSPEngine and JSPReader naming convention. + /action action dev=UH type=fix fixes-bug=25694 due-to-email=[EMAIL PROTECTED] due-to=Johan Stuyts JSPEngineImpl incorrectly converts bytes to characters. /action
cvs commit: cocoon-2.1 status.xml
cziegeler2004/01/14 09:54:27 Modified:.status.xml Log: Add this, so it doesn't get forgotten Revision ChangesPath 1.223 +7 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- status.xml5 Jan 2004 15:01:19 - 1.222 +++ status.xml14 Jan 2004 17:54:27 - 1.223 @@ -149,6 +149,12 @@ actions priority=medium action context=code + Ensure that recyclable components always release their references, even when + they are not pooled. The easiest way is to make them disposable and clean up + in dispose. +/action + +action context=code EventRecorder classes in o.a.c.transformation.helpers package are similar to SaxBuffer. SaxBuffer should be extended (if it misses some functionality), and EventRecorder deprecated and removed.
cvs commit: cocoon-2.1 status.xml
unico 2004/01/05 07:01:19 Modified:.status.xml Log: bugfix credit for bug 25694 Revision ChangesPath 1.222 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- status.xml3 Jan 2004 16:07:58 - 1.221 +++ status.xml5 Jan 2004 15:01:19 - 1.222 @@ -190,6 +190,9 @@ changes release version=@version@ date=@date@ + action dev=UH type=fix fixes-bug=25694 due-to-email=[EMAIL PROTECTED] due-to=Johan Stuyts + JSPEngineImpl incorrectly converts bytes to characters. + /action action dev=VG type=update Woody expression manager supports registration of custom functions (see cocoon.xconf). Added IsNull function.
cvs commit: cocoon-2.1 status.xml
antonio 2003/12/19 22:38:51 Modified:.status.xml Log: Adding fixing credit to bug 25664 Revision ChangesPath 1.218 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs//cocoon-2.1/status.xml,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- status.xml19 Dec 2003 14:01:34 - 1.217 +++ status.xml20 Dec 2003 06:38:51 - 1.218 @@ -190,6 +190,9 @@ changes release version=@version@ date=@date@ + action dev=AG type=fix fixes-bug=25664 due-to-email=[EMAIL PROTECTED] due-to=Karel Vervaeke + build fails on windows without cygwin + /action action dev=AG type=update Updated Ant to 1.6.0 /action
cvs commit: cocoon-2.1 status.xml
antonio 2003/12/19 06:01:34 Modified:tools/bin ant.bat antRun.bat antRun antRun.pl runant.pl ant runant.py lcp.bat .status.xml Added: tools/lib ant-1.6.0.jar ant-launcher.jar ant-trax.jar ant-junit.jar Removed: tools/lib ant-1.5.4.jar ant-1.5.4-optional.jar Log: Update to Apache Ant 1.6.0 Revision ChangesPath 1.1 cocoon-2.1/tools/lib/ant-1.6.0.jar Binary file 1.1 cocoon-2.1/tools/lib/ant-launcher.jar Binary file 1.1 cocoon-2.1/tools/lib/ant-trax.jar Binary file 1.1 cocoon-2.1/tools/lib/ant-junit.jar Binary file 1.2 +95 -114 cocoon-2.1/tools/bin/ant.bat Index: ant.bat === RCS file: /home/cvs//cocoon-2.1/tools/bin/ant.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ant.bat 9 Mar 2003 00:11:33 - 1.1 +++ ant.bat 19 Dec 2003 14:01:33 - 1.2 @@ -1,114 +1,95 @@ [EMAIL PROTECTED] off - -REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights -REM reserved. - -if exist %HOME%\antrc_pre.bat call %HOME%\antrc_pre.bat - -if not %OS%==Windows_NT goto win9xStart -:winNTStart [EMAIL PROTECTED] - -rem %~dp0 is name of current script under NT -set DEFAULT_ANT_HOME=%~dp0 - -rem : operator works similar to make : operator -set DEFAULT_ANT_HOME=%DEFAULT_ANT_HOME%\.. - -if %ANT_HOME%== set ANT_HOME=%DEFAULT_ANT_HOME% -set DEFAULT_ANT_HOME= - -rem Need to check if we are using the 4NT shell... -if [EMAIL PROTECTED] == 4 goto setup4NT - -rem On NT/2K grab all arguments at once -set ANT_CMD_LINE_ARGS=%* -goto doneStart - -:setup4NT -set ANT_CMD_LINE_ARGS=%$ -goto doneStart - -:win9xStart -rem Slurp the command line arguments. This loop allows for an unlimited number of -rem agruments (up to the command line limit, anyway). - -set ANT_CMD_LINE_ARGS= - -:setupArgs -if %1a==a goto doneStart -set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 -shift -goto setupArgs - -:doneStart -rem This label provides a place for the argument list loop to break out -rem and for NT handling to skip to. - -rem find ANT_HOME -if not %ANT_HOME%== goto checkJava - -rem check for ant in Program Files on system drive -if not exist %SystemDrive%\Program Files\ant goto checkSystemDrive -set ANT_HOME=%SystemDrive%\Program Files\ant -goto checkJava - -:checkSystemDrive -rem check for ant in root directory of system drive -if not exist %SystemDrive%\ant\nul goto checkCDrive -set ANT_HOME=%SystemDrive%\ant -goto checkJava - -:checkCDrive -rem check for ant in C:\ant for Win9X users -if not exist C:\ant\nul goto noAntHome -set ANT_HOME=C:\ant -goto checkJava - -:noAntHome -echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME. -goto end - -:checkJava -set _JAVACMD=%JAVACMD% -set LOCALCLASSPATH=%CLASSPATH% -for %%i in (%ANT_HOME%\lib\*.jar) do call %ANT_HOME%\bin\lcp.bat %%i - -if %JAVA_HOME% == goto noJavaHome -if %_JAVACMD% == set _JAVACMD=%JAVA_HOME%\bin\java -if not exist %_JAVACMD%.exe echo Error: %_JAVACMD%.exe not found - check JAVA_HOME goto end -if exist %JAVA_HOME%\lib\tools.jar call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\tools.jar -if exist %JAVA_HOME%\lib\classes.zip call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\classes.zip -goto checkJikes - -:noJavaHome -if %_JAVACMD% == set _JAVACMD=java -echo. -echo Warning: JAVA_HOME environment variable is not set. -echo If build fails because sun.* classes could not be found -echo you will need to set the JAVA_HOME environment variable -echo to the installation directory of java. -echo. - -:checkJikes -if not %JIKESPATH% == goto runAntWithJikes - -:runAnt -%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home=%ANT_HOME% %ANT_OPTS% org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS% -goto end - -:runAntWithJikes -%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home=%ANT_HOME% -Djikes.class.path=%JIKESPATH% %ANT_OPTS% org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS% - -:end -set LOCALCLASSPATH= -set _JAVACMD= -set ANT_CMD_LINE_ARGS= - -if not %OS%==Windows_NT goto mainEnd -:winNTend [EMAIL PROTECTED] - -:mainEnd -if exist %HOME%\antrc_post.bat call %HOME%\antrc_post.bat - [EMAIL PROTECTED] off + +REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights +REM reserved. + +if exist %HOME%\antrc_pre.bat call %HOME%\antrc_pre.bat + +if %OS%==Windows_NT @setlocal + +rem %~dp0 is expanded pathname of the current script under NT +set DEFAULT_ANT_HOME=%~dp0.. + +if %ANT_HOME%== set
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
cvs commit: cocoon-2.1 status.xml
mpo 2003/12/18 00:02:31 Modified:.status.xml Log: Adding support for @lenient on all attributes. The value of lenient should be one of ''(unset=default)|'true'|'false' and indicates which (if any) leniency setting this binding will apply on the jxpath context. By default the leniency on the top-level of the binding is set to true. Reasoning and discussion for this feature are here: http://marc.theaimsgroup.com/?t=10716068839r=1w=2 Revision ChangesPath 1.214 +8 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- status.xml17 Dec 2003 04:15:14 - 1.213 +++ status.xml18 Dec 2003 08:02:31 - 1.214 @@ -75,6 +75,7 @@ person name=Christopher Oliver email=[EMAIL PROTECTED] id=CO/ person name=Giacomo Pati email=[EMAIL PROTECTED] id=GP/ person name=Konstantin Piroumian email=[EMAIL PROTECTED] id=KP/ + person name=Marc Portier email=[EMAIL PROTECTED] id=MPO/ person name=Ovidiu Predescu email=[EMAIL PROTECTED] id=OP/ person name=Jeremy Quinn email=[EMAIL PROTECTED] id=JQ/ person name=Reinhard P#246;tz email=[EMAIL PROTECTED] id=RP/ @@ -189,7 +190,12 @@ changes release version=@version@ date=@date@ -action dev=AG type=fix due-to-email=[EMAIL PROTECTED] due-to=Laurent Trillaud + action dev=MPO type=add + Changed semantics on the cforms binding. Added a @direction (which replaces + the @read-only) and a @lenient attribute on all binding implementations in + the pool. + /action + action dev=AG type=fix due-to-email=[EMAIL PROTECTED] due-to=Laurent Trillaud Fix NPE error when pointed tag is empty in xsp-session-fw:getxml. Applying patch from [EMAIL PROTECTED] ([EMAIL PROTECTED]). /action
cvs commit: cocoon-2.1 status.xml
cziegeler2003/12/18 05:17:51 Modified:.status.xml Log: At least add something Revision ChangesPath 1.215 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- status.xml18 Dec 2003 08:02:31 - 1.214 +++ status.xml18 Dec 2003 13:17:51 - 1.215 @@ -190,6 +190,11 @@ changes release version=@version@ date=@date@ + action dev=CZ type=update + Portal-Engine: Added some new samples (for inter-coplet communication, + cleaned up the sample, fixed some bugs and added some new components + for developing own coplets. + /action action dev=MPO type=add Changed semantics on the cforms binding. Added a @direction (which replaces the @read-only) and a @lenient attribute on all binding implementations in
cvs commit: cocoon-2.1 status.xml
vgritsenko2003/12/11 03:33:45 Modified:.status.xml Log: record i18n changes Revision ChangesPath 1.210 +13 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- status.xml10 Dec 2003 17:53:26 - 1.209 +++ status.xml11 Dec 2003 11:33:45 - 1.210 @@ -190,6 +190,18 @@ release version=@version@ date=@date@ action dev=VG type=update + Reworked I18nTransformer implementation to use new version of XMLResourceBundle. + /action + action dev=VG type=update + Reworked XMLResourceBundle implementation. Now it supports only XML bundles with + fixed syntax (same as for I18nTransformer dictionaries), and instead of XPath + keys uses message keys (which is faster). Returned resources now are instances of + ParamSaxBuffer class, and not DOM nodes. + /action + action dev=VG type=update + Modified BundleFactory interface to return Bundle instead of Component. + /action + action dev=VG type=update Cocoon Forms (Woody) selection lists now allow empty value (which is translated to the null object) /action
cvs commit: cocoon-2.1 status.xml
sylvain 2003/12/11 13:25:12 Modified:.status.xml Log: List recent changes. Will now port them to 2.2 Revision ChangesPath 1.211 +17 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- status.xml11 Dec 2003 11:33:45 - 1.210 +++ status.xml11 Dec 2003 21:25:12 - 1.211 @@ -189,6 +189,22 @@ changes release version=@version@ date=@date@ + action dev=SW type=update + Fixed and updated the stores and made them instrumentable to follow their size and + the number of hits and missed. + /action + action dev=SW type=add + New PipelineUtil class that extends the features or codecocoon.processPipelineTo()/code + to SAX and DOM outputs. + /action + action dev=SW type=add + The cocoon object in flowscript has two new methods that allow Java classes + instanciated by a flowscript to access e.g. request, response and components + without requiring a dependency on the FOM_Cocoon class.br/ + codecocoon.createObject(Class)/code creates an object and honors the various + Avalon lifecycle interfaces implemented by an object.br/ + codecocoon.disposeObject(Object)/code disposes an object if needed. + /action action dev=VG type=update Reworked I18nTransformer implementation to use new version of XMLResourceBundle. /action
cvs commit: cocoon-2.1 status.xml
vgritsenko2003/12/02 06:52:16 Modified:.status.xml Log: Bug 25132 Revision ChangesPath 1.205 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- status.xml28 Nov 2003 01:46:41 - 1.204 +++ status.xml2 Dec 2003 14:52:15 - 1.205 @@ -182,6 +182,9 @@ changes release version=@version@ date=@date@ + action dev=VG type=fix fixes-bug=25132 + Do not double decode URI in CocoonServlet + /action action dev=JH type=fix Resurrected the XMLDB samples including XIndice 1.1b1 in Cocoon. /action
cvs commit: cocoon-2.1 status.xml
crossley2003/11/27 17:46:41 Modified:.status.xml Log: Fixed a validation error on my part, sorry. Revision ChangesPath 1.204 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- status.xml28 Nov 2003 01:23:09 - 1.203 +++ status.xml28 Nov 2003 01:46:41 - 1.204 @@ -220,7 +220,7 @@ Woody: new upload widget. This required some modification on multipart.Part objects that can now survice the end of processing of the current request. /action - action dev=DC type=update context=core + action dev=DC type=update Updated Entity Resolver from pre-release to official xml-commons-resolver-1.1 release. /action
cvs commit: cocoon-2.1 status.xml
vgritsenko2003/11/26 19:44:20 Modified:.status.xml Log: i18n transformer changes Revision ChangesPath 1.202 +11 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- status.xml24 Nov 2003 12:20:53 - 1.201 +++ status.xml27 Nov 2003 03:44:20 - 1.202 @@ -182,7 +182,16 @@ changes release version=@version@ date=@date@ -action dev=AG type=update + action dev=VG type=remove + I18n transformer does not support old configuration syntax anymore + (parameters catalogue-name, catalogue-location). Use lt;catalogues/gt; + element instead. + /action + action dev=VG type=fix + I18n transformer now works with translations containing elements with + attributes. + /action + action dev=AG type=update Update libs Xerces to 2.6.0 and xml-apis.jar /action action dev=SW type=add
cvs commit: cocoon-2.1 status.xml
sylvain 2003/11/20 07:40:26 Modified:.status.xml Log: A lot of changes! Revision ChangesPath 1.200 +21 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- status.xml19 Nov 2003 03:46:22 - 1.199 +++ status.xml20 Nov 2003 15:40:25 - 1.200 @@ -182,6 +182,26 @@ changes release version=@version@ date=@date@ + action dev=SW type=add + The cocoon object in flowscript has a new setup(object) method that honors the various Avalon lifecycle + interfaces implemented by an object. This allows Java classes instanciated by a flowscript to access e.g. + request, response and components without requiring a dependency on the FOM_Cocoon class. + /action + action dev=SW type=add + Woody: new double-list styling for MultivalueField. + /action + action dev=SW type=add + New MountTableMatcher to define mount tables that allow external directories + to be mounted in a sitemap without requiring to modify the sitemap. It's use has + been included in the samples sitemap, thus allowing mounts that surivive a build clean webapp. + /action + action dev=SW type=add + Woody: added rendering of lt;wd:helpgt; popup panel on a ? icon. + /action + action dev=SW type=add + Woody: new upload widget. This required some modification on multipart.Part objects + that can now survice the end of processing of the current request. + /action action dev=DC type=update context=core Updated Entity Resolver from pre-release to official xml-commons-resolver-1.1 release.
cvs commit: cocoon-2.1 status.xml
vgritsenko2003/11/18 06:26:23 Modified:.status.xml Log: Add NetUtils change Revision ChangesPath 1.198 +7 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- status.xml16 Nov 2003 23:04:12 - 1.197 +++ status.xml18 Nov 2003 14:26:23 - 1.198 @@ -182,11 +182,16 @@ changes release version=@version@ date=@date@ + action dev=VG type=update + NetUtils deparameterize() and parameterize() extended to support + multivalue parameters. Multivalue parameters are returned as String + arrays. + /action action dev=UH type=add Add cocoon.sendStatus([Number] sc) and cocoon.response.setStatus([Number] sc) to FOM. /action -action dev=AG type=update + action dev=AG type=update Updated Jetty to 4.2.14 /action action dev=CZ type=fix fixes-bug=24093
cvs commit: cocoon-2.1 status.xml
antonio 2003/11/16 10:47:13 Modified:.status.xml Log: Update jetty to 4.2.14 Revision ChangesPath 1.196 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs//cocoon-2.1/status.xml,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- status.xml14 Nov 2003 13:04:06 - 1.195 +++ status.xml16 Nov 2003 18:47:13 - 1.196 @@ -181,6 +181,9 @@ changes release version=@version@ date=@date@ +action dev=AG type=update + Updated Jetty to 4.2.14 + /action action dev=CZ type=fix fixes-bug=24093 Disable accessing files outside the context via the context protocol. /action
cvs commit: cocoon-2.1 status.xml
unico 2003/11/16 15:04:12 Modified:.status.xml Log: new *status FOM methods description Revision ChangesPath 1.197 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- status.xml16 Nov 2003 18:47:13 - 1.196 +++ status.xml16 Nov 2003 23:04:12 - 1.197 @@ -61,6 +61,7 @@ person name=Vadim Gritsenko email=[EMAIL PROTECTED] id=VG/ person name=Christian Haul email=[EMAIL PROTECTED] id=CH/ person name=J#246;rg Heinicke email=[EMAIL PROTECTED] id=JH/ + person name=Unico Hommes email=[EMAIL PROTECTED] id=UH/ person name=Geoff Howard email=[EMAIL PROTECTED] id=GH/ person name=Bernhard Huber email=[EMAIL PROTECTED] id=BH/ person name=Ivelin Atanasoff Ivanov email=[EMAIL PROTECTED] id=IAI/ @@ -181,6 +182,10 @@ changes release version=@version@ date=@date@ + action dev=UH type=add + Add cocoon.sendStatus([Number] sc) and cocoon.response.setStatus([Number] sc) + to FOM. + /action action dev=AG type=update Updated Jetty to 4.2.14 /action
cvs commit: cocoon-2.1 status.xml
cziegeler2003/11/14 05:04:06 Modified:.status.xml Log: Remove some obsolete tasks Revision ChangesPath 1.195 +1 -12 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- status.xml14 Nov 2003 13:02:09 - 1.194 +++ status.xml14 Nov 2003 13:04:06 - 1.195 @@ -107,12 +107,6 @@ link href=plan/release.htmlrelease plan/link /action -action context=code assigned-to=open - Use (only) released versions of excalibur - (source, store, xmlutil). This requires a release of those - components in excalibur. -/action - action context=build assigned-to=open Complete (means put all allowed constructs and combinations) the lint/sitemap.xmap file. Enhance the RELAX NG grammar for sitemap. @@ -141,11 +135,6 @@ action context=code assigned-to=open Finish moving the scratchpad stuff in main trunk. -/action - -action context=code assigned-to=open - The testcase for the entity resolver should be moved to the Excalibur XMLUtil, - since there is the default resolver. /action action context=code assigned-to=SMS
cvs commit: cocoon-2.1 status.xml forrest.properties
cziegeler2003/11/13 03:25:06 Modified:src/java/org/apache/cocoon cocoon.properties .status.xml forrest.properties Log: Starting next release Revision ChangesPath 1.20 +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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cocoon.properties 13 Nov 2003 11:15:10 - 1.19 +++ cocoon.properties 13 Nov 2003 11:25:06 - 1.20 @@ -4,7 +4,7 @@ # very high chance of breaking the build system. Do it only if you know what # you're doing. -version=2.1.3 +version=2.1.4-dev released.version=2.1.3 year=1999-2003 name=cocoon 1.192 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- status.xml11 Nov 2003 12:15:30 - 1.191 +++ status.xml13 Nov 2003 11:25:06 - 1.192 @@ -192,6 +192,11 @@ changes release version=@version@ date=@date@ + action dev=NN +DUMMY + /action + /release + release version=2.1.3 date=November 13 2003 action dev=DC type=fix fixes-bug=24463 due-to-email=[EMAIL PROTECTED] due-to=Leo Leonid Complete overhaul of the Petstore sample. Adding Woody form processing Flow, and dealing with persistent data. Implementation of missing or 1.27 +1 -1 cocoon-2.1/forrest.properties Index: forrest.properties === RCS file: /home/cvs/cocoon-2.1/forrest.properties,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- forrest.properties13 Nov 2003 11:15:10 - 1.26 +++ forrest.properties13 Nov 2003 11:25:06 - 1.27 @@ -6,7 +6,7 @@ #forrest.echo=true # Project name (used to name .war file) -project.name=cocoon-2.1.3 +project.name=cocoon-2.1.4-dev # Specifies name of Forrest skin to use #project.skin=forrest-site
cvs commit: cocoon-2.1 status.xml
cziegeler2003/11/13 04:32:47 Modified:.status.xml Log: Adding missing type Revision ChangesPath 1.193 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- status.xml13 Nov 2003 11:25:06 - 1.192 +++ status.xml13 Nov 2003 12:32:47 - 1.193 @@ -192,7 +192,7 @@ changes release version=@version@ date=@date@ - action dev=NN + action dev=NN type=fix DUMMY /action /release
cvs commit: cocoon-2.1 status.xml
crossley2003/11/11 04:06:57 Modified:.status.xml Log: No need to mention contributors twice nor hard-code their email address. Revision ChangesPath 1.190 +4 -5 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- status.xml10 Nov 2003 08:15:25 - 1.189 +++ status.xml11 Nov 2003 12:06:57 - 1.190 @@ -200,7 +200,7 @@ XMLByteStreamCompiler now handles also text nodes longer than 32 k. /action action dev=CZ type=fix fixes-bug=23538 due-to-email=[EMAIL PROTECTED] due-to=Sam Coward - Applying patch from Sam Coward ([EMAIL PROTECTED]) for reducing + Reducing setDocumentLocator calls in JXTemplateGenerator and JXFormsGenerator. /action action dev=BD type=add fixes-bug=24294 due-to=Jelle Alten due-to-email=[EMAIL PROTECTED] @@ -211,14 +211,13 @@ patch from Grigorios Merenidis ([EMAIL PROTECTED]). /action action dev=CZ type=fix fixes-bug=24326 due-to-email=[EMAIL PROTECTED] due-to=Andrzej Taramina - SQLTransformer: Correcting handling of XML data with XML declarations. Applying - patch from Andrzej Taramina ([EMAIL PROTECTED]). + SQLTransformer: Correcting handling of XML data with XML declarations. /action action dev=CZ type=fix due-to=Volker Schmitt Fixing threading problems in the ExtendedComponentSelector. /action action dev=CZ type=fix fixes-bug=24409 due-to-email=[EMAIL PROTECTED] due-to=Martin Holz - Fixing namespace handling in the send-mail transformer (Patch submitted by Martin Holz). + Fixing namespace handling in the send-mail transformer. /action action dev=CZ type=fix due-to=Andrea Poeschl due-to-email=[EMAIL PROTECTED] Fixing precompilation of the XSPs for the CLI.
cvs commit: cocoon-2.1 status.xml
crossley2003/11/11 04:15:30 Modified:.status.xml Log: Complete overhaul of the Petstore sample. Adding Woody form processing Flow, and dealing with persistent data. Implementation of missing or unfinished parts. See the the bug report and its attached notes. PR: 24463 Submitted by: Leo Leonid tekATleonid.de Revision ChangesPath 1.191 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- status.xml11 Nov 2003 12:06:57 - 1.190 +++ status.xml11 Nov 2003 12:15:30 - 1.191 @@ -192,6 +192,11 @@ changes release version=@version@ date=@date@ + action dev=DC type=fix fixes-bug=24463 due-to-email=[EMAIL PROTECTED] due-to=Leo Leonid + Complete overhaul of the Petstore sample. Adding Woody form processing + Flow, and dealing with persistent data. Implementation of missing or + unfinished parts. See the the bug report and its attached notes. + /action action dev=CZ type=fix The CachingPointProcessingPipeline now uses Parameters instead of an own configuration scheme. See the demo sitemap for the changed configuration.
cvs commit: cocoon-2.1 status.xml
bdelacretaz2003/11/07 02:49:58 Modified:.status.xml Log: sitemap-viewer sample Revision ChangesPath 1.186 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- status.xml7 Nov 2003 09:29:51 - 1.185 +++ status.xml7 Nov 2003 10:49:58 - 1.186 @@ -192,6 +192,9 @@ changes release version=@version@ date=@date@ + action dev=BD type=add fixes-bug=24294 due-to=Jelle Alten due-to-email=[EMAIL PROTECTED] + sitemap-viewer added to the scratchpad samples + /action action dev=AG type=fix fixes-bug=19638 due-to-email=[EMAIL PROTECTED] due-to=Grigorios Merenidis Fix HSSFSerializer Bug: Same cell definitions blows document. Applying patch from Grigorios Merenidis ([EMAIL PROTECTED]).
cvs commit: cocoon-2.1 status.xml
cziegeler2003/11/06 01:01:35 Modified:.status.xml Log: Updating status Revision ChangesPath 1.182 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- status.xml5 Nov 2003 21:01:06 - 1.181 +++ status.xml6 Nov 2003 09:01:35 - 1.182 @@ -192,6 +192,9 @@ changes release version=@version@ date=@date@ + action dev=CZ type=fix fixes-bug=24409 due-to-email=[EMAIL PROTECTED] due-to=Martin Holz + Fixing namespace handling in the send-mail transformer (Patch submitted by Martin Holz). + /action action dev=CZ type=fix due-to=Andrea Poeschl due-to-email=[EMAIL PROTECTED] Fixing precompilation of the XSPs for the CLI. /action
cvs commit: cocoon-2.1 status.xml
bruno 2003/11/01 12:29:46 Modified:.status.xml Log: mention a woody change Revision ChangesPath 1.180 +8 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- status.xml1 Nov 2003 10:18:13 - 1.179 +++ status.xml1 Nov 2003 20:29:46 - 1.180 @@ -192,6 +192,13 @@ changes release version=@version@ date=@date@ +action dev=BRD type=update + Woody: in the form definition, for widgets that have child widgets, those + child widgets should now be embedded inside a wd:widgets element. + Practical update information can be found + link href=http://wiki.cocoondev.org/Wiki.jsp?page=WoodySyntaxUpdateForWidgetsElement; + in the wiki/link. + /action action dev=AG type=update Updated Xalan to 2.5.2 /action
cvs commit: cocoon-2.1 status.xml
bruno 2003/10/31 04:36:01 Modified:.status.xml Log: Added FormHandler changes Revision ChangesPath 1.178 +7 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- status.xml31 Oct 2003 11:21:44 - 1.177 +++ status.xml31 Oct 2003 12:36:01 - 1.178 @@ -192,6 +192,12 @@ changes release version=@version@ date=@date@ + action dev=BRD type=update + Woody: did some cleanup of the FormHandler interface: moved it to the event subpackage, + made it handle all types of WidgetEvents (there's an AbstractFormHandler which splits + ActionEvents from ValueChangedEvents). Removed the deprecated RepeaterHandler class, + and the unused CarSelectorHandler class. + /action action dev=SW type=update Serializers now can optionnaly implement the SitemapModelComponent interface, meaning then can be given a src attribute and parameters using lt;map:parametergt;.
cvs commit: cocoon-2.1 status.xml
cziegeler2003/10/21 01:08:24 Modified:.status.xml Log: Adding fixed bug Revision ChangesPath 1.175 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- status.xml14 Oct 2003 13:14:59 - 1.174 +++ status.xml21 Oct 2003 08:08:24 - 1.175 @@ -193,7 +193,7 @@ release version=@version@ date=@date@ action dev=CZ type=fix fixes-bug=22377 due-to=Sam Coward due-to-email=[EMAIL PROTECTED] - Cocoon Protocol: Fixed a bug that broke the environment handling in some cases for internal pipeline calls. + Cocoon Protocol: Fixed a bug that broke the environment handling in some cases for internal pipeline calls. (This should also fix bug #15843). /action action dev=BRD type=fix fixes-bug=23648 due-to=Alfred Fuchs due-to-email=[EMAIL PROTECTED] HTMLGenerator: fixed NullPointerException in case the HTML file contained an XML declaration.
cvs commit: cocoon-2.1 status.xml
cziegeler2003/10/21 02:25:58 Modified:.status.xml Log: Closing bug Revision ChangesPath 1.176 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- status.xml21 Oct 2003 08:08:24 - 1.175 +++ status.xml21 Oct 2003 09:25:58 - 1.176 @@ -192,6 +192,9 @@ changes release version=@version@ date=@date@ + action dev=CZ type=fix fixes-bug=23625 + Closing some memory leaks in the source and component handling. + /action action dev=CZ type=fix fixes-bug=22377 due-to=Sam Coward due-to-email=[EMAIL PROTECTED] Cocoon Protocol: Fixed a bug that broke the environment handling in some cases for internal pipeline calls. (This should also fix bug #15843). /action
cvs commit: cocoon-2.1 status.xml
bruno 2003/10/08 03:09:41 Modified:.status.xml Log: Added fixed Woody bug concerning endless loop in validation. Revision ChangesPath 1.171 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- status.xml6 Oct 2003 16:27:01 - 1.170 +++ status.xml8 Oct 2003 10:09:41 - 1.171 @@ -191,6 +191,11 @@ changes release version=@version@ date=@date@ + action dev=BRD type=fix + Woody: fixed a bug causing an endless loop during validation of a field if + during the validation of the field the value of the field itself was again + requested. + /action action dev=BRD type=fix fixes-bug=16718 due-to=Daniel Fagerstrom due-to-email=[EMAIL PROTECTED] Patched SQLTransformer to use only one connection. /action
cvs commit: cocoon-2.1 status.xml
bruno 2003/10/06 09:27:01 Modified:.status.xml Log: Applying patch 16718 Using only one connection in SQLTransformer by Daniel Fagerstrom Revision ChangesPath 1.170 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- status.xml6 Oct 2003 16:07:33 - 1.169 +++ status.xml6 Oct 2003 16:27:01 - 1.170 @@ -191,6 +191,9 @@ changes release version=@version@ date=@date@ + action dev=BRD type=fix fixes-bug=16718 due-to=Daniel Fagerstrom due-to-email=[EMAIL PROTECTED] + Patched SQLTransformer to use only one connection. + /action action dev=GR type=add fixes-bug=14845 due-to=Micheal Homeijer due-to-email=[EMAIL PROTECTED] Patch to XMLDBTransformer to generate a key on create if it is not provided /action
cvs commit: cocoon-2.1 status.xml
crossley2003/10/02 17:41:51 Modified:.status.xml Log: Fix some typos. Revision ChangesPath 1.166 +4 -4 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- status.xml2 Oct 2003 23:29:47 - 1.165 +++ status.xml3 Oct 2003 00:41:51 - 1.166 @@ -247,7 +247,7 @@ output encoding in the Workbook to UTF-16. /action action dev=GP type=fix - Fixed issues the cron block had when cocoon (or the servlet contaier ?) + Fixed issues the cron block had when cocoon (or the servlet container ?) allows reloads. /action action dev=VG type=remove @@ -595,7 +595,7 @@ /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 is at least usable for more people. +hardcoded to UTF-16. It is obviously only a hack, but so it is 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 removed method XSPUtil.include() in ESQL logicsheet lt;esql:get-xml/gt; @@ -797,7 +797,7 @@ /action action dev=CZ type=update Correcting method names of new CacheableProcessingComponent interface. -It's now possible to write components that support the 2.0.x and the +It is now possible to write components that support the 2.0.x and the 2.1.x caching algorithm. /action action dev=CZ type=update
cvs commit: cocoon-2.1 status.xml
gianugo 2003/10/03 04:40:25 Modified:.status.xml Log: Additions and fixes to the *TraversableGenerator. - They both can be used with plain resources now - XML recognition takes into account mime types - Non exixtent sources now throw Exception PR: 23575 Submitted by: Unico Hommes ([EMAIL PROTECTED]) Revision ChangesPath 1.167 +10 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- status.xml3 Oct 2003 00:41:51 - 1.166 +++ status.xml3 Oct 2003 11:40:25 - 1.167 @@ -191,7 +191,15 @@ changes release version=@version@ date=@date@ - action dev=AG type=update + + action dev=GR type=update fixes-bug=23575 due-to=Unico Hommes due-to-email=[EMAIL PROTECTED] +TraversableGenerators can now be used with plain resources too (not only +collections). XPathTraversableGenerator has been revamped +in the XML recognition pattern (using mime type mapping too). +While at it, a bug regarding non-existent sources has been +fixed. + /action + action dev=AG type=update Update lib excalibur-i18n to 1.1, update iText to 1.01 /action action dev=GH type=add fixes-bug=22813 due-to=Klaus Bertram due-to-email=[EMAIL PROTECTED]
cvs commit: cocoon-2.1 status.xml
sylvain 2003/10/03 06:41:00 Modified:.status.xml Log: New JavaScriptBinding Revision ChangesPath 1.168 +5 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- status.xml3 Oct 2003 11:40:25 - 1.167 +++ status.xml3 Oct 2003 13:41:00 - 1.168 @@ -192,6 +192,10 @@ release version=@version@ date=@date@ + action dev=SW type=add + New JavaScriptBinding for Woody, which allows writing specific binding strategies + with two JavaScript snippets (one for load, one for save). + /action action dev=GR type=update fixes-bug=23575 due-to=Unico Hommes due-to-email=[EMAIL PROTECTED] TraversableGenerators can now be used with plain resources too (not only collections). XPathTraversableGenerator has been revamped
cvs commit: cocoon-2.1 status.xml
ghoward 2003/10/01 21:27:46 Modified:.status.xml Log: Note IE support in linotype. Should a new version and date section be started now that 2.1.2 is out? Also, the forrest docs at the site are not replacing the @version@ tokens. Revision ChangesPath 1.162 +5 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- status.xml1 Oct 2003 18:24:04 - 1.161 +++ status.xml2 Oct 2003 04:27:46 - 1.162 @@ -191,7 +191,10 @@ changes release version=@version@ date=@date@ - action dev=AG type=add + action dev=GH type=add fixes-bug=22813 due-to=Klaus Bertram due-to-email=[EMAIL PROTECTED] + Add initial support for IE in linotype. + /action + action dev=AG type=add Woody block: New integer Datatype. /action action dev=CH type=add
cvs commit: cocoon-2.1 status.xml
antonio 2003/09/27 22:01:05 Modified:.status.xml Log: Update status.xml Revision ChangesPath 1.158 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs//cocoon-2.1/status.xml,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- status.xml26 Sep 2003 14:46:23 - 1.157 +++ status.xml28 Sep 2003 05:01:05 - 1.158 @@ -191,6 +191,9 @@ changes release version=@version@ date=@date@ +action dev=AG type=add + OJB block: Object Relational mapping tool integration. + /action action dev=BD type=add Slop block: New YAPT sample, lightweight presentation tool. /action
cvs commit: cocoon-2.1 status.xml
sylvain 2003/09/24 13:49:50 Modified:.status.xml Log: - event-handling, in both Java and JavaScript - new wi:styling submit-on-change styling attribute - new wd:repeater-action widget - renamed layout XSLs to style, because the layout is more the form template - rewriting of the flowscript integration Revision ChangesPath 1.151 +14 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- status.xml22 Sep 2003 22:44:15 - 1.150 +++ status.xml24 Sep 2003 20:49:50 - 1.151 @@ -190,6 +190,19 @@ changes release version=@version@ date=@date@ + action dev=SW type=add + New event-handling system for Woody. Value change and action event handlers + can be attached respectively to field and action widgets, and event handlers + can be both Java classes or JavaScript snippets in the form definition. + br/ + New lt;wd:repeater-action widget to automatically handle rows addition and + deletion on repeaters (a very common need). + br/ + Ability to trigger form submit on any widget value change (including inputs, + popups, etc) to trigger server-side event handlers through client-side interaction. + br/ + Rewriting of the Woody/FlowScript integration to be more simple. + /action action dev=JH type=fix fixes-bug=23208 due-to=Yury Mikhienko due-to-email=[EMAIL PROTECTED] Fixed internationalization support for HSSFSerializer by setting also the
cvs commit: cocoon-2.1 status.xml
joerg 2003/09/22 15:28:10
Modified:.status.xml
Log:
kicked 2.0 changes
Revision ChangesPath
1.149 +6 -1314 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- status.xml18 Sep 2003 08:56:12 - 1.148
+++ status.xml22 Sep 2003 22:28:10 - 1.149
@@ -191,7 +191,7 @@
release version=@version@ date=@date@
action dev=GP type=fix
- Fixed issues the cron block had when cocoon (or the servlet contaier ?)
+ Fixed issues the cron block had when cocoon (or the servlet contaier ?)
allows reloads.
/action
action dev=VG type=remove
@@ -1495,9 +1495,8 @@
href=mailto:[EMAIL PROTECTED]Christopher Oliver/link:
link
href=ftp://ftp.primaryinterface.com/pub/rhino;ftp://ftp.primaryinterface.com/pub/rhino/link.
/action
- action dev=JM type=update
- Added size attribute and sorting to directory-generator. Thanks to
- Frank Ridderbusch for original code [BUGZILLA: 8531]
+ action dev=JM type=update fixes-bug=8531 due-to=Frank Ridderbusch
+ Added size attribute and sorting to directory-generator.
/action
action dev=CH type=fix
Changed error behaviour in esql: all exceptions now result in
error-results
@@ -1534,7 +1533,7 @@
Integrated the new Avalon Excalibur Store and StoreJanitor components.
This deprecates the Cocoon version.
/action
- action dev=GF type=add due-to=Andy Oliver due-to-email=[EMAIL
PROTECTED]
+ action dev=GF type=add due-to=Andy Oliver due-to-email=[EMAIL
PROTECTED]
Added formula support for HSSF Serializer.
/action
action dev=CZ type=add
@@ -1603,1314 +1602,7 @@
of (for more performance) by the quick-modified-test.
/action
/release
-release version=2.0.4 date=December 06 2002
- action dev=SW type=update
- The HTMLGenerator now accepts a JTidy configuration file for fine-grained
- control on the generated document.
- /action
- action dev=CH type=fix
- New Logicsheet for use with InputModules.
- /action
- action dev=CH type=add
- xsp.xsl now includes all xsp:init-page tags. Additional xsp:exit-page tag
for
- cleanup operations.
- /action
- action dev=CH type=add
- New InputModule to map parameter names to / from another name. Uses
translation
- table and additional prefix / suffix.
- /action
- action dev=CH type=fix fixes-bug=14739
- Fixed SimpleFormTransformer: Malformed XML with textarea elements.
- /action
- action dev=KP type=add
- Allow to set the i18n transformer's locale from the sitemap as a
- parameter (ported from 2.1-dev). The old behavior, based on LocaleAction
is preserved
- only for 2.0.x versions and will be removed from the further releases
(2.1 and higher).
- /action
- action dev=DC type=add
- New build target validate-config to conduct build-time validation of
some
- core important configuration files using RELAX NG (call it manually with:
- code./build.sh validate-config/code). Currently doing: all
sitemap.xmap,
- all cocoon.roles, all *.xsl stylesheets, all book.xml files.
- /action
- action dev=SW type=add
- Extend the syntax of sitemap variable substitution : variables can have a
prefix which
- indicates an InputModule where to get the value from. For example, the
expression
- {request-param:foo} will evaluate to the value of the foo request
parameter (provided
- of course that the request-param InputModule is correctly defined in
cocoon.xconf).
- /action
- action dev=CZ type=fix fixes-bug=12293
- RequestLifecycleComponents were not handled properly when the cocoon:
protocol is used
- /action
- action dev=CH type=update
- Changed SimpleFormTransformer to use InputModules.
- /action
- action dev=CH type=update
- Changed InputModules to return Iterator instead of Enumeration. New
abstract
- meta module to make new meta modules easier. Stripped meta from
defaults
- module. Added JXPathMetaModule. Added extension classes and packages to
all
- modules that are based on JXPath.
- /action
- action dev=CH type=update
- Improved support for CLOB and BLOB columns in modular database actions.
- /action
- action dev=CH type=add
- New chaining InputModule that allows to use additional modules when an
attribute is not
- present or null.
- /action
- action dev=CH type=update
- Changed defaults of InputModule names in many places to new names.
- /action
- action dev=CZ type=fix fixes-bug=14466 due-to=Luca Morandini
due-to-email=[EMAIL PROTECTED]
- Fixing namespace handling of SQLTransformer.
- /action
- action dev=SW type=add
-New
cvs commit: cocoon-2.1 status.xml
bruno 2003/09/09 02:18:53 Modified:.status.xml Log: Mentioned fix to woody repeater binding. Revision ChangesPath 1.145 +6 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- status.xml8 Sep 2003 19:01:13 - 1.144 +++ status.xml9 Sep 2003 09:18:53 - 1.145 @@ -190,6 +190,11 @@ changes release version=@version@ date=@date@ + action dev=BRD type=fix + Woody binding framework: fixed a problem with the deletion of rows by the + repeater binding, whereby not all deleted rows where removed from the + bean or XML model. + /action action dev=BRD type=add Errors handled by map:handle-errors are now logged to the logcategory sitemap.handled-errors. Previously they weren't logged.
cvs commit: cocoon-2.1 status.xml
vgritsenko2003/09/03 19:19:52 Modified:.status.xml Log: update*d* regexp library Revision ChangesPath 1.139 +7 -6 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- status.xml4 Sep 2003 02:11:30 - 1.138 +++ status.xml4 Sep 2003 02:19:52 - 1.139 @@ -39,11 +39,12 @@ !ENTITY ouml #x000F6; !ENTITY uuml #x000FC; ] + !-- CVS $Id$:-- -status +status developers -!-- in strict alphabetical order -- + !-- in strict alphabetical order -- person name=Donald Ball email=[EMAIL PROTECTED] id=DB/ person name=Nicola Ken Barozzi email=[EMAIL PROTECTED] id=NKB/ person name=Ross Burton email=[EMAIL PROTECTED] id=RB/ @@ -190,7 +191,7 @@ release version=@version@ date=@date@ action dev=VG type=update - Update Jakarta Regexp library to the version 1.3 + Updated Jakarta Regexp library to the version 1.3 /action action dev=CZ type=add fixes-bug=13070 due-to=Antonio Gallardo due-to-email=[EMAIL PROTECTED] Applying patch for adding new session-fw logicsheet that allows access to a session context from with xsp. @@ -401,8 +402,8 @@ configured caches at the same time. /action action dev=JH type=fix fixes-bug=14327 - Reverted the encoding changes in the JSP engine. The fix should be done in - the JSPReader, that already contains a TODO. + Reverted the encoding changes in the JSP engine. The fix should be done in + the JSPReader, that already contains a TODO. /action action dev=RP type=fix Web3: The stylesheets in the examples use Xalan as transformer and work correctly now
cvs commit: cocoon-2.1 status.xml
giacomo 2003/09/04 00:09:24 Modified:.status.xml Log: Revision ChangesPath 1.140 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -b -u -r1.139 -r1.140 --- status.xml4 Sep 2003 02:19:52 - 1.139 +++ status.xml4 Sep 2003 07:09:24 - 1.140 @@ -190,6 +190,9 @@ changes release version=@version@ date=@date@ + action dev=GP type=add + cron block added + /action action dev=VG type=update Updated Jakarta Regexp library to the version 1.3 /action
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
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
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/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.
