svn commit: r149120 - /cocoon/trunk/status.xml
Author: joerg Date: Sun Jan 30 02:31:52 2005 New Revision: 149120 URL: http://svn.apache.org/viewcvs?view=revrev=149120 Log: trial to reset the keyword by hand here too Modified: cocoon/trunk/status.xml Modified: cocoon/trunk/status.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diffrev=149120p1=cocoon/trunk/status.xmlr1=149119p2=cocoon/trunk/status.xmlr2=149120 == --- cocoon/trunk/status.xml (original) +++ cocoon/trunk/status.xml Sun Jan 30 02:31:52 2005 @@ -1,3054 +1,3054 @@ -?xml version=1.0? -!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the License); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- -!DOCTYPE status [ -!ELEMENT status (developers, todo, changes) -!ELEMENT developers (person+) -!ELEMENT person EMPTY -!ATTLIST person - name CDATA #REQUIRED - email CDATA #REQUIRED - id CDATA #REQUIRED - -!ELEMENT todo (actions+) -!ELEMENT actions (action+) -!ATTLIST actions - priority (high | medium | low) #REQUIRED - -!ELEMENT changes (release+) -!ELEMENT release (action+) -!ATTLIST release - version CDATA #REQUIRED - date CDATA #REQUIRED - -!ELEMENT action (#PCDATA | link | br | code | ul | strong)* -!ATTLIST action - context (build | code | docs) #IMPLIED - assigned-to CDATA #IMPLIED - dev CDATA #IMPLIED - type (add | fix | remove | update) #IMPLIED - fixes-bug CDATA #IMPLIED - due-to CDATA #IMPLIED - due-to-email CDATA #IMPLIED - -!ELEMENT code (#PCDATA) -!ELEMENT br EMPTY -!ELEMENT strong (#PCDATA) -!ELEMENT link (#PCDATA) -!ATTLIST link - href CDATA #REQUIRED - -!ELEMENT ul (li)+ -!ELEMENT li (#PCDATA | link | br | code | ul)* -!ENTITY eacute #x000E9; -!ENTITY ouml #x000F6; -!ENTITY uuml #x000FC; -!ENTITY ccedil #x000E7; -] - -!-- CVS $Id: status.xml 56165 2004-10-31 22:35:18Z antonio $ -- - -status - developers - !-- 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/ - 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/ - person name=Bertrand Delacr#233;taz email=[EMAIL PROTECTED] id=BD/ - person name=Bruno Dumon email=[EMAIL PROTECTED] id=BRD/ - person name=Gerhard Froehlich email=[EMAIL PROTECTED] id=GF/ - person name=Pierpaolo Fumagalli email=[EMAIL PROTECTED] id=PF/ - person name=Antonio Gallardo email=[EMAIL PROTECTED] id=AG/ - person name=Leszek Gawron email=[EMAIL PROTECTED] id=LG/ - person name=Ralph Goers email=[EMAIL PROTECTED] id=RG/ - 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/ - person name=Matthew Langham email=[EMAIL PROTECTED] id=BL/ - person name=Berin Loritsch email=[EMAIL PROTECTED] id=BL/ - person name=Stefano Mazzocchi email=[EMAIL PROTECTED] id=SM/ - person name=Michael Melhem email=[EMAIL PROTECTED] id=MM/ - person name=Stephan Michels email=[EMAIL PROTECTED] id=SMS/ - person name=John Morrison email=[EMAIL PROTECTED] id=JM/ - person name=Steven Noels email=[EMAIL PROTECTED] id=SN/ - 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/ - person name=Gianugo Rabellino email=[EMAIL PROTECTED] id=GR/ - person name=Ricardo Rocha email=[EMAIL PROTECTED] id=RR/ - person name=Peter Royal email=[EMAIL PROTECTED] id=PAR/ - person name=Paul Russell email=[EMAIL PROTECTED] id=PR/ - person name
svn commit: r123787 - /cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml
Author: joerg Date: Fri Dec 31 04:41:59 2004 New Revision: 123787 URL: http://svn.apache.org/viewcvs?view=revrev=123787 Log: update for e-informatyka.pl Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Modified: cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Url: http://svn.apache.org/viewcvs/cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml?view=diffrev=123787p1=cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xmlr1=123786p2=cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xmlr2=123787 == --- cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml (original) +++ cocoon/site/src/documentation/content/xdocs/link/livesites-2.1.xml Fri Dec 31 04:41:59 2004 @@ -16,6 +16,11 @@ Here are some web sites that are proudly powered by Cocoon 2.1 (only ordered by Cocoon version): /p + s2 title=Cocoon 2.1.6 +ul + lilink href=http://www.e-informatyka.pl;e-Informatyka.pl/link - software engineering journal (Polish)/li +/ul + /s2 s2 title=Cocoon 2.1.5 ul lilink href=http://www.vnunet.com/;vnunet.com/link - UK technology, news, reviews and downloads/li @@ -65,7 +70,6 @@ ul lilink href=http://portal.compu-shack.com/;Compu-Shack/link - the network channel/li lilink href=http://www.itgis.com/;ITGIS/link - Institute for Tourism and Geographic Information System/li - lilink href=http://www.e-informatyka.pl;e-Informatyka.pl/link - software engineering journal (Polish)/li lilink href=http://www.xml-dev.com/blog/#88;Linux Documentation Project/link/li lilink href=http://www.juwimm.com/;Juwi MacMillan Crossmedia Healthcare Communications/link/li lilink href=http://www.medical-guide.net/;Medical Guide/link - Medical Center of Clinic Itzehoe (German)/li
svn commit: r106571 - /cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Author: joerg
Date: Thu Nov 25 04:56:45 2004
New Revision: 106571
URL: http://svn.apache.org/viewcvs?view=revrev=106571
Log:
fixed the namespace uri == null by setting it to empty string instead of
changing the tests on it
Modified:
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Modified:
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diffrev=106571p1=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar1=106570p2=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar2=106571
==
---
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
(original)
+++
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Thu Nov 25 04:56:45 2004
@@ -213,7 +213,8 @@
*/
public void startElement(String uri, String loc, String raw, Attributes a)
throws SAXException {
-if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
+if (uri == null) uri = ;
+if (this.extractURI.equals(uri) this.extractElement.equals(loc)) {
extractLevel++;
fragmentID++;
if (getLogger().isDebugEnabled()) {
@@ -264,7 +265,8 @@
super.endElement(uri, loc, raw);
} else {
this.serializer.endElement(uri, loc, raw);
-if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
+if (uri == null) uri = ;
+if (this.extractURI.equals(uri)
this.extractElement.equals(loc)) {
extractLevel--;
if (getLogger().isDebugEnabled()) {
getLogger().debug(extractLevel now + extractLevel +
.);
svn commit: r106572 - /cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Author: joerg
Date: Thu Nov 25 04:57:03 2004
New Revision: 106572
URL: http://svn.apache.org/viewcvs?view=revrev=106572
Log:
fixed the namespace uri == null by setting it to empty string instead of
changing the tests on it
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diffrev=106572p1=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar1=106571p2=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar2=106572
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Thu Nov 25 04:57:03 2004
@@ -213,7 +213,8 @@
*/
public void startElement(String uri, String loc, String raw, Attributes a)
throws SAXException {
-if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
+if (uri == null) uri = ;
+if (this.extractURI.equals(uri) this.extractElement.equals(loc)) {
extractLevel++;
fragmentID++;
if (getLogger().isDebugEnabled()) {
@@ -264,7 +265,8 @@
super.endElement(uri, loc, raw);
} else {
this.serializer.endElement(uri, loc, raw);
-if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
+if (uri == null) uri = ;
+if (this.extractURI.equals(uri)
this.extractElement.equals(loc)) {
extractLevel--;
if (getLogger().isDebugEnabled()) {
getLogger().debug(extractLevel now + extractLevel +
.);
svn commit: r106296 - /cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Author: joerg
Date: Tue Nov 23 05:19:52 2004
New Revision: 106296
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Log:
fixed possible NPE
Modified:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java?view=diffrev=106296p1=cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.javar1=106295p2=cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.javar2=106296
==
---
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
(original)
+++
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Tue Nov 23 05:19:52 2004
@@ -137,10 +137,10 @@
return selectionListElement;
} finally {
-if (source != null) {
-resolver.release(source);
-}
if (resolver != null) {
+if (source != null) {
+resolver.release(source);
+}
serviceManager.release(resolver);
}
}
svn commit: r106297 - /cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Author: joerg
Date: Tue Nov 23 05:21:04 2004
New Revision: 106297
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Log:
fixed possible NPE
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java?view=diffrev=106297p1=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.javar1=106296p2=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.javar2=106297
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultSelectionListBuilder.java
Tue Nov 23 05:21:04 2004
@@ -137,10 +137,10 @@
return selectionListElement;
} finally {
-if (source != null) {
-resolver.release(source);
-}
if (resolver != null) {
+if (source != null) {
+resolver.release(source);
+}
serviceManager.release(resolver);
}
}
svn commit: r106301 - /cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java /cocoon/trunk/status.xml
Author: joerg
Date: Tue Nov 23 06:20:05 2004
New Revision: 106301
Modified:
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
cocoon/trunk/status.xml
Log:
Batik block: Fixed handling for empty extract URIs when matching on null
namespace URIs. (bug 32342)
Modified:
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diffrev=106301p1=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar1=106300p2=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar2=106301
==
---
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
(original)
+++
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Tue Nov 23 06:20:05 2004
@@ -67,7 +67,7 @@
* /pre
*
* @author a href=mailto:[EMAIL PROTECTED]Paul Russell/a
- * @version CVS $Id: FragmentExtractorTransformer.java,v 1.11 2004/03/28
05:29:04 antonio Exp $
+ * @version CVS $Id$
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements CacheableProcessingComponent, Configurable, Serviceable,
Disposable, Recyclable {
@@ -213,7 +213,7 @@
*/
public void startElement(String uri, String loc, String raw, Attributes a)
throws SAXException {
-if (this.extractURI.equals(uri) this.extractElement.equals(loc)) {
+if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
extractLevel++;
fragmentID++;
if (getLogger().isDebugEnabled()) {
@@ -264,7 +264,7 @@
super.endElement(uri, loc, raw);
} else {
this.serializer.endElement(uri, loc, raw);
-if (this.extractURI.equals(uri)
this.extractElement.equals(loc)) {
+if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
extractLevel--;
if (getLogger().isDebugEnabled()) {
getLogger().debug(extractLevel now + extractLevel +
.);
Modified: cocoon/trunk/status.xml
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diffrev=106301p1=cocoon/trunk/status.xmlr1=106300p2=cocoon/trunk/status.xmlr2=106301
==
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Tue Nov 23 06:20:05 2004
@@ -202,15 +202,19 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=fix fixes-bug=32342
+ Batik block: Fixed handling for empty extract URIs when matching on null
+ namespace URIs.
+ /action
action dev=GP type=add
Allow attribute values to be matches as well for EncodeURLTransformer.
/action
- action dev=BRD type=fix due-to=Neil Bacon fixes-bug=31887
due-to-email=[EMAIL PROTECTED]
-I18n (ParamSaxBuffer): handle case where substitution params like {0} are
split over multiple character events.
- /action
- action dev=LG type=fix
-Fix: Continuation can only be invoked for the interpreter it was
originally created for.
- /action
+ action dev=BRD type=fix due-to=Neil Bacon fixes-bug=31887
due-to-email=[EMAIL PROTECTED]
+ I18n (ParamSaxBuffer): handle case where substitution params like {0} are
split over multiple character events.
+ /action
+ action dev=LG type=fix
+ Fix: Continuation can only be invoked for the interpreter it was
originally created for.
+ /action
action dev=CZ type=add due-to=Sascha-Matthias Kulawik
due-to-email=[EMAIL PROTECTED]
Authentication block: Add authenticator for JAAS.
/action
@@ -263,7 +267,7 @@
/code
/action
action dev=ATC type=remove
-Removed the PHP block.
+ Removed the PHP block.
/action
action dev=CZ type=update
Remove support for Excalibur instrumentation.
svn commit: r106300 - /cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java /cocoon/branches/BRANCH_2_1_X/status.xml
Author: joerg
Date: Tue Nov 23 06:19:06 2004
New Revision: 106300
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Batik block: Fixed handling for empty extract URIs when matching on null
namespace URIs. (bug 32342)
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diffrev=106300p1=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar1=106299p2=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar2=106300
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Tue Nov 23 06:19:06 2004
@@ -67,7 +67,7 @@
* /pre
*
* @author a href=mailto:[EMAIL PROTECTED]Paul Russell/a
- * @version CVS $Id: FragmentExtractorTransformer.java,v 1.11 2004/03/28
05:29:04 antonio Exp $
+ * @version CVS $Id$
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements CacheableProcessingComponent, Configurable, Serviceable,
Disposable, Recyclable {
@@ -213,7 +213,7 @@
*/
public void startElement(String uri, String loc, String raw, Attributes a)
throws SAXException {
-if (this.extractURI.equals(uri) this.extractElement.equals(loc)) {
+if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
extractLevel++;
fragmentID++;
if (getLogger().isDebugEnabled()) {
@@ -264,7 +264,7 @@
super.endElement(uri, loc, raw);
} else {
this.serializer.endElement(uri, loc, raw);
-if (this.extractURI.equals(uri)
this.extractElement.equals(loc)) {
+if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
extractLevel--;
if (getLogger().isDebugEnabled()) {
getLogger().debug(extractLevel now + extractLevel +
.);
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diffrev=106300p1=cocoon/branches/BRANCH_2_1_X/status.xmlr1=106299p2=cocoon/branches/BRANCH_2_1_X/status.xmlr2=106300
==
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Nov 23 06:19:06 2004
@@ -202,19 +202,23 @@
changes
release version=@version@ date=@date@
+ action dev=JH type=fix fixes-bug=32342
+ Batik block: Fixed handling for empty extract URIs when matching on null
+ namespace URIs.
+ /action
action dev=GP type=add
-Allow attribute values to be matches as well for EncodeURLTransformer.
+ Allow attribute values to be matches as well for EncodeURLTransformer.
+ /action
+ action dev=BRD type=fix
+ Multipart requests: use container encoding for decoding requests, in
order to have consistent
+ handling between normal requests and multipart requests.
+ /action
+ action dev=BRD type=fix due-to=Neil Bacon fixes-bug=31887
due-to-email=[EMAIL PROTECTED]
+ I18n (ParamSaxBuffer): handle case where substitution params like {0} are
split over multiple character events.
+ /action
+ action dev=LG type=fix
+ Fix: Continuation can only be invoked for the interpreter it was
originally created for.
/action
- action dev=BRD type=fix
-Multipart requests: use container encoding for decoding requests, in order
to have consistent
-handling between normal requests and multipart requests.
- /action
- action dev=BRD type=fix due-to=Neil Bacon fixes-bug=31887
due-to-email=[EMAIL PROTECTED]
-I18n (ParamSaxBuffer): handle case where substitution params like {0} are
split over multiple character events.
- /action
- action dev=LG type=fix
-Fix: Continuation can only be invoked for the interpreter it was
originally created for.
- /action
/release
release version=2.1.6 date=November 19 2004
action dev=AG type=fix fixes-bug=23118 due-to=Jorg Heymans
due-to-email=[EMAIL PROTECTED]
svn commit: r106303 - /cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Author: joerg
Date: Tue Nov 23 06:27:50 2004
New Revision: 106303
Modified:
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Log:
fixed the way of fixing the handling for null namespace URIs ...
Modified:
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diffrev=106303p1=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar1=106302p2=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar2=106303
==
---
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
(original)
+++
cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Tue Nov 23 06:27:50 2004
@@ -213,7 +213,7 @@
*/
public void startElement(String uri, String loc, String raw, Attributes a)
throws SAXException {
-if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
+if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
extractLevel++;
fragmentID++;
if (getLogger().isDebugEnabled()) {
@@ -264,7 +264,7 @@
super.endElement(uri, loc, raw);
} else {
this.serializer.endElement(uri, loc, raw);
-if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
+if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
extractLevel--;
if (getLogger().isDebugEnabled()) {
getLogger().debug(extractLevel now + extractLevel +
.);
svn commit: r106302 - /cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Author: joerg
Date: Tue Nov 23 06:27:10 2004
New Revision: 106302
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Log:
fixed the way of fixing the handling for null namespace URIs ...
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diffrev=106302p1=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar1=106301p2=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.javar2=106302
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Tue Nov 23 06:27:10 2004
@@ -213,7 +213,7 @@
*/
public void startElement(String uri, String loc, String raw, Attributes a)
throws SAXException {
-if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
+if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
extractLevel++;
fragmentID++;
if (getLogger().isDebugEnabled()) {
@@ -264,7 +264,7 @@
super.endElement(uri, loc, raw);
} else {
this.serializer.endElement(uri, loc, raw);
-if ((uri == null || this.extractURI.equals(uri))
this.extractElement.equals(loc)) {
+if (((uri == null this.extractURI.equals()) ||
this.extractURI.equals(uri)) this.extractElement.equals(loc)) {
extractLevel--;
if (getLogger().isDebugEnabled()) {
getLogger().debug(extractLevel now + extractLevel +
.);
svn commit: r106189 - /cocoon/trunk/blocks.properties
Author: joerg Date: Mon Nov 22 07:07:04 2004 New Revision: 106189 Modified: cocoon/trunk/blocks.properties Log: generating blocks.properties added querybean properties Modified: cocoon/trunk/blocks.properties Url: http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?view=diffrev=106189p1=cocoon/trunk/blocks.propertiesr1=106188p2=cocoon/trunk/blocks.propertiesr2=106189 == --- cocoon/trunk/blocks.properties (original) +++ cocoon/trunk/blocks.properties Mon Nov 22 07:07:04 2004 @@ -59,7 +59,7 @@ #-[dependency]: fop is needed by tour. #include.block.fop=false #-[dependency]: hsqldb depends on databases. -#-[dependency]: hsqldb is needed by jms, petstore. +#-[dependency]: hsqldb is needed by jms, ojb, petstore. #include.block.hsqldb=false #-[dependency]: html is needed by portal. #include.block.html=false @@ -68,6 +68,7 @@ #include.block.jsp=false #include.block.linkrewriter=false #-[dependency]: lucene depends on forms (for samples), xsp (for samples). +#-[dependency]: lucene is needed by querybean. #include.block.lucene=false #include.block.naming=false #include.block.paranoid=false @@ -115,9 +116,9 @@ #-[dependency]: faces is needed by scratchpad. #include.block.faces=false #-[dependency]: forms depends on xsp (for samples). -#-[dependency]: forms is needed by apples, javaflow, lucene, ojb, petstore, tour. +#-[dependency]: forms is needed by apples, javaflow, lucene, ojb, petstore, querybean, tour. #include.block.forms=false -#-[dependency]: javaflow depends on forms, ojb. +#-[dependency]: javaflow depends on forms, ojb (for samples). #-[dependency]: javaflow is needed by scratchpad. #include.block.javaflow=false #-[dependency]: jms depends on databases (for samples), hsqldb. @@ -127,13 +128,15 @@ #-[dependency]: mail depends on asciiart, scratchpad. #include.block.mail=false #include.block.midi=false -#-[dependency]: ojb depends on databases, forms (for samples). +#-[dependency]: ojb depends on databases (for samples), forms (for samples), hsqldb (for samples). #-[dependency]: ojb is needed by javaflow. #include.block.ojb=false #-[dependency]: petstore depends on databases, forms, hsqldb, velocity. #include.block.petstore=false #include.block.proxy=false #include.block.qdox=false +#-[dependency]: querybean depends on forms (for samples), lucene. +#include.block.querybean=false #-[dependency]: repository depends on databases, eventcache. #-[dependency]: repository is needed by scratchpad, slide, webdav. #include.block.repository=false
svn commit: r106190 - /cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
Author: joerg
Date: Mon Nov 22 07:08:56 2004
New Revision: 106190
Modified:
cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
Log:
sorting the blocks in the lists for the messages
Modified: cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
Url:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl?view=diffrev=106190p1=cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xslr1=106189p2=cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xslr2=106190
==
--- cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl Mon Nov 22
07:08:56 2004
@@ -96,6 +96,7 @@
then
echo message= WARNING
===/
xsl:for-each select=[EMAIL PROTECTED]'unstable']
+xsl:sort select=@name/
xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
echo message= Block '{$block-name}' should be considered
unstable./
/xsl:for-each
@@ -121,6 +122,7 @@
then
echo message= NOTICE
/
xsl:for-each select=$cocoon-blocks
+xsl:sort select=@name/
xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
if
istrue value=${{internal.exclude.block.{$block-name}}}/
svn commit: rev 54538 - cocoon/trunk
Author: joerg
Date: Mon Oct 11 03:10:42 2004
New Revision: 54538
Modified:
cocoon/trunk/cocoon.sh
Log:
fixed classloader problem (bug 31635, by Claas Thiele)
Modified: cocoon/trunk/cocoon.sh
==
--- cocoon/trunk/cocoon.sh (original)
+++ cocoon/trunk/cocoon.sh Mon Oct 11 03:10:42 2004
@@ -16,7 +16,7 @@
# -
# Cocoon Unix Shell Script
#
-# $Id: cocoon.sh,v 1.13 2004/03/16 16:25:31 mpo Exp $
+# $Id$
# -
# Configuration variables
@@ -130,7 +130,7 @@
ENDORSED=-Djava.endorsed.dirs=$ENDORSED_LIBS
PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
LOADER=Loader
-LOADER_LIB=${COCOON_HOME}/tools/loader${PATHSEP}${COCOON_WEBAPP_HOME}/WEB-INF/classes
+LOADER_LIB=${COCOON_HOME}/tools/loader
CLI=-Dloader.main.class=org.apache.cocoon.Main
CLI_LIBRARIES=-Dloader.jar.repositories=$COCOON_LIB
svn commit: rev 54580 - in cocoon/trunk: . src/blocks/forms/conf src/blocks/forms/java/org/apache/cocoon/forms/datatype src/blocks/forms/java/org/apache/cocoon/forms/samples src/blocks/forms/samples/forms
Author: joerg
Date: Mon Oct 11 06:29:10 2004
New Revision: 54580
Added:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionList.java
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/samples/DateTestJavaSelectionList.java
Modified:
cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xconf
cocoon/trunk/src/blocks/forms/samples/forms/form1.xml
cocoon/trunk/src/blocks/forms/samples/forms/form1_template.xml
cocoon/trunk/src/blocks/forms/samples/forms/form1_template_action.xml
cocoon/trunk/status.xml
Log:
added JavaSelectionList (Bug 29715, by Nuno Santos)
Modified: cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xconf
==
--- cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xconf
(original)
+++ cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xconf Mon Oct
11 06:29:10 2004
@@ -21,6 +21,7 @@
selection-list name=default
class=org.apache.cocoon.forms.datatype.DefaultSelectionListBuilder/
selection-list name=flow-jxpath
class=org.apache.cocoon.forms.datatype.FlowJXPathSelectionListBuilder/
selection-list name=enum
class=org.apache.cocoon.forms.datatype.EnumSelectionListBuilder/
+selection-list name=java
class=org.apache.cocoon.forms.datatype.JavaSelectionListBuilder/
/forms-selection-lists
/xconf
Added:
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
==
--- (empty file)
+++
cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
Mon Oct 11 06:29:10 2004
@@ -0,0 +1,238 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.forms.datatype;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.forms.Constants;
+import org.apache.cocoon.forms.datatype.convertor.Convertor;
+import org.apache.cocoon.forms.datatype.convertor.DefaultFormatCache;
+import org.apache.cocoon.xml.AttributesImpl;
+import org.apache.cocoon.xml.XMLUtils;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+/**
+ * Abstract implementation of a JavaSelectionList
+ */
+public abstract class AbstractJavaSelectionList implements JavaSelectionList,
+Serviceable {
+
+protected Datatype datatype;
+protected ServiceManager manager;
+
+private HashMap attributes;
+private List items = new ArrayList();
+private boolean nullable;
+private boolean rebuild = true;
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.cocoon.forms.datatype.JavaSelectionList#getAttribute(java.lang.String)
+ */
+public String getAttribute(String name) {
+if (this.attributes == null) {
+return null;
+}
+return (String) this.attributes.get(name);
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.cocoon.forms.datatype.JavaSelectionList#removeAttribute(java.lang.String)
+ */
+public void removeAttribute(String name) {
+if (this.attributes != null) {
+this.attributes.remove(name);
+}
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.cocoon.forms.datatype.JavaSelectionList#setAttribute(java.lang.String,
+ * java.lang.String)
+ */
+public void setAttribute(String name, String value) {
+if (this.attributes == null) {
+this.attributes = new HashMap();
+}
+this.attributes.put(name, value);
+
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+public void service(ServiceManager manager) throws ServiceException {
+this.manager = manager
svn commit: rev 54588 - in cocoon/branches/BRANCH_2_1_X: . src/blocks/forms/conf src/blocks/forms/java/org/apache/cocoon/forms/datatype src/blocks/forms/java/org/apache/cocoon/forms/samples src/blocks/forms/samples/forms
Author: joerg
Date: Mon Oct 11 07:23:14 2004
New Revision: 54588
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionList.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/DateTestJavaSelectionList.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/conf/forms-selection-lists.xconf
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template_action.xml
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
added JavaSelectionList (Bug 29715, by Nuno Santos)
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/conf/forms-selection-lists.xconf
==
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/conf/forms-selection-lists.xconf
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/conf/forms-selection-lists.xconf
Mon Oct 11 07:23:14 2004
@@ -21,6 +21,7 @@
selection-list name=default
class=org.apache.cocoon.forms.datatype.DefaultSelectionListBuilder/
selection-list name=flow-jxpath
class=org.apache.cocoon.forms.datatype.FlowJXPathSelectionListBuilder/
selection-list name=enum
class=org.apache.cocoon.forms.datatype.EnumSelectionListBuilder/
+selection-list name=java
class=org.apache.cocoon.forms.datatype.JavaSelectionListBuilder/
/forms-selection-lists
/xconf
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
==
--- (empty file)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
Mon Oct 11 07:23:14 2004
@@ -0,0 +1,238 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.forms.datatype;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.forms.Constants;
+import org.apache.cocoon.forms.datatype.convertor.Convertor;
+import org.apache.cocoon.forms.datatype.convertor.DefaultFormatCache;
+import org.apache.cocoon.xml.AttributesImpl;
+import org.apache.cocoon.xml.XMLUtils;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+/**
+ * Abstract implementation of a JavaSelectionList
+ */
+public abstract class AbstractJavaSelectionList implements JavaSelectionList,
+Serviceable {
+
+protected Datatype datatype;
+protected ServiceManager manager;
+
+private HashMap attributes;
+private List items = new ArrayList();
+private boolean nullable;
+private boolean rebuild = true;
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.cocoon.forms.datatype.JavaSelectionList#getAttribute(java.lang.String)
+ */
+public String getAttribute(String name) {
+if (this.attributes == null) {
+return null;
+}
+return (String) this.attributes.get(name);
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.cocoon.forms.datatype.JavaSelectionList#removeAttribute(java.lang.String)
+ */
+public void removeAttribute(String name) {
+if (this.attributes != null) {
+this.attributes.remove(name);
+}
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.cocoon.forms.datatype.JavaSelectionList#setAttribute(java.lang.String,
+ * java.lang.String)
+ */
+public void setAttribute(String name, String value) {
+if (this.attributes == null) {
+this.attributes = new HashMap();
+}
+this.attributes.put(name, value);
+
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
cvs commit: cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/slide/util AdminHelper.java
joerg 2004/07/22 16:21:56
Modified:src/java/org/apache/cocoon/transformation/pagination
Pagesheet.java
src/blocks/mail/java/org/apache/cocoon/mail/transformation
SendMailTransformer.java
src/blocks/slide/java/org/apache/cocoon/slide/util
AdminHelper.java
Log:
fix eclipse compiler warnings
Revision ChangesPath
1.9 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/pagination/Pagesheet.java
Index: Pagesheet.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/pagination/Pagesheet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Pagesheet.java22 Jul 2004 09:12:34 - 1.8
+++ Pagesheet.java22 Jul 2004 23:21:55 - 1.9
@@ -16,7 +16,6 @@
package org.apache.cocoon.transformation.pagination;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -24,7 +23,6 @@
import org.apache.cocoon.Modifiable;
import org.apache.cocoon.util.ResizableContainer;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
1.15 +2 -2
cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java
Index: SendMailTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SendMailTransformer.java 22 Jul 2004 15:29:46 - 1.14
+++ SendMailTransformer.java 22 Jul 2004 23:21:56 - 1.15
@@ -454,7 +454,7 @@
}
/**
- * @link
http://java.sun.com/products/javamail/1.3/docs/javadocs/com/sun/mail/smtp/package-summary.html
+ * @see a
href=http://java.sun.com/products/javamail/1.3/docs/javadocs/com/sun/mail/smtp/package-summary.html;Sun
Javamail Javadoc/a
* @throws Exception
*/
private void sendMail(List newAddresses, Transport trans)
1.2 +3 -6
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java
Index: AdminHelper.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AdminHelper.java 17 Jul 2004 17:57:24 - 1.1
+++ AdminHelper.java 22 Jul 2004 23:21:56 - 1.2
@@ -341,14 +341,11 @@
String caller,
String userUri,
String password) throws Exception {
-
-String usersPath = nat.getNamespaceConfig().getUsersPath();
-
+
SlideToken slideToken = new SlideTokenImpl(new
CredentialsToken(caller));
Content content = nat.getContentHelper();
-
+
try {
-
nat.begin();
NodeRevisionDescriptors revisions = content.retrieve(slideToken,
userUri);
@@ -356,7 +353,7 @@
revision.setLastModified(new Date());
revision.setProperty(new NodeProperty(password, password,
NodeProperty.SLIDE_NAMESPACE));
content.store(slideToken, userUri, revision, null);
-
+
nat.commit();
}
catch (Exception e) {
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl CachingPointProcessingPipeline.java
joerg 2004/07/17 03:51:15
Modified:src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
src/java/org/apache/cocoon/components
ExtendedComponentSelector.java
src/java/org/apache/cocoon/components/treeprocessor
AbstractProcessingNodeBuilder.java
InvokeContext.java DefaultTreeBuilder.java
src/java/org/apache/cocoon/components/container
ComponentLocatorImpl.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
SelectNode.java SwitchSelectNode.java FlowNode.java
src/java/org/apache/cocoon Processor.java
src/java/org/apache/cocoon/components/pipeline/impl
CachingPointProcessingPipeline.java
Log:
clean up after the tree processor refactoring
Revision ChangesPath
1.27 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- AbstractProcessingPipeline.java 15 Jul 2004 12:49:49 - 1.26
+++ AbstractProcessingPipeline.java 17 Jul 2004 10:51:14 - 1.27
@@ -650,7 +650,7 @@
for (int i = 0; i size; i++) {
final ServiceSelector selector =
(ServiceSelector)this.transformerSelectors.get(i);
-selector.release( (Component)this.transformers.get(i) );
+selector.release(this.transformers.get(i));
this.newManager.release( selector );
}
this.transformerSelectors.clear();
1.12 +1 -5
cocoon-2.1/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java
Index: ExtendedComponentSelector.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExtendedComponentSelector.java15 Jul 2004 12:49:49 - 1.11
+++ ExtendedComponentSelector.java17 Jul 2004 10:51:15 - 1.12
@@ -16,20 +16,16 @@
package org.apache.cocoon.components;
import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.component.WrapperComponentSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.service.WrapperServiceSelector;
import org.apache.cocoon.components.container.ComponentLocatorImpl;
1.8 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java
Index: AbstractProcessingNodeBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractProcessingNodeBuilder.java16 Jul 2004 12:36:45 -
1.7
+++ AbstractProcessingNodeBuilder.java17 Jul 2004 10:51:15 -
1.8
@@ -20,9 +20,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.sitemap.PatternException;
import org.apache.cocoon.sitemap.SitemapParameters;
1.12 +2 -3
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor
cvs commit: cocoon-2.1/src/webapp/WEB-INF log4j.xconf
joerg 2004/07/09 03:23:30
Modified:src/webapp/WEB-INF log4j.xconf
Log:
*** keyword substitution change ***
Revision ChangesPath
1.2 +39 -39cocoon-2.1/src/webapp/WEB-INF/log4j.xconf
Index: log4j.xconf
===
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/log4j.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j.xconf 11 Jun 2004 20:29:29 - 1.1
+++ log4j.xconf 9 Jul 2004 10:23:30 - 1.2
@@ -1,39 +1,39 @@
-?xml version=1.0 encoding=UTF-8 ?
-!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the License);
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an AS IS BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---
-!DOCTYPE log4j:configuration SYSTEM log4j.dtd
-
-log4j:configuration xmlns:log4j=http://jakarta.apache.org/log4j/;
-
-!-- This is a sample configuration for log4j.
- It simply just logs everything into a single
- log file.
- Note, that you can use properties for value substituation.
---
-appender name=COCOON_DEFAULT class=org.apache.log4j.FileAppender
-param name=File value=${context-root}/WEB-INF/logs/log4j.log
/
-param name=Append value=false /
-layout class=org.apache.log4j.PatternLayout
-param name=ConversionPattern value=%t %-5p %c{2} - %m%n/
-/layout
-/appender
-
- root
-priority value =debug /
-appender-ref ref=COCOON_DEFAULT /
- /root
-
-/log4j:configuration
+?xml version=1.0 encoding=UTF-8 ?
+!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the License);
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--
+!DOCTYPE log4j:configuration SYSTEM log4j.dtd
+
+log4j:configuration xmlns:log4j=http://jakarta.apache.org/log4j/;
+
+!-- This is a sample configuration for log4j.
+ It simply just logs everything into a single
+ log file.
+ Note, that you can use properties for value substituation.
+--
+appender name=COCOON_DEFAULT class=org.apache.log4j.FileAppender
+param name=File value=${context-root}/WEB-INF/logs/log4j.log
/
+param name=Append value=false /
+layout class=org.apache.log4j.PatternLayout
+param name=ConversionPattern value=%t %-5p %c{2} - %m%n/
+/layout
+/appender
+
+ root
+priority value =debug /
+appender-ref ref=COCOON_DEFAULT /
+ /root
+
+/log4j:configuration
cvs commit: cocoon-2.1/src/webapp/WEB-INF cocoon.xconf
joerg 2004/07/09 03:26:17 Modified:src/webapp/WEB-INF cocoon.xconf Log: renamed flow-attribute input module to make the naming consistent: session-attr, request-attr = flow-attr Revision ChangesPath 1.53 +2 -2 cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf Index: cocoon.xconf === RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- cocoon.xconf 22 Jun 2004 02:41:14 - 1.52 +++ cocoon.xconf 9 Jul 2004 10:26:17 - 1.53 @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -- - +!-- CVS $Id$ -- cocoon version=2.2 !--+ @@ -175,7 +175,7 @@ component-instance logger=core.modules.input name=cocoon-properties class=org.apache.cocoon.components.modules.input.PropertiesFileModule file src=resource://org/apache/cocoon/cocoon.properties / /component-instance -component-instance logger=core.modules.input name=flow-attribute class=org.apache.cocoon.components.modules.input.FlowAttributeModule/ +component-instance logger=core.modules.input name=flow-attr class=org.apache.cocoon.components.modules.input.FlowAttributeModule/ component-instance logger=core.modules.input name=flow-continuation class=org.apache.cocoon.components.modules.input.FlowContinuationModule/ component-instance logger=core.modules.input name=xmlmeta class=org.apache.cocoon.components.modules.input.XMLMetaModule/
cvs commit: cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements Sheet.java
joerg 2004/07/07 11:46:48
Modified:
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
Sheet.java
Log:
removed erroneous javadoc tags
Revision ChangesPath
1.10 +1 -13
cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
Index: Sheet.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Sheet.java4 Jul 2004 20:57:02 - 1.9
+++ Sheet.java7 Jul 2004 18:46:48 - 1.10
@@ -322,7 +322,6 @@
/**
* Set whether or not the worksheet content is centered (horizontally)
* on the page when it is printed
- * @param ls landscape
*/
void setHCenter(boolean hCenter) {
_sheet.setHorizontallyCenter(hCenter);
@@ -331,7 +330,6 @@
/**
* Setwhether or not the worksheet content is centered (vertically)
* on the page when it is printed
- * @param ls landscape
*/
void setVCenter(boolean vCenter) {
_sheet.setVerticallyCenter(vCenter);
@@ -339,7 +337,6 @@
/**
* Setup whether or not printing is in monochrome (no color)
- * @param ls landscape
*/
void setMonochrome(boolean noColor) {
_sheet.getPrintSetup().setNoColor(noColor);
@@ -347,7 +344,6 @@
/**
* Setup whether or not the worksheet is printed in draft format
- * @param draftMode
*/
void setDraft(boolean draftMode) {
_sheet.getPrintSetup().setDraft(draftMode);
@@ -355,7 +351,6 @@
/**
* Set text to be printed at the top of every page
- * @param ls landscape
*/
void setHeader(String left, String middle, String right) {
HSSFHeader header = _sheet.getHeader();
@@ -366,7 +361,6 @@
/**
* Set text to be printed at the bottom of every page
- * @param ls landscape
*/
void setFooter(String left, String middle, String right) {
HSSFFooter footer = _sheet.getFooter();
@@ -377,7 +371,6 @@
/**
* Set the top margin of the page
- * @param ls landscape
*/
void setTopMargin(double points) {
_sheet.setMargin(HSSFSheet.TopMargin, points);
@@ -385,7 +378,6 @@
/**
* Set the left margin of the page
- * @param ls landscape
*/
void setLeftMargin(double points) {
_sheet.setMargin(HSSFSheet.LeftMargin, points);
@@ -393,7 +385,6 @@
/**
* Set the right margin of the page
- * @param ls landscape
*/
void setRightMargin(double points) {
_sheet.setMargin(HSSFSheet.RightMargin, points);
@@ -401,7 +392,6 @@
/**
* Set the bottom margin of the page
- * @param ls landscape
*/
void setBottomMargin(double points) {
_sheet.setMargin(HSSFSheet.BottomMargin, points);
@@ -409,7 +399,6 @@
/**
* Set the header margin of the page
- * @param ls landscape
*/
void setHeaderMargin(double points) {
_sheet.getPrintSetup().setHeaderMargin(points);
@@ -417,7 +406,6 @@
/**
* Set the header margin of the page
- * @param ls landscape
*/
void setFooterMargin(double points) {
_sheet.getPrintSetup().setFooterMargin(points);
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding RepeaterJXPathBindingBuilder.java
joerg 2004/07/07 15:20:37
Modified:src/blocks/forms/java/org/apache/cocoon/forms/binding
RepeaterJXPathBindingBuilder.java
Log:
throw a BindingException with explanation when other bindings than value
binding inside fb:identity are used
Revision ChangesPath
1.5 +14 -1
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepeaterJXPathBindingBuilder.java 1 Apr 2004 12:59:57 - 1.4
+++ RepeaterJXPathBindingBuilder.java 7 Jul 2004 22:20:37 - 1.5
@@ -108,8 +108,21 @@
BindingManager.NAMESPACE, identity);
JXPathBindingBase[] identityBinding = null;
if (identityWrapElement != null) {
+// TODO: we can only handle ValueJXPathBinding at the moment:
+//
http://marc.theaimsgroup.com/?l=xml-cocoon-devm=107906438632484w=4
identityBinding =
assistant.makeChildBindings(identityWrapElement);
+if (identityBinding != null) {
+for (int i = 0; i identityBinding.length;i++) {
+if (!(identityBinding[i] instanceof
ValueJXPathBinding)) {
+throw new BindingException(Error building
repeater binding defined at +
+DomHelper.getLocation(bindingElm) + :
Only value binding (i.e. fb:value) +
+can be used inside fb:identity at the
moment. You can read +
+
http://marc.theaimsgroup.com/?l=xml-cocoon-devm=107906438632484w=4; +
+ if you want to know more on this.);
+}
+}
+}
}
RepeaterJXPathBinding repeaterBinding =
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources forms-calendar-styling.xsl
joerg 2004/07/04 07:35:41
Modified:src/blocks/forms/samples/messages FormsMessages.xml
FormsMessages_de.xml FormsMessages_it_IT.xml
FormsMessages_zh_CN.xml FormsMessages_fr.xml
FormsMessages_nl.xml
src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor
FormattingDateConvertorBuilder.java
FormattingDateConvertor.java
src/blocks/forms/samples/resources
forms-calendar-styling.xsl
Log:
provide the variant info of date datatype to the form instance,
handle this appropriately in calendar stylesheet (display no calendar popup)
Revision ChangesPath
1.6 +6 -6
cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages.xml
Index: FormsMessages.xml
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormsMessages.xml 6 May 2004 14:13:51 - 1.5
+++ FormsMessages.xml 4 Jul 2004 14:35:41 - 1.6
@@ -19,19 +19,20 @@
message key=general.field-requiredThis field is required./message
message key=datatype.conversion-failedNot a valid {0}./message
- message key=datatype.longinteger number/message
message key=datatype.decimaldecimal number/message
- message key=datatype.doubledecimal number/message
- message key=datatype.floatdecimal number/message
message key=datatype.integerinteger number/message
- message key=datatype.datedate/message
+ message key=datatype.longinteger number/message
+ message key=datatype.floatdecimal number/message
+ message key=datatype.doubledecimal number/message
+ message key=datatype.date.datedate/message
+ message key=datatype.date.timetime/message
+ message key=datatype.date.datetimedate-time/message
message key=validation.string.exact-lengthShould be exactly {0}
characters./message
message key=validation.string.range-lengthShould contain from {0} to
{1} characters./message
message key=validation.string.min-lengthShould be at least {0}
characters./message
message key=validation.string.max-lengthShould be at most {0}
characters./message
message key=validation.string.regexpDoes not match the following
regular expression: {0}/message
-
message key=validation.string.invalidemailThis field does not contain
a valid email address/message
message key=validation.array.exact-valuecountExactly {0} item(s)
should be selected./message
@@ -46,7 +47,6 @@
message key=validation.numeric.maxNumber should be less than or equal
to {0}./message
message key=validation.mod10Mod 10 check failed./message
-
message key=aggregatedfield.split-failedContent of this field does not
match the following regular expression: {0}/message
message key=upload.invalid-typeInvalid content type./message
1.4 +8 -2
cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages_de.xml
Index: FormsMessages_de.xml
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages_de.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FormsMessages_de.xml 18 Apr 2004 13:45:31 - 1.3
+++ FormsMessages_de.xml 4 Jul 2004 14:35:41 - 1.4
@@ -18,9 +18,15 @@
catalogue xml:lang=de
message key=general.field-requiredDieses Feld muss aufgefüllt
werden./message
- message key=datatype.conversion-failedUngültige(s) {0}./message
+ message key=datatype.conversion-failedUngültige {0}./message
+ message key=datatype.decimalDezimalzahl/message
+ message key=datatype.integernatürliche Zahl/message
message key=datatype.longnatürliche Zahl/message
- message key=datatype.dateDatum/message
+ message key=datatype.floatDezimalzahl/message
+ message key=datatype.doubleDezimalzahl/message
+ message key=datatype.date.dateDatumsangabe/message
+ message key=datatype.date.timeZeitangabe/message
+ message key=datatype.date.datetimeDatums- und Zeitangabe/message
message key=validation.string.exact-lengthBitte geben Sie genau {0}
Zeichen ein./message
message key=validation.string.range-lengthBitte geben Sie zwischen {0}
und {1} Zeichen ein./message
1.6 +7 -1
cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages_it_IT.xml
Index: FormsMessages_it_IT.xml
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/messages/FormsMessages_it_IT.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormsMessages_it_IT.xml 6 Apr 2004 08:43:09 -
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-site/src/documentation/content/xdocs/link livesites-2.1.xml
joerg 2004/07/02 16:05:12 Modified:src/documentation/content/xdocs/link livesites-2.1.xml Log: zolotoverh.info added Revision ChangesPath 1.29 +1 -0 cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml Index: livesites-2.1.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- livesites-2.1.xml 26 Jun 2004 11:58:42 - 1.28 +++ livesites-2.1.xml 2 Jul 2004 23:05:11 - 1.29 @@ -21,6 +21,7 @@ lilink href=http://www.vnunet.com/;vnunet.com/link - UK technology, news, reviews and downloads/li lilink href=http://www.knowlex.org/;KnowLex/link - provides additional services (PDF, Lucene search, content-based ads) to the contents of Wikipedia (German)/li lilink href=http://www.digitaldevice.com.ua/;Digital Device Ukraine/link - Hi-Tech Life company (English, Russian)/li + lilink href=http://www.zolotoverh.info/;Ukrainian Orthodox Church/link (Ukrainian)/li /ul /s2 s2 title=Cocoon 2.1.4
cvs commit: cocoon-2.1/src/blocks/ojb/samples sitemap.xmap
joerg 2004/07/03 06:26:35
Modified:src/blocks/ojb/samples sitemap.xmap
Log:
fixed links to cforms resources
Revision ChangesPath
1.10 +3 -3 cocoon-2.1/src/blocks/ojb/samples/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/ojb/samples/sitemap.xmap,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sitemap.xmap 19 Mar 2004 12:54:16 - 1.9
+++ sitemap.xmap 3 Jul 2004 13:26:34 - 1.10
@@ -22,8 +22,8 @@
map:transformers default=xalan
map:transformer name=i18n
src=org.apache.cocoon.transformation.I18nTransformer
catalogues default=other
-catalogue id=other name=OtherMessages
location=context://samples/forms/messages/
-catalogue id=forms name=FormsMessages
location=context://samples/forms/messages/
+catalogue id=other name=OtherMessages
location=context://samples/blocks/forms/messages/
+catalogue id=forms name=FormsMessages
location=context://samples/blocks/forms/messages/
/catalogues
cache-at-startuptrue/cache-at-startup
/map:transformer
@@ -92,7 +92,7 @@
map:transform type=i18n
map:parameter name=locale value=en-US/
/map:transform
-map:transform
src=context://samples/forms/resources/forms-samples-styling.xsl/
+map:transform
src=context://samples/blocks/forms/resources/forms-samples-styling.xsl/
map:transform
src=context://samples/common/style/xsl/html/simple-page2html.xsl
map:parameter name=contextPath value={request:contextPath}/
map:parameter name=servletPath value={request:servletPath}/
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms form2_bind_xml.xml
joerg 2004/07/03 09:06:51
Modified:src/blocks/forms/samples/forms form2_bind_xml.xml
Log:
setting the @id on-bind after inserts
Revision ChangesPath
1.4 +14 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- form2_bind_xml.xml13 Mar 2004 11:22:00 - 1.3
+++ form2_bind_xml.xml3 Jul 2004 16:06:51 - 1.4
@@ -82,14 +82,24 @@
row-path=contact
fb:identity
- fb:value id=id path=@id
+ fb:value id=id path=@id direction=load
!-- 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 --
+ !-- executed on updates AND right after the insert --
+ fb:javascript id=id path=@id direction=save
+fb:save-form
+ var appValue = jxpathPointer.getValue();
+ if (appValue == '') {
+ var precSiblId =
jxpathContext.getValue(../preceding-sibling::contact/@id);
+ var newId = Number(precSiblId) + 1
+ jxpathPointer.setValue(newId.toFixed(0));
+ }
+/fb:save-form
+ /fb:javascript
fb:value id=firstname path=firstname /
fb:value id=lastname path=lastname /
fb:value id=phone path=phone/@nr /
@@ -97,8 +107,8 @@
/fb:on-bind
fb:on-delete-row
-!-- chose on of these to test --
-!--
+ !-- chose on of these to test --
+ !--
fb:set-attribute name=row-state value=deleted /
--
fb:delete-node /
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources forms-field-styling.xsl
joerg 2004/07/01 16:45:45
Modified:src/blocks/forms/samples/resources forms-field-styling.xsl
Log:
fixed upload widget: button caused a real submit, not an action submit
(spotted by Peter Velychko,
http://marc.theaimsgroup.com/?t=10886975843r=1w=4)
Revision ChangesPath
1.14 +5 -2
cocoon-2.1/src/blocks/forms/samples/resources/forms-field-styling.xsl
Index: forms-field-styling.xsl
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-field-styling.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- forms-field-styling.xsl 30 Jun 2004 18:51:48 - 1.13
+++ forms-field-styling.xsl 1 Jul 2004 23:45:45 - 1.14
@@ -368,7 +368,10 @@
xsl:when test=fi:value
!-- Has a value (filename): display it with a change button --
span title={fi:hint}
- [xsl:value-of select=fi:value/] input type=submit
id=[EMAIL PROTECTED] name=[EMAIL PROTECTED] value=.../
+ xsl:text[/xsl:text
+ xsl:value-of select=fi:value/
+ xsl:text] /xsl:text
+ input type=button id=[EMAIL PROTECTED] name=[EMAIL
PROTECTED] value=... onclick=forms_submitForm(this)/
/span
/xsl:when
xsl:otherwise
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor FormattingDateConvertor.java
joerg 2004/07/02 03:09:49 Modified:src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor FormattingDateConvertor.java Log: unused import Revision ChangesPath 1.5 +1 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDateConvertor.java Index: FormattingDateConvertor.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDateConvertor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FormattingDateConvertor.java 1 Jul 2004 07:30:40 - 1.4 +++ FormattingDateConvertor.java 2 Jul 2004 10:09:49 - 1.5 @@ -25,7 +25,6 @@ import java.util.Locale; import java.util.Date; import java.text.ParseException; -import java.text.SimpleDateFormat; /** * A Convertor for [EMAIL PROTECTED] java.util.Date Date} objects backed by the
cvs commit: cocoon-2.1 gump.xml
joerg 2004/06/30 14:55:42 Modified:.gump.xml Log: beanutils has been split, enable nagging (patch provided by Stefan Bodewig, http://marc.theaimsgroup.com/?l=xml-cocoon-devm=108858065426392w=4) Revision ChangesPath 1.162 +58 -58cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- gump.xml 7 Jun 2004 20:27:18 - 1.161 +++ gump.xml 30 Jun 2004 21:55:42 - 1.162 @@ -101,7 +101,7 @@ junitreport nested=build/cocoon-@@DATE@@/test/output/ -nag from=Gump to=dev@cocoon.apache.org +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org regexp pattern=/BUILD FAILED/ subject=Build Failure - Cocoon/ /nag /project @@ -129,8 +129,8 @@ jar name=blocks/fop-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ -nag from=Gump to=fop-dev@xml.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=fop-dev@xml.apache.org/ /project project name=cocoon-block-scratchpad status=unstable @@ -145,7 +145,7 @@ depend project=castor/ depend project=commons-jexl inherit=all/ depend project=commons-betwixt inherit=all/ -depend project=commons-beanutils inherit=all/ +depend project=commons-beanutils-core inherit=all/ depend project=commons-digester inherit=all/ depend project=jakarta-velocity inherit=all/ depend project=jakarta-servletapi-4/ @@ -160,7 +160,7 @@ jar name=blocks/scratchpad-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-batik status=stable @@ -179,8 +179,8 @@ jar name=blocks/batik-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ -nag from=Gump to=batik-dev@xml.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=batik-dev@xml.apache.org/ /project project name=cocoon-block-chaperon status=stable @@ -202,7 +202,7 @@ jar name=blocks/chaperon-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-jfor status=stable @@ -221,7 +221,7 @@ jar name=blocks/jfor-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-itext status=stable @@ -240,7 +240,7 @@ jar name=blocks/itext-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-session-fw status=stable @@ -259,7 +259,7 @@ jar name=blocks/session-fw-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-authentication-fw status=stable @@ -278,7 +278,7 @@ jar name=blocks/authentication-fw-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-portal-fw status=stable @@ -298,7 +298,7 @@ jar name=blocks/portal-fw-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-databases status=stable @@ -319,7 +319,7 @@ jar name=blocks/databases-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-hsqldb status=stable @@ -339,7 +339,7 @@ jar name=hsqldb-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project project name=cocoon-block-poi status=stable @@ -358,8 +358,8 @@ jar name=blocks/poi-block.jar/ -nag from=Gump to=dev@cocoon.apache.org/ -nag from=Gump to=poi-dev@jakarta.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ +nag from=Gump lt;general@gump.apache.orggt; to=poi-dev@jakarta.apache.org/ /project project name=cocoon-block-naming status=stable @@ -378,7 +378,7 @@ jar name
cvs commit: cocoon-2.1 .cvsignore
joerg 2004/06/30 14:57:09 Modified:..cvsignore Log: Eclipse 2.0's .settings dir added Revision ChangesPath 1.10 +1 -0 cocoon-2.1/.cvsignore Index: .cvsignore === RCS file: /home/cvs/cocoon-2.1/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore23 Jun 2004 19:15:55 - 1.9 +++ .cvsignore30 Jun 2004 21:57:09 - 1.10 @@ -16,3 +16,4 @@ tomcat tomcat.bat slide +.settings
cvs commit: cocoon-site/src/documentation/content/xdocs/link livesites-2.0.xml livesites-2.1.xml
joerg 2004/06/26 04:58:42 Modified:src/documentation/content/xdocs/link livesites-2.0.xml livesites-2.1.xml Log: new sites added Revision ChangesPath 1.18 +1 -0 cocoon-site/src/documentation/content/xdocs/link/livesites-2.0.xml Index: livesites-2.0.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.0.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- livesites-2.0.xml 7 Jun 2004 23:51:58 - 1.17 +++ livesites-2.0.xml 26 Jun 2004 11:58:42 - 1.18 @@ -48,6 +48,7 @@ lilink href=http://www.411ru.com/;411ru.com/link - Russian-American Business and Entertainment Portal/li lilink href=http://www.rowas.cz/;CK Rowas/link - Non-traditional server focused on travelling, mostly around Europe (Czech)/li lilink href=http://www.stocklottery.com/;Stock Lottery/link/li + lilink href=http://www.projektinter.net/;projektinter.net/link - Cocoon-based CMS, eCommerce, eBusiness and web-based GIS solution provider (German)/li /ul /s2 s2 title=Cocoon 2.0.3 1.28 +4 -1 cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml Index: livesites-2.1.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- livesites-2.1.xml 9 Jun 2004 20:10:27 - 1.27 +++ livesites-2.1.xml 26 Jun 2004 11:58:42 - 1.28 @@ -20,6 +20,7 @@ ul lilink href=http://www.vnunet.com/;vnunet.com/link - UK technology, news, reviews and downloads/li lilink href=http://www.knowlex.org/;KnowLex/link - provides additional services (PDF, Lucene search, content-based ads) to the contents of Wikipedia (German)/li + lilink href=http://www.digitaldevice.com.ua/;Digital Device Ukraine/link - Hi-Tech Life company (English, Russian)/li /ul /s2 s2 title=Cocoon 2.1.4 @@ -30,13 +31,15 @@ lilink href=http://www.scriptorium.ro/;Scriptorium/link - digital library project (Romanian, index page also in English and French)/li lilink href=http://www.conficio.com/;Conficio/link - publisher of streaming multimedia format Plan-B for software application demonstration (offline generated)/li lilink href=http://www.grumpykitty.com/;Grumpy Kitty/link (offline generated)/li - lilink href=http://www.starline-net.de;StarLine Webhosting (German)/link/li + lilink href=http://www.starline-net.de;StarLine Webhosting/link (German)/li lilink href=http://www.bethe1.com/;Bethe1/link - The employment specialist in fashion, beauty and retail (French, English, Japanese)/li !--li link href=http://www.edoc.mpg.de/;eDoc Server/link - document management system of the German research organisation Max Planck Society /li-- lilink href=http://www.ormaz.it;Ormaz s.r.l./link/li + lilink href=http://www.geologie.bayern.de/;Bayerisches Geologisches Landesamt/link - realized with a Cocoon-based CMS by projectinter.net (German)/li + lilink href=http://vivacs.de/;Vivacs biotech company/link - realized with a Cocoon-based CMS by projectinter.net/li /ul /s2 s2 title=Cocoon 2.1.3
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/xml/dom DocumentWrapper.java
joerg 2004/06/11 04:34:32
Modified:src/java/org/apache/cocoon/xml/dom DocumentWrapper.java
Log:
added renameNode() for providing future compatibility to JDK 1.5's DOM level
3 Document interface (thanks to Berin Loritsch)
Revision ChangesPath
1.6 +9 -2
cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DocumentWrapper.java
Index: DocumentWrapper.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DocumentWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DocumentWrapper.java 17 Mar 2004 12:09:52 - 1.5
+++ DocumentWrapper.java 11 Jun 2004 11:34:32 - 1.6
@@ -813,7 +813,14 @@
public Node removeChild(Node oldChild) throws DOMException {
return this.document.removeChild(oldChild);
}
-
+
+/**
+ * @since DOM Level 3
+ */
+public Node renameNode(Node node, String namespaceURI, String
qualifiedName) throws DOMException {
+throw new UnsupportedOperationException(This method was just added
for providing future compatibility to JDK 1.5's DOM level 3 Document
interface.);
+}
+
/** Replaces the child node codeoldChild/code with
codenewChild/code
* in the list of children, and returns the codeoldChild/code node.
* brIf codenewChild/code is a codeDocumentFragment/code
object,
cvs commit: cocoon-2.1/tools/targets init-build.xml
joerg 2004/06/11 04:35:23
Modified:tools/new-targets init-build.xml
tools/targets init-build.xml
Log:
fixed ${exclude.webapp.test-suite} property handling
Revision ChangesPath
1.2 +3 -0 cocoon-2.1/tools/new-targets/init-build.xml
Index: init-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/new-targets/init-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- init-build.xml26 May 2004 10:04:33 - 1.1
+++ init-build.xml11 Jun 2004 11:35:23 - 1.2
@@ -76,6 +76,9 @@
condition property=internal.exclude.webapp.samples
istrue value=${exclude.webapp.samples}/
/condition
+condition property=internal.exclude.webapp.test-suite
+ istrue value=${exclude.webapp.test-suite}/
+/condition
condition property=internal.exclude.deprecated
istrue value=${exclude.deprecated}/
1.16 +3 -0 cocoon-2.1/tools/targets/init-build.xml
Index: init-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/targets/init-build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- init-build.xml25 May 2004 12:53:43 - 1.15
+++ init-build.xml11 Jun 2004 11:35:23 - 1.16
@@ -76,6 +76,9 @@
condition property=internal.exclude.webapp.samples
istrue value=${exclude.webapp.samples}/
/condition
+condition property=internal.exclude.webapp.test-suite
+ istrue value=${exclude.webapp.test-suite}/
+/condition
condition property=internal.exclude.deprecated
istrue value=${exclude.deprecated}/
cvs commit: cocoon-site/src/documentation/content/xdocs/link livesites-2.1.xml
joerg 2004/06/09 13:10:27 Modified:src/documentation/content/xdocs/link livesites-2.1.xml Log: Academic Information System of the Universidad Nacional de Colombia added Revision ChangesPath 1.27 +2 -1 cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml Index: livesites-2.1.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- livesites-2.1.xml 7 Jun 2004 23:55:08 - 1.26 +++ livesites-2.1.xml 9 Jun 2004 20:10:27 - 1.27 @@ -47,7 +47,8 @@ lilink href=http://www.xml-dev.com/blog/#88;Linux Documentation Project/link/li lilink href=http://www.juwimm.com/;Juwi MacMillan Crossmedia Healthcare Communications/link/li lilink href=http://www.medical-guide.net/;Medical Guide/link - Medical Center of Clinic Itzehoe (German)/li - lilink href=http://www.uniklinik-duesseldorf.de;Düsseldorf University Hospital/link/li + lilink href=http://www.uniklinik-duesseldorf.de;Düsseldorf University Hospital/link (German)/li + lilink href=http://www.sia.unal.edu.co/academia/portal/;Academic Information System of the Universidad Nacional de Colombia/link (Spanish)/li /ul /s2 s2 title=Cocoon 2.1.2
cvs commit: cocoon-site/site/community committer.html contrib.html mail-archives.html mail-lists.html members.html
joerg 2004/06/09 13:28:28 Modified:site/community committer.html contrib.html mail-archives.html mail-lists.html members.html Log: website update (mostly only the copyright year) Revision ChangesPath 1.7 +1 -1 cocoon-site/site/community/committer.html Index: committer.html === RCS file: /home/cvs/cocoon-site/site/community/committer.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- committer.html5 Jan 2004 18:43:46 - 1.6 +++ committer.html9 Jun 2004 20:28:28 - 1.7 @@ -343,7 +343,7 @@ /tr tr td colspan=2 bgcolor=#CFDCED class=copyright align=centerfont size=2 face=Arial, Helvetica, Sans-SerifCopyright copy; - 2003nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- + 2003-2004nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // --/script/font/td /tr 1.9 +1 -1 cocoon-site/site/community/contrib.html Index: contrib.html === RCS file: /home/cvs/cocoon-site/site/community/contrib.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- contrib.html 13 Feb 2004 13:31:02 - 1.8 +++ contrib.html 9 Jun 2004 20:28:28 - 1.9 @@ -802,7 +802,7 @@ /tr tr td colspan=2 bgcolor=#CFDCED class=copyright align=centerfont size=2 face=Arial, Helvetica, Sans-SerifCopyright copy; - 2003nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- + 2003-2004nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // --/script/font/td /tr 1.8 +1 -1 cocoon-site/site/community/mail-archives.html Index: mail-archives.html === RCS file: /home/cvs/cocoon-site/site/community/mail-archives.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mail-archives.html18 Nov 2003 02:48:11 - 1.7 +++ mail-archives.html9 Jun 2004 20:28:28 - 1.8 @@ -313,7 +313,7 @@ /tr tr td colspan=2 bgcolor=#CFDCED class=copyright align=centerfont size=2 face=Arial, Helvetica, Sans-SerifCopyright copy; - 2003nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- + 2003-2004nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // --/script/font/td /tr 1.7 +1 -1 cocoon-site/site/community/mail-lists.html Index: mail-lists.html === RCS file: /home/cvs/cocoon-site/site/community/mail-lists.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mail-lists.html 18 Nov 2003 02:48:11 - 1.6 +++ mail-lists.html 9 Jun 2004 20:28:28 - 1.7 @@ -498,7 +498,7 @@ /tr tr td colspan=2 bgcolor=#CFDCED class=copyright align=centerfont size=2 face=Arial, Helvetica, Sans-SerifCopyright copy; - 2003nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- + 2003-2004nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // --/script/font/td /tr 1.9 +1 -1 cocoon-site/site/community/members.html Index: members.html === RCS file: /home/cvs/cocoon-site/site/community/members.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- members.html 18 Nov 2003 02:48:11 - 1.8 +++ members.html 9 Jun 2004 20:28:28 - 1.9 @@ -334,7 +334,7 @@ /tr tr td colspan=2 bgcolor=#CFDCED class=copyright align=centerfont size=2 face=Arial, Helvetica, Sans-SerifCopyright copy; - 2003nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- + 2003-2004nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript
cvs commit: cocoon-site/site/news archives.html index.html
joerg 2004/06/09 13:29:10 Modified:site/news archives.html index.html Log: website update (mostly only the copyright year) Revision ChangesPath 1.12 +1 -1 cocoon-site/site/news/archives.html Index: archives.html === RCS file: /home/cvs/cocoon-site/site/news/archives.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- archives.html 13 Feb 2004 13:31:02 - 1.11 +++ archives.html 9 Jun 2004 20:29:10 - 1.12 @@ -328,7 +328,7 @@ /tr tr td colspan=2 bgcolor=#CFDCED class=copyright align=centerfont size=2 face=Arial, Helvetica, Sans-SerifCopyright copy; - 2003nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- + 2003-2004nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // --/script/font/td /tr 1.18 +1 -1 cocoon-site/site/news/index.html Index: index.html === RCS file: /home/cvs/cocoon-site/site/news/index.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- index.html25 May 2004 12:53:51 - 1.17 +++ index.html9 Jun 2004 20:29:10 - 1.18 @@ -239,7 +239,7 @@ /tr tr td colspan=2 bgcolor=#CFDCED class=copyright align=centerfont size=2 face=Arial, Helvetica, Sans-SerifCopyright copy; - 2003nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- + 2003-2004nbsp;The Apache Software Foundation. All rights reserved.script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // --/script/font/td /tr
cvs commit: cocoon-2.1/legal pluto-20040310.jar.license.txt
joerg 2004/06/07 13:23:39 Removed: src/blocks/portal/lib pluto-20040310.jar legalpluto-20040310.jar.license.txt Log: removed the old pluto jar
cvs commit: cocoon-2.1 blocks.properties gump.xml
joerg 2004/06/07 13:27:18 Modified:.blocks.properties gump.xml Log: tour block depends on slop block (thanks to Jorg Heymans) Revision ChangesPath 1.81 +2 -1 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- blocks.properties 7 Jun 2004 01:04:18 - 1.80 +++ blocks.properties 7 Jun 2004 20:27:18 - 1.81 @@ -140,10 +140,11 @@ #include.block.serializers=false #-[dependency]: slide depends on jms, repository. #include.block.slide=false +#-[dependency]: slop is needed by tour. #include.block.slop=false #include.block.stx=false #include.block.taglib=false -#-[dependency]: tour depends on batik, fop, forms. +#-[dependency]: tour depends on batik, fop, forms, slop. #include.block.tour=false #-[dependency]: webdav depends on repository. #include.block.webdav=false 1.161 +2 -1 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- gump.xml 7 Jun 2004 01:04:18 - 1.160 +++ gump.xml 7 Jun 2004 20:27:18 - 1.161 @@ -1148,6 +1148,7 @@ depend project=cocoon-block-batik/ depend project=cocoon-block-fop/ depend project=cocoon-block-forms/ +depend project=cocoon-block-slop/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
cvs commit: cocoon-site/src/documentation/content/xdocs/link livesites-2.0.xml
joerg 2004/06/07 16:51:58 Modified:src/documentation/content/xdocs/link livesites-2.0.xml Log: bethe1.com moved to Cocoon 2.1 Revision ChangesPath 1.17 +0 -2 cocoon-site/src/documentation/content/xdocs/link/livesites-2.0.xml Index: livesites-2.0.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.0.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- livesites-2.0.xml 23 Feb 2004 22:26:14 - 1.16 +++ livesites-2.0.xml 7 Jun 2004 23:51:58 - 1.17 @@ -85,8 +85,6 @@ li!-- 3 Cocoon guys -- link href=http://outerthought.org/;Outerthought/link/li lilink href=http://www.g-ne.de/;G-NE group for net-intelligence GmbH/link/li - li!-- /cocoon/ in the URL -- - link href=http://www.bethe1.com/;Bethel/link - the employment specialist in fashion, beauty and retail/li li!-- I know it :-) -- link href=http://www.lofex.de/;LOcal Food EXpress/link/li li!-- /cocoon/ in the URL --
cvs commit: cocoon-site/src/documentation/content/xdocs/link livesites-2.1.xml
joerg 2004/06/07 16:55:08 Modified:src/documentation/content/xdocs/link livesites-2.1.xml Log: merged some of the groups, added some sites Revision ChangesPath 1.26 +18 -29 cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml Index: livesites-2.1.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- livesites-2.1.xml 15 May 2004 15:56:45 - 1.25 +++ livesites-2.1.xml 7 Jun 2004 23:55:08 - 1.26 @@ -16,18 +16,27 @@ Here are some web sites that are proudly powered by Cocoon 2.1 (only ordered by Cocoon version): /p + s2 title=Cocoon 2.1.5 +ul + lilink href=http://www.vnunet.com/;vnunet.com/link - UK technology, news, reviews and downloads/li + lilink href=http://www.knowlex.org/;KnowLex/link - provides additional services (PDF, Lucene search, content-based ads) to the contents of Wikipedia (German)/li +/ul + /s2 s2 title=Cocoon 2.1.4 ul lilink href=http://www.olympic-plaza.com.ua/;Olympic Plaza Megamall, Kiev, Ukraine/link (English, Russian)/li lilink href=http://commerce.wi.gov/housing/;Wisconsin Department of Commerce, Bureau of Housing/link/li lilink href=http://www.xmlmill.com/;XMLMill/link - High volume xml-xsl to PDF Generation by Pecunia Data Systems/li lilink href=http://www.scriptorium.ro/;Scriptorium/link - digital library project (Romanian, index page also in English and French)/li - lilink href=http://www.knowlex.org/;KnowLex/link - provides additional services (PDF, Lucene search, content-based ads) to the contents of Wikipedia (German)/li lilink href=http://www.conficio.com/;Conficio/link - publisher of streaming multimedia format Plan-B for software application demonstration (offline generated)/li + lilink href=http://www.grumpykitty.com/;Grumpy Kitty/link (offline generated)/li + lilink href=http://www.starline-net.de;StarLine Webhosting (German)/link/li + lilink href=http://www.bethe1.com/;Bethe1/link - The employment specialist in fashion, beauty and retail (French, English, Japanese)/li !--li link href=http://www.edoc.mpg.de/;eDoc Server/link - document management system of the German research organisation Max Planck Society /li-- + lilink href=http://www.ormaz.it;Ormaz s.r.l./link/li /ul /s2 s2 title=Cocoon 2.1.3 @@ -38,21 +47,17 @@ lilink href=http://www.xml-dev.com/blog/#88;Linux Documentation Project/link/li lilink href=http://www.juwimm.com/;Juwi MacMillan Crossmedia Healthcare Communications/link/li lilink href=http://www.medical-guide.net/;Medical Guide/link - Medical Center of Clinic Itzehoe (German)/li + lilink href=http://www.uniklinik-duesseldorf.de;Düsseldorf University Hospital/link/li /ul /s2 s2 title=Cocoon 2.1.2 ul lilink href=http://www.mammakarzinom.de;Disease Management Mammakarzinom/link/li - lilink href=http://www.uniklinik-duesseldorf.de;Düsseldorf University Hospital/link/li lilink href=http://www.cml-online.de/;Chronic Myeloid Leukemia/link/li lilink href=http://www.opera-hotel.com/;Ukrainian Opera Hotel/link/li lilink href=http://www.sledopyt.com.ua/;Sledopyt/link - Ukrainian marketing, advertising and brand consulting company /li -/ul - /s2 - s2 title=Cocoon 2.1.2-dev -ul lilink href=http://www.orixo.com/;Orixo/link - the XML business alliance/li lilink href=http://www.duitslandweb.nl/;Duitsland Web/link/li /ul @@ -61,34 +66,27 @@ ul lilink href=http://cde.berkeley.edu/;Center for Document Engineering, University of California, Berkeley/link/li lilink href=https://webportal.ameripath.com/;Ameripath, Inc./link - Physician WebPortal/li + !-- time out 2004-05-21 -- lilink href=http://www.premier-hotels.com.ua/;Ukrainian Premier Hotels/link/li -/ul - /s2 - s2 title=Cocoon 2.1.1-dev -ul lilink href=http://www.adolos.com/;Adolos Consultancy/link/li lilink href=http://www.cueandreview.org.uk/;Cue and Review Recording Services/link/li /ul /s2 s2 title=Cocoon 2.1 ul - lilink href=http://www.starline-net.de;StarLine Webhosting (Germany)/link/li - lilink href=http://www.world-stay.com/;World Stay/link - multilingual, worldwide hotel booking system/li - lilink href=http://www.eu-healthmarket.com/;RynekMedyczny.pl/link - multilingual health care institution portal/li - lilink href=http://www.frontage.jp/;Frontpage Inc./link - The branding agency, Tokyo (Japanese, English)/li + lilink href=http://www.world
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/src/blocks/forms/samples/resources forms-field-styling.xsl
joerg 2004/06/08 13:39:24
Modified:src/blocks/forms/samples/resources forms-field-styling.xsl
Log:
collect the logic for labels at one template
Revision ChangesPath
1.11 +24 -14
cocoon-2.1/src/blocks/forms/samples/resources/forms-field-styling.xsl
Index: forms-field-styling.xsl
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-field-styling.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- forms-field-styling.xsl 27 May 2004 23:20:22 - 1.10
+++ forms-field-styling.xsl 8 Jun 2004 20:39:24 - 1.11
@@ -153,7 +153,9 @@
/input
/td
td
-label for={generate-id()}xsl:copy-of
select=fi:label/node()//label
+xsl:apply-templates select=. mode=label
+ xsl:with-param name=id select=generate-id()/
+/xsl:apply-templates
/td
xsl:if test=position() = 1
td rowspan={count(../fi:item)}
@@ -173,7 +175,9 @@
/xsl:if
xsl:apply-templates select=../.. mode=styling/
/input
-label for={generate-id()}xsl:copy-of
select=fi:label/node()//label
+xsl:apply-templates select=. mode=label
+ xsl:with-param name=id select=generate-id()/
+/xsl:apply-templates
/xsl:for-each
/span
xsl:apply-templates select=. mode=common/
@@ -245,7 +249,8 @@
| Labels for form elements.
+--
xsl:template match=fi:* mode=label
-label for=[EMAIL PROTECTED] title={fi:hint}
+xsl:param name=id select=@id/
+label for={$id} title={fi:hint}
xsl:copy-of select=fi:label/node()/
/label
/xsl:template
@@ -253,7 +258,7 @@
!--+
| Labels for pure outputs must not contain label/ as there is no
element to point to.
+--
- xsl:template match=fi:output | fi:field[fi:styling/@type='output']
mode=label
+ xsl:template match=fi:output | fi:field[fi:styling/@type='output'] |
fi:messages mode=label
xsl:copy-of select=fi:label/node()/
/xsl:template
@@ -320,7 +325,9 @@
xsl:attribute name=checkedchecked/xsl:attribute
/xsl:if
/input
-label for={generate-id()}xsl:copy-of
select=fi:label/node()//label
+xsl:apply-templates select=. mode=label
+ xsl:with-param name=id select=generate-id()/
+/xsl:apply-templates
br/
/xsl:for-each
/span
@@ -442,12 +449,12 @@
td
xsl:apply-templates select=./
xsl:text /xsl:text
-xsl:copy-of select=fi:label/
+xsl:apply-templates select=. mode=label/
/td
/xsl:when
xsl:otherwise
td
-xsl:copy-of select=fi:label/
+xsl:apply-templates select=. mode=label/
/td
td
xsl:apply-templates select=./
@@ -468,7 +475,7 @@
xsl:template match=fi:messages
xsl:if test=fi:message
- xsl:copy-of select=fi:label/node()/:
+ xsl:apply-templates select=. mode=label/:
ul
xsl:for-each select=fi:message
lixsl:apply-templates//li
@@ -498,14 +505,17 @@
/xsl:otherwise
/xsl:choose
/xsl:variable
-xsl:variable name=frm select=ancestor::fi:form-template/
-xsl:if test=$frm and $frm//fi:validation-message
+xsl:variable name=messages
select=ancestor::fi:form-template//fi:validation-message/
+xsl:if test=$messages
xsl:copy-of select=$header/
ul
-xsl:for-each select=$frm//fi:validation-message
+xsl:for-each select=$messages
li class=forms-validation-error
-xsl:if test=../fi:label
- xsl:value-of select=../fi:label/xsl:text: /xsl:text
+xsl:variable name=label
+ xsl:apply-templates select=.. mode=label/
+/xsl:variable
+xsl:if test=$label
+ xsl:copy-of select=$label/xsl:text: /xsl:text
/xsl:if
xsl:value-of select=./
/li
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/src/documentation/xdocs/userdocs/flow tutor.xml
joerg 2004/05/27 16:05:09
Modified:src/documentation/xdocs/userdocs/flow tutor.xml
Log:
cocoon.continuation.id = continuation.id (thanks to Makoto Satoh)
Revision ChangesPath
1.12 +3 -3
cocoon-2.1/src/documentation/xdocs/userdocs/flow/tutor.xml
Index: tutor.xml
===
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/tutor.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tutor.xml 6 Mar 2004 02:25:54 - 1.11
+++ tutor.xml 27 May 2004 23:05:09 - 1.12
@@ -129,7 +129,7 @@
h1Guess the Number Between 1 and 10/h1
h2${hint}/h2
h3You've guessed ${guesses} times./h3
- form method=post action=${cocoon.continuation.id}.kont
+ form method=post action=${continuation.id}.kont
input type=text name=guess/
input type=submit/
/form
@@ -261,10 +261,10 @@
player submits the guess:
/p
source![CDATA[
-form method=post action=${cocoon.continuation.id}.kont
+form method=post action=${continuation.id}.kont
]]/source
p
-Here, ${cocoon.continuation.id} is resolved to a unique identifier
which points
+Here, ${continuation.id} is resolved to a unique identifier which
points
to the current continuation. One can think of this somewhat of a
session ID.
/p
p
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/modules/input AbstractMetaModule.java
joerg 2004/05/25 18:31:06
Modified:src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common
LanguageSetImpl.java
src/blocks/woody/java/org/apache/cocoon/woody/transformation
EffectWidgetReplacingPipe.java
src/java/org/apache/cocoon/environment/wrapper
MutableEnvironmentFacade.java
EnvironmentWrapper.java
src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom
AO_FOM_JavaScriptInterpreter.java
src/test/org/apache/cocoon/environment/mock
MockEnvironment.java
src/blocks/cron/java/org/apache/cocoon/environment/background
BackgroundEnvironment.java
src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
src/java/org/apache/cocoon/environment/internal
EnvironmentHelper.java
src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
src/java/org/apache/cocoon/components/container
CocoonComponentManager.java
src/blocks/portal/java/org/apache/cocoon/environment/portlet
PortletEnvironment.java
src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl
DelayRefresher.java
src/blocks/forms/java/org/apache/cocoon/forms/binding
RepeaterJXPathBinding.java
src/java/org/apache/cocoon Processor.java
src/blocks/forms/java/org/apache/cocoon/forms/transformation
EffectWidgetReplacingPipe.java
src/java/org/apache/cocoon/components/modules/input
AbstractMetaModule.java
Log:
clean up: imports, javadoc errors, unnecessary casts
Revision ChangesPath
1.4 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java
Index: LanguageSetImpl.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LanguageSetImpl.java 5 Mar 2004 13:02:15 - 1.3
+++ LanguageSetImpl.java 26 May 2004 01:31:05 - 1.4
@@ -61,7 +61,7 @@
{
LanguageImpl lang = new LanguageImpl(locale, bundle, title,
shortTitle, castorKeywords);
-return(Language)lang;
+return lang;
}
/* never used
1.13 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java
Index: EffectWidgetReplacingPipe.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- EffectWidgetReplacingPipe.java9 Mar 2004 13:54:12 - 1.12
+++ EffectWidgetReplacingPipe.java26 May 2004 01:31:06 - 1.13
@@ -65,7 +65,7 @@
* Form location attribute on codewt:form-template/code element,
containing
* JXPath expression which should result in Form object.
*
- * @see WoodyPipelineConfig#findForm
+ * @see WoodyPipelineConfig#findForm(String)
*/
private static final String LOCATION = location;
1.11 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java
Index: MutableEnvironmentFacade.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MutableEnvironmentFacade.java 25 May 2004 07:28:25 - 1.10
+++ MutableEnvironmentFacade.java 26 May 2004 01:31:06 - 1.11
@@ -24,7 +24,7 @@
/**
* Enviroment facade, whose delegate object can be changed. This class is
required to handle internal redirects
- * in sitemap sources (cocoon:). This is because [EMAIL PROTECTED]
org.apache.cocoon.components.source.SitemapSource} keeps
+ * in sitemap sources (cocoon:). This is because [EMAIL PROTECTED]
org.apache.cocoon.components.source.impl.SitemapSource} keeps
* the environment in which the internal request should be processed. But
internal redirects create a new
* processing environment and there's no way to change the one held by the
codeSitemapSource/code. So
cvs commit: cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/transformation SendMailTransformer.java
joerg 2004/05/25 18:46:53 Modified:src/blocks/mail/java/org/apache/cocoon/mail/transformation SendMailTransformer.java Log: fixed javadoc error Revision ChangesPath 1.11 +2 -2 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java Index: SendMailTransformer.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/transformation/SendMailTransformer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SendMailTransformer.java 6 Mar 2004 05:09:57 - 1.10 +++ SendMailTransformer.java 26 May 2004 01:46:53 - 1.11 @@ -474,7 +474,7 @@ } /** - * @link http://java.sun.com/products/javamail/1.3/docs/javadocs/com/sun/mail/smtp/package-summary.html + * a href=http://java.sun.com/products/javamail/1.3/docs/javadocs/com/sun/mail/smtp/package-summary.html;Java Mail API/a * @throws Exception */ private void sendMail(Vector newAddresses, Transport trans)
cvs commit: cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components PortalManagerImpl.java
joerg 2004/05/25 18:55:30
Modified:
src/blocks/repository/java/org/apache/cocoon/components/source/impl
RepositorySourceFactory.java
src/java/org/apache/cocoon/xml/dom DOMBuilder.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components
PortalManagerImpl.java
Log:
quoting Eclipse: The static field/method xyz from the type
SuperType/Interface should be accessed directly.
Revision ChangesPath
1.8 +2 -2
cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java
Index: RepositorySourceFactory.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RepositorySourceFactory.java 27 Mar 2004 21:49:36 - 1.7
+++ RepositorySourceFactory.java 26 May 2004 01:55:30 - 1.8
@@ -61,9 +61,9 @@
throw new IOException(Resolver service is not available:
+ e.toString());
}
}
-if (m_manager.hasService(SourceDescriptorManager.ROLE)) {
+if (m_manager.hasService(SourceDescriptor.ROLE)) {
try {
-m_descriptor = (SourceDescriptor)
m_manager.lookup(SourceDescriptorManager.ROLE);
+m_descriptor = (SourceDescriptor)
m_manager.lookup(SourceDescriptor.ROLE);
}
catch (ServiceException e) {
// impossible
1.4 +8 -6
cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java
Index: DOMBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMBuilder.java 25 May 2004 14:24:01 - 1.3
+++ DOMBuilder.java 26 May 2004 01:55:30 - 1.4
@@ -15,14 +15,16 @@
*/
package org.apache.cocoon.xml.dom;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.xml.sax.SAXException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
+import org.xml.sax.SAXException;
/**
* The codeDOMBuilder/code is a utility class that will generate a W3C
@@ -35,7 +37,7 @@
extends AbstractXMLPipe {
/** The transformer factory shared by all instances */
-protected static final SAXTransformerFactory factory =
(SAXTransformerFactory)SAXTransformerFactory.newInstance();
+protected static final SAXTransformerFactory factory =
(SAXTransformerFactory)TransformerFactory.newInstance();
/** The listener */
protected Listener listener;
1.7 +100 -100
cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java
Index: PortalManagerImpl.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortalManagerImpl.java19 Mar 2004 14:16:54 - 1.6
+++ PortalManagerImpl.java26 May 2004 01:55:30 - 1.7
@@ -339,7 +339,7 @@
// set the portal-page uri:
StringBuffer buffer = new StringBuffer(requestURI);
buffer.append((requestURI.indexOf('?') == -1 ? '?' : ''))
-.append(PortalManagerImpl.REQ_PARAMETER_PROFILE)
+.append(PortalManager.REQ_PARAMETER_PROFILE)
.append('=')
.append(profileID);
String uri = response.encodeURL(buffer.toString());
@@ -386,14 +386,14 @@
Request request = ContextHelper.getRequest(this.componentContext);
try {
String profileID = global;
-String copletID =
request.getParameter(PortalManagerImpl.REQ_PARAMETER_COPLET);
+String copletID =
request.getParameter(PortalManager.REQ_PARAMETER_COPLET);
SessionContext context = this.getContext(true);
Map configuration = this.getConfiguration();
DocumentFragment copletsFragment =
(DocumentFragment)context.getAttribute(ATTRIBUTE_ADMIN_COPLETS
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap ContinueNodeBuilder.java
joerg 2004/05/25 18:56:28
Modified:src/blocks/mail/java/org/apache/cocoon/mail
MailCommandBuilder.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
ContinueNodeBuilder.java
Log:
no need for instanceof tests and casts as those classes already implement te
according interfaces
Revision ChangesPath
1.5 +3 -5
cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java
Index: MailCommandBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailCommandBuilder.java 5 Mar 2004 13:02:00 - 1.4
+++ MailCommandBuilder.java 26 May 2004 01:56:28 - 1.5
@@ -17,9 +17,9 @@
import java.util.HashMap;
import java.util.Map;
+
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.cocoon.mail.command.AbstractMailCommand;
/**
@@ -66,9 +66,7 @@
if (clazz != null) {
ama = (AbstractMailCommand) clazz.newInstance();
// enable logging of the mail command
-if (ama instanceof LogEnabled) {
-((LogEnabled) ama).enableLogging(getLogger());
-}
+ama.enableLogging(getLogger());
// contextualize the mail command
if (ama instanceof Contextualizable) {
((Contextualizable) ama).contextualize(mailContext);
1.4 +3 -4
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNodeBuilder.java
Index: ContinueNodeBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNodeBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContinueNodeBuilder.java 5 Mar 2004 13:02:52 - 1.3
+++ ContinueNodeBuilder.java 26 May 2004 01:56:28 - 1.4
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
@@ -39,8 +38,8 @@
this.node = new ContinueNode(contId);
this.treeBuilder.setupNode(this.node, config);
-if (node instanceof Configurable)
- ((Configurable)this.node).configure(config);
+
+this.node.configure(config);
return this.node;
}
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3 Form.js
joerg 2004/05/19 13:56:16
Modified:src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3
Form.js
Log:
fixed variable assignment (bug 29103, thanks to Mark Johnson)
Revision ChangesPath
1.4 +1 -1
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/Form.js
Index: Form.js
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/Form.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Form.js 7 May 2004 20:54:21 - 1.3
+++ Form.js 19 May 2004 20:56:16 - 1.4
@@ -136,7 +136,7 @@
var name;
var object;
if (arguments.length == 2) {
-name == arg1;
+name = arg1;
object = arg2;
} else {
name = default;
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript Form.js
joerg 2004/05/18 08:32:27
Modified:src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript
Form.js
Log:
fixed v1 Form.js:
- getChild(id) was missing
- lookupWidget(undefined) makes no sense (in contrary to the old
getWidget(name), where name could be undefined)
Revision ChangesPath
1.13 +11 -10
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js
Index: Form.js
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Form.js 11 May 2004 12:55:53 - 1.12
+++ Form.js 18 May 2004 15:32:27 - 1.13
@@ -65,16 +65,17 @@
}
/**
- * Get a Widget (the java object) from the form.
- * If codename/code is undefined, the form widget itself is returned.
- * Otherwise, the form's child widget of name codename/code is returned.
+ * Get a child Widget (the java object) from the form via its
codeid/code.
*/
-Form.prototype.lookupWidget = function(name) {
-if (name == undefined) {
-return this.form;
-} else {
-return this.form.lookupWidget(name);
-}
+Form.prototype.getChild = function(id) {
+return this.form.getChild(id);
+}
+
+/**
+ * Get a Widget (the java object) from the form via its codepath/code.
+ */
+Form.prototype.lookupWidget = function(path) {
+return this.form.lookupWidget(path);
}
/**
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-site/src/documentation/content/xdocs/link livesites-2.1.xml
joerg 2004/05/15 08:56:45 Modified:src/documentation/content/xdocs/link livesites-2.1.xml Log: conficio.com added Revision ChangesPath 1.25 +2 -1 cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml Index: livesites-2.1.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/livesites-2.1.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- livesites-2.1.xml 24 Apr 2004 14:40:09 - 1.24 +++ livesites-2.1.xml 15 May 2004 15:56:45 - 1.25 @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=UTF-8? +?xml version=1.0 encoding=UTF-8? !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.0//EN document-v10.dtd document @@ -23,6 +23,7 @@ lilink href=http://www.xmlmill.com/;XMLMill/link - High volume xml-xsl to PDF Generation by Pecunia Data Systems/li lilink href=http://www.scriptorium.ro/;Scriptorium/link - digital library project (Romanian, index page also in English and French)/li lilink href=http://www.knowlex.org/;KnowLex/link - provides additional services (PDF, Lucene search, content-based ads) to the contents of Wikipedia (German)/li + lilink href=http://www.conficio.com/;Conficio/link - publisher of streaming multimedia format Plan-B for software application demonstration (offline generated)/li !--li link href=http://www.edoc.mpg.de/;eDoc Server/link - document management system of the German research organisation Max Planck Society
cvs commit: cocoon-2.1 blocks.properties
joerg 2004/05/13 05:35:30 Modified:.blocks.properties Log: fixed order Revision ChangesPath 1.77 +1 -1 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- blocks.properties 11 May 2004 06:52:28 - 1.76 +++ blocks.properties 13 May 2004 12:35:29 - 1.77 @@ -143,9 +143,9 @@ #include.block.slide=false #include.block.slop=false #include.block.stx=false +#include.block.taglib=false #-[dependency]: tour depends on batik, fop, forms. #include.block.tour=false -#include.block.taglib=false #-[dependency]: webdav depends on repository. #include.block.webdav=false
cvs commit: cocoon-2.1/tools/targets ide-build.xml
joerg 2004/05/13 06:26:06
Modified:tools/targets ide-build.xml
Log:
the xml libs are no longer copied to tools/lib
Revision ChangesPath
1.9 +0 -3 cocoon-2.1/tools/targets/ide-build.xml
Index: ide-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/targets/ide-build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ide-build.xml 8 May 2004 02:45:08 - 1.8
+++ ide-build.xml 13 May 2004 13:26:06 - 1.9
@@ -84,9 +84,6 @@
!-- tools libs --
fileset dir=${tools}/lib
include name=*.jar/
-exclude name=xalan*.jar/
-exclude name=xml-api*.jar/
-exclude name=xerces*.jar/
/fileset
/path
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources forms-calendar-styling.xsl
joerg 2004/05/13 10:55:22 Modified:src/blocks/forms/samples/resources forms-calendar-styling.xsl Log: fixed template selection for date styling Revision ChangesPath 1.7 +8 -4 cocoon-2.1/src/blocks/forms/samples/resources/forms-calendar-styling.xsl Index: forms-calendar-styling.xsl === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-calendar-styling.xsl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- forms-calendar-styling.xsl14 Apr 2004 19:32:47 - 1.6 +++ forms-calendar-styling.xsl13 May 2004 17:55:22 - 1.7 @@ -44,15 +44,19 @@ /xsl:template !--+ - | fi:field with @type 'date' : use CalendarPopup + | fi:field with either + | - explicit styling @type = 'date' or + | - implicit if no styling @type is specified, + | but datatype @type = 'date', selection lists must be excluded here +-- - xsl:template match=fi:field[fi:datatype/@type='date'][not(fi:selection-list)] + xsl:template match=fi:field[fi:styling/@type='date'] | + fi:field[not(fi:styling/@type)][fi:[EMAIL PROTECTED]'date']][not(fi:selection-list)] xsl:variable name=id select=generate-id()/ xsl:variable name=format xsl:choose -xsl:when test=fi:datatype/fi:convertor/@pattern - xsl:value-of select=fi:datatype/fi:convertor/@pattern/ +xsl:when test=fi:[EMAIL PROTECTED]'date']/fi:convertor/@pattern + xsl:value-of select=fi:[EMAIL PROTECTED]'date']/fi:convertor/@pattern/ /xsl:when xsl:otherwise-MM-dd/xsl:otherwise /xsl:choose
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet CocoonServlet.java
joerg 2004/05/11 10:20:41
Modified:.status.xml
src/java/org/apache/cocoon/servlet CocoonServlet.java
Log:
Extended CocoonServlet to allow any
org.apache.avalon.excalibur.logger.LoggerManager to be used (bug 28860, thanks
to Ralph Goers).
Revision ChangesPath
1.324 +7 -2 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- status.xml11 May 2004 12:57:44 - 1.323
+++ status.xml11 May 2004 17:20:40 - 1.324
@@ -211,7 +211,12 @@
changes
release version=@version@ date=@date@
- action dev=MPO type=update
+ action dev=JH type=add fixes-bug=28860 due-to=Ralph Goers
due-to-email=[EMAIL PROTECTED]
+ Extended CocoonServlet to allow any
+ link
href=http://avalon.apache.org/excalibur/api/org/apache/avalon/excalibur/logger/LoggerManager.html;org.apache.avalon.excalibur.logger.LoggerManager/link
+ to be used.
+ /action
+ action dev=MPO type=update
Deprectated 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()
1.28 +33 -13
cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CocoonServlet.java4 May 2004 14:11:16 - 1.27
+++ CocoonServlet.java11 May 2004 17:20:40 - 1.28
@@ -51,6 +51,7 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.DefaultContext;
@@ -779,14 +780,15 @@
defaultHierarchy.setDefaultLogTarget(servTarget);
defaultHierarchy.setDefaultPriority(logPriority);
final Logger logger = new
LogKitLogger(Hierarchy.getDefaultHierarchy().getLoggerFor());
-
+final String loggerManagerClass =
+this.getInitParameter(logger-class,
LogKitLoggerManager.class.getName());
+
// the log4j support requires currently that the log4j system is
already configured elsewhere
-final boolean isLog4JLogger =
log4j.equals(this.getInitParameter(logger-type, logkit));
-
-final LoggerManager logKitLoggerManager = (isLog4JLogger ?
(LoggerManager)new Log4JLoggerManager()
- : new
LogKitLoggerManager(defaultHierarchy));
-ContainerUtil.enableLogging(logKitLoggerManager, logger);
-
+
+final LoggerManager loggerManager =
+newLoggerManager(loggerManagerClass, defaultHierarchy);
+ContainerUtil.enableLogging(loggerManager, logger);
+
final DefaultContext subcontext = new
DefaultContext(this.appContext);
subcontext.put(servlet-context, this.servletContext);
if (this.servletContextPath == null) {
@@ -801,13 +803,13 @@
}
try {
-ContainerUtil.contextualize(logKitLoggerManager, subcontext);
-this.loggerManager = logKitLoggerManager;
+ContainerUtil.contextualize(loggerManager, subcontext);
+this.loggerManager = loggerManager;
-if ( !isLog4JLogger ) {
+if (loggerManager instanceof Configurable) {
//Configure the logkit management
String logkitConfig = getInitParameter(logkit-config,
/WEB-INF/logkit.xconf);
-
+
// test if this is a qualified url
InputStream is = null;
if ( logkitConfig.indexOf(':') == -1) {
@@ -819,13 +821,31 @@
}
final DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
final Configuration conf = builder.build(is);
-ContainerUtil.configure(logKitLoggerManager, conf);
+ContainerUtil.configure(loggerManager, conf);
}
+ContainerUtil.initialize(loggerManager);
+
} catch (Exception e) {
errorHandler.error(Could not set up Cocoon Logger
cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/transformers cinclude-transformer.xml
joerg 2004/05/11 10:25:26 Modified:src/documentation/xdocs/userdocs/transformers cinclude-transformer.xml Log: fixed element names/well-formedness in sample code (thanks to Dave Brondsema) Revision ChangesPath 1.7 +2 -2 cocoon-2.1/src/documentation/xdocs/userdocs/transformers/cinclude-transformer.xml Index: cinclude-transformer.xml === RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/transformers/cinclude-transformer.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cinclude-transformer.xml 8 May 2004 08:57:59 - 1.6 +++ cinclude-transformer.xml 11 May 2004 17:25:26 - 1.7 @@ -179,8 +179,8 @@ lt;/cinclude:configurationgt; lt;cinclude:parametersgt; lt;cinclude:parametergt; - lt;cinclude:namegt;messagelt;/session:namegt; - lt;cinclude:valuegt;Hi therelt;/session:valuegt; + lt;cinclude:namegt;messagelt;/cinclude:namegt; + lt;cinclude:valuegt;Hi therelt;/cinclude:valuegt; lt;/cinclude:parametergt; lt;cinclude:parametergt; lt;cinclude:namegt;_Processlt;/cinclude:namegt;
cvs commit: cocoon-2.1/src/blocks/woody/samples/resources woody-calendar.css mattkruse-lib.js woody.css woody-lib.js
joerg 2004/05/11 15:22:32 Modified:src/blocks/woody/samples/resources woody-calendar.css mattkruse-lib.js woody.css woody-lib.js Log: *** keyword substitution change *** Revision ChangesPath 1.7 +92 -92 cocoon-2.1/src/blocks/woody/samples/resources/woody-calendar.css http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/woody-calendar.css.diff?r1=1.6r2=1.7 1.7 +124 -124 cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib.js.diff?r1=1.6r2=1.7 1.12 +75 -75cocoon-2.1/src/blocks/woody/samples/resources/woody.css http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/woody.css.diff?r1=1.11r2=1.12 1.6 +161 -161 cocoon-2.1/src/blocks/woody/samples/resources/woody-lib.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/woody-lib.js.diff?r1=1.5r2=1.6
cvs commit: cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/FullPage full-page.js
joerg 2004/05/11 15:24:38 Modified:src/blocks/woody/samples/resources/htmlarea/lang ee.js fi.js ja-euc.js he.js si.js en.js gb.js ru.js fr.js ja-sjis.js vn.js da.js cz.js lt.js pt_br.js lv.js es.js nb.js no.js de.js hu.js ro.js nl.js el.js ja-jis.js se.js pl.js b5.js ja-utf8.js it.js src/blocks/woody/samples/resources/htmlarea/plugins/SpellChecker spell-check-ui.js spell-check-style.css spell-check-logic.cgi spell-checker.js src/blocks/woody/samples/resources/htmlarea/plugins/SpellChecker/lang ro.js de.js da.js hu.js it.js cz.js en.js src/blocks/woody/samples/resources/htmlarea/plugins/TableOperations/lang en.js ro.js hu.js fi.js cz.js da.js de.js nl.js no.js it.js el.js src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu 1.pl menu.css context-menu.js src/blocks/woody/samples/resources/htmlarea/plugins/CSS css.js src/blocks/woody/samples/resources/htmlarea/plugins/FullPage/lang ro.js en.js src/blocks/woody/samples/resources/htmlarea/plugins/CSS/lang en.js src/blocks/woody/samples/resources/htmlarea/plugins/TableOperations table-operations.js src/blocks/woody/samples/resources/htmlarea/plugins/FullPage full-page.js Log: *** keyword substitution change *** Revision ChangesPath 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/ee.js Index: ee.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/ee.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/fi.js Index: fi.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/fi.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/ja-euc.js Index: ja-euc.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/ja-euc.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 1.8 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/he.js Index: he.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/he.js,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 1.8 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/si.js Index: si.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/si.js,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/en.js Index: en.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/en.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/gb.js Index: gb.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/gb.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 1.8 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/ru.js Index: ru.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/ru.js,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/fr.js Index: fr.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/fr.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/lang/ja
cvs commit: cocoon-2.1/src/blocks/woody/samples/aggregate example.js
joerg 2004/05/11 15:25:32 Modified:src/blocks/woody/samples/forms form1_success.xsp countryselector_success.xsp carselector_success.xsp htmlarea_success.jx form_model_gui_success.xsp src/blocks/woody/samples/flow registration.js bindings.js binding_example.js customvalidationdemo.js form_model_gui.js upload_example.js htmlarea.js woody_flow_example.js src/blocks/woody/samples/aggregate example.js Log: *** keyword substitution change *** Revision ChangesPath 1.6 +45 -45 cocoon-2.1/src/blocks/woody/samples/forms/form1_success.xsp Index: form1_success.xsp === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/forms/form1_success.xsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- form1_success.xsp 9 Mar 2004 13:53:51 - 1.5 +++ form1_success.xsp 11 May 2004 22:25:31 - 1.6 @@ -1,45 +1,45 @@ -?xml version=1.0? -!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the License); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- -xsp:page language=java - xmlns:xsp=http://apache.org/xsp; - - xsp:structure -xsp:includeorg.apache.cocoon.woody.formmodel.*/xsp:include - /xsp:structure - - page -titleSample form result/title -content - xsp:logic -// get reference to form and some of the widgets on it -Form form = (Form)request.getAttribute(form1); -Field field = (Field)form.getWidget(email); -BooleanField booleanField = (BooleanField)form.getWidget(somebool); -Field field2 = (Field)((Repeater)form.getWidget(contacts)).getWidget(1, firstname); - /xsp:logic - - email has the following value: - xsp:exprfield.getValue()/xsp:expr - br/ - Second person has this firstname: - xsp:exprfield2.getValue()/xsp:expr - br/ - The value of the checkbox is: - xsp:exprbooleanField.getValue()/xsp:expr -/content - /page -/xsp:page +?xml version=1.0? +!-- + Copyright 1999-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +xsp:page language=java + xmlns:xsp=http://apache.org/xsp; + + xsp:structure +xsp:includeorg.apache.cocoon.woody.formmodel.*/xsp:include + /xsp:structure + + page +titleSample form result/title +content + xsp:logic +// get reference to form and some of the widgets on it +Form form = (Form)request.getAttribute(form1); +Field field = (Field)form.getWidget(email); +BooleanField booleanField = (BooleanField)form.getWidget(somebool); +Field field2 = (Field)((Repeater)form.getWidget(contacts)).getWidget(1, firstname); + /xsp:logic + + email has the following value: + xsp:exprfield.getValue()/xsp:expr + br/ + Second person has this firstname: + xsp:exprfield2.getValue()/xsp:expr + br/ + The value of the checkbox is: + xsp:exprbooleanField.getValue()/xsp:expr +/content + /page +/xsp:page 1.5 +38 -38 cocoon-2.1/src/blocks/woody/samples/forms/countryselector_success.xsp Index: countryselector_success.xsp === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/forms/countryselector_success.xsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- countryselector_success.xsp 9 Mar 2004 13:53:50 - 1.4 +++ countryselector_success.xsp 11 May 2004 22:25:31 - 1.5 @@ -1,38 +1,38 @@ -?xml version=1.0? -!-- - Copyright 1999-2004 The Apache
cvs commit: cocoon-2.1/src/blocks/woody/samples/forms/binding done.jx
joerg 2004/05/11 15:26:20 Modified:src/blocks/woody/conf woody-form.xroles woody-selection-lists.xroles woody-cache.xroles woody-datatype.xroles woody-expression.xroles woody-binding.xroles woody-validators.xroles src/blocks/woody/samples/forms/binding done.jx Log: *** keyword substitution change *** Revision ChangesPath 1.6 +23 -23cocoon-2.1/src/blocks/woody/conf/woody-form.xroles Index: woody-form.xroles === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-form.xroles,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- woody-form.xroles 9 Mar 2004 13:54:11 - 1.5 +++ woody-form.xroles 11 May 2004 22:26:20 - 1.6 @@ -1,23 +1,23 @@ -?xml version=1.0? -!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the License); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- - -xroles xpath=/role-list unless=[EMAIL PROTECTED]'org.apache.cocoon.woody.FormManager'] - - role name=org.apache.cocoon.woody.FormManager -shorthand=woody-formmanager -default-class=org.apache.cocoon.woody.DefaultFormManager/ -/xroles +?xml version=1.0? +!-- + Copyright 1999-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- + +xroles xpath=/role-list unless=[EMAIL PROTECTED]'org.apache.cocoon.woody.FormManager'] + + role name=org.apache.cocoon.woody.FormManager +shorthand=woody-formmanager +default-class=org.apache.cocoon.woody.DefaultFormManager/ +/xroles 1.5 +23 -23 cocoon-2.1/src/blocks/woody/conf/woody-selection-lists.xroles Index: woody-selection-lists.xroles === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/conf/woody-selection-lists.xroles,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- woody-selection-lists.xroles 9 Mar 2004 13:54:11 - 1.4 +++ woody-selection-lists.xroles 11 May 2004 22:26:20 - 1.5 @@ -1,23 +1,23 @@ -?xml version=1.0? -!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the License); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- - -xroles xpath=/role-list unless=[EMAIL PROTECTED]'org.apache.cocoon.woody.datatype.SelectionListBuilderSelector'] - - role name=org.apache.cocoon.woody.datatype.SelectionListBuilderSelector -shorthand=woody-selection-lists - default-class=org.apache.cocoon.components.ExtendedComponentSelector/ -/xroles +?xml version=1.0? +!-- + Copyright 1999-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- + +xroles xpath
cvs commit: cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popups popup.js
joerg 2004/05/11 15:28:16 Modified:src/blocks/woody/samples/resources/htmlarea dialog.js htmlarea.css ChangeLog popupwin.js htmlarea.js popupdiv.js src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang el.js en.js nl.js de.js src/blocks/woody/samples/resources/htmlarea/popups popup.js Log: *** keyword substitution change *** Revision ChangesPath 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/dialog.js Index: dialog.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/dialog.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/htmlarea.css Index: htmlarea.css === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/htmlarea.css,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.5 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/ChangeLog Index: ChangeLog === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popupwin.js Index: popupwin.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popupwin.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/htmlarea.js Index: htmlarea.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/htmlarea.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popupdiv.js Index: popupdiv.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popupdiv.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/el.js Index: el.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/el.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/en.js Index: en.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/en.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.7 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/nl.js Index: nl.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/nl.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/de.js Index: de.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang/de.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 1.6 +0 -0 cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popups/popup.js Index: popup.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popups/popup.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6
cvs commit: cocoon-2.1/src/blocks/woody/test/org/apache/cocoon/woody/datatype FlowJXPathSelectionListTestCase.xtest EnumSelectionListTestCase.xtest DynamicSelectionListTestCase.xtest
joerg 2004/05/11 15:29:18 Modified:src/blocks/woody/samples/resources/mattkruse-lib AnchorPosition.js OptionTransfer.js date.js CalendarPopup.js selectbox.js PopupWindow.js src/blocks/woody/samples/v2 woody_flow_example.js carselector_success.jx src/blocks/woody/test/org/apache/cocoon/woody/datatype FlowJXPathSelectionListTestCase.xtest EnumSelectionListTestCase.xtest DynamicSelectionListTestCase.xtest Log: *** keyword substitution change *** Revision ChangesPath 1.7 +147 -147 cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/AnchorPosition.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/AnchorPosition.js.diff?r1=1.6r2=1.7 1.7 +187 -187 cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/OptionTransfer.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/OptionTransfer.js.diff?r1=1.6r2=1.7 1.6 +335 -335 cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/date.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/date.js.diff?r1=1.5r2=1.6 1.7 +633 -633 cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/CalendarPopup.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/CalendarPopup.js.diff?r1=1.6r2=1.7 1.7 +315 -315 cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/selectbox.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/selectbox.js.diff?r1=1.6r2=1.7 1.7 +336 -336 cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/PopupWindow.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/resources/mattkruse-lib/PopupWindow.js.diff?r1=1.6r2=1.7 1.11 +227 -227 cocoon-2.1/src/blocks/woody/samples/v2/woody_flow_example.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/v2/woody_flow_example.js.diff?r1=1.10r2=1.11 1.5 +24 -24 cocoon-2.1/src/blocks/woody/samples/v2/carselector_success.jx http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/samples/v2/carselector_success.jx.diff?r1=1.4r2=1.5 1.7 +108 -108 cocoon-2.1/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.xtest http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.xtest.diff?r1=1.6r2=1.7 1.6 +116 -116 cocoon-2.1/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.xtest http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.xtest.diff?r1=1.5r2=1.6 1.7 +116 -116 cocoon-2.1/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.xtest http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.xtest.diff?r1=1.6r2=1.7
cvs commit: cocoon-2.1/src/blocks/woody/samples/resources woody-lib.js woody-advanced-field-styling.xsl
joerg 2004/05/11 15:44:41
Modified:src/blocks/forms/samples/resources forms-lib.js
forms-advanced-field-styling.xsl
src/blocks/woody/samples/resources woody-lib.js
woody-advanced-field-styling.xsl
Log:
fixed submit-on-change for [EMAIL PROTECTED]'double-listbox']
(http://marc.theaimsgroup.com/?t=10841182443r=1w=4)
Revision ChangesPath
1.3 +28 -3
cocoon-2.1/src/blocks/forms/samples/resources/forms-lib.js
Index: forms-lib.js
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-lib.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- forms-lib.js 10 Mar 2004 21:52:00 - 1.2
+++ forms-lib.js 11 May 2004 22:44:41 - 1.3
@@ -83,7 +83,7 @@
* This is required for help popups inside wi:group tabs. The reason is
that CSS positioning
* properties (left and top) on a block with a position: absolute are
actually relative to
* the nearest ancestor that has a position of absolute, relative or
fixed.
- * See http://www.w3.org/TR/CSS21/visudet.html#containing-block-details §4
+ * See http://www.w3.org/TR/CSS21/visudet.html#containing-block-details �4
*/
function forms_moveInBody(element) {
@@ -109,7 +109,7 @@
}
-function forms_createOptionTransfer(id) {
+function forms_createOptionTransfer(id, submitOnChange) {
var result = new OptionTransfer(id + .unselected, id);
result.setAutoSort(true);
// add to onload handlers
@@ -120,6 +120,31 @@
sortSelect(this.left);
sortSelect(this.right);
}
+result.submitOnChange = submitOnChange;
+result.forms_transferLeft = function() {
+this.transferLeft();
+if (this.submitOnChange) {
+forms_submitForm(document.getElementById(this.forms_id));
+}
+}
+result.forms_transferRight = function() {
+this.transferRight();
+if (this.submitOnChange) {
+forms_submitForm(document.getElementById(this.forms_id));
+}
+}
+result.forms_transferAllLeft = function() {
+this.transferAllLeft();
+if (this.submitOnChange) {
+forms_submitForm(document.getElementById(this.forms_id));
+}
+};
+result.forms_transferAllRight = function() {
+this.transferAllRight();
+if (this.submitOnChange) {
+forms_submitForm(document.getElementById(this.forms_id));
+}
+};
forms_onloadHandlers.push(result);
// add to onsubmit handlers
1.6 +9 -7
cocoon-2.1/src/blocks/forms/samples/resources/forms-advanced-field-styling.xsl
Index: forms-advanced-field-styling.xsl
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-advanced-field-styling.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- forms-advanced-field-styling.xsl 6 Apr 2004 21:33:15 - 1.5
+++ forms-advanced-field-styling.xsl 11 May 2004 22:44:41 - 1.6
@@ -103,7 +103,7 @@
td
!-- select for the unselected values --
select id=[EMAIL PROTECTED] name=[EMAIL PROTECTED]
multiple=multiple
-ondblclick=opt{generate-id()}.transferRight()
+ondblclick=opt{generate-id()}.forms_transferRight()
xsl:apply-templates select=. mode=styling/
xsl:for-each select=fi:selection-list/fi:item
xsl:variable name=value select=@value/
@@ -119,19 +119,19 @@
!-- command buttons --
!-- strangely, IE adds an extra blank line if there only a
button on a line. So we surround it with nbsp --
xsl:text#160;/xsl:text
-input type=button value=gt;
onclick=opt{generate-id()}.transferRight()/
+input type=button value=gt;
onclick=opt{generate-id()}.forms_transferRight()/
xsl:text#160;/xsl:text
br/
xsl:text#160;/xsl:text
-input type=button value=gt;gt;
onclick=opt{generate-id()}.transferAllRight()/
+input type=button value=gt;gt;
onclick=opt{generate-id()}.forms_transferAllRight()/
xsl:text#160;/xsl:text
br/
xsl:text#160;/xsl:text
-input type=button value=lt;
onclick=opt{generate-id()}.transferLeft()/
+input type=button value=lt;
onclick=opt{generate-id()}.forms_transferLeft()/
xsl:text#160;/xsl:text
br/
xsl:text#160;/xsl:text
-input type=button value=lt;lt;
onclick=opt{generate-id()}.transferAllLeft
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources forms-lib.js
joerg 2004/05/11 15:50:25
Modified:src/blocks/forms/samples/resources forms-lib.js
Log:
fixed introduced encoding bug (opened file with UTF-8 in jEdit, what it was
not)
Revision ChangesPath
1.4 +2 -2
cocoon-2.1/src/blocks/forms/samples/resources/forms-lib.js
Index: forms-lib.js
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-lib.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- forms-lib.js 11 May 2004 22:44:41 - 1.3
+++ forms-lib.js 11 May 2004 22:50:25 - 1.4
@@ -83,7 +83,7 @@
* This is required for help popups inside wi:group tabs. The reason is
that CSS positioning
* properties (left and top) on a block with a position: absolute are
actually relative to
* the nearest ancestor that has a position of absolute, relative or
fixed.
- * See http://www.w3.org/TR/CSS21/visudet.html#containing-block-details �4
+ * See http://www.w3.org/TR/CSS21/visudet.html#containing-block-details $4
*/
function forms_moveInBody(element) {
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation CastorTransformer.java
joerg 2004/05/07 18:34:06
Modified:src/blocks/scratchpad/java/org/apache/cocoon/transformation
CastorTransformer.java
Log:
formatting (preparation for patch 28334)
Revision ChangesPath
1.8 +23 -25
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/CastorTransformer.java
Index: CastorTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/CastorTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CastorTransformer.java5 Mar 2004 10:07:26 - 1.7
+++ CastorTransformer.java8 May 2004 01:34:06 - 1.8
@@ -103,7 +103,7 @@
/** The map of namespace prefixes. */
private Map prefixMap = new HashMap();
-
+
private Unmarshaller unmarshaller;
private UnmarshalHandler unmarshalHandler;
private ContentHandler unmarshalContentHandler;
@@ -143,18 +143,18 @@
} else if (unmarshalContentHandler != null) {
// check if this marks the end of the unmarshalling
if ((CASTOR_URI.equals(uri)) (CMD_UNMARSHAL.equals(name))) {
-
+
// End marshalling, remove prefixes
Iterator itt = prefixMap.entrySet().iterator();
while ( itt.hasNext() ) {
Map.Entry entry = (Map.Entry) itt.next();
unmarshalContentHandler.endPrefixMapping((String)entry.getKey());
}
-
+
// end document
unmarshalContentHandler.endDocument();
unmarshalContentHandler = null;
-
+
// store the result of the unmarshaller
Object root = unmarshalHandler.getObject();
this.storeBean(objectModel, beanName, beanScope, root);
@@ -184,11 +184,11 @@
private void process (String command, Attributes attr) throws
SAXException {
if (command.equals(CMD_MARSHAL)) {
-
+
String scope = attr.getValue(ATTRIB_SCOPE);
String name = attr.getValue(ATTRIB_NAME);
String mapping = attr.getValue(ATTRIB_MAPPING);
-
+
if (name == null) {
getLogger().error(Attribute to insert not set);
} else {
@@ -197,25 +197,24 @@
} else if (command.equals(CMD_UNMARSHAL)) {
beanScope = attr.getValue(ATTRIB_SCOPE);
beanName = attr.getValue(ATTRIB_NAME);
-
+
if (beanScope == null) {
getLogger().error(Destination for unmarshalled bean not set);
return;
}
-
+
if (beanName == null) {
getLogger().error(Name of unmarshalled bean not set);
return;
}
String mappingpath = attr.getValue(ATTRIB_MAPPING);
-
-
+
// Create the unmarshaller
unmarshaller = new Unmarshaller((Class) null);
// Only set a mapping if one is specified
if (mappingpath != null) {
Mapping mapping
cvs commit: cocoon-2.1/src/samples/org/apache/cocoon SampleRequestListener.java
joerg 2004/05/07 19:19:24
Modified:src/java/org/apache/cocoon Cocoon.java
.status.xml
Added: src/java/org/apache/cocoon RequestListener.java
src/samples/org/apache/cocoon SampleRequestListener.java
Log:
RequestListener hook added, that is called before and after a request is
processed. (thanks to Ralph Goers)
Revision ChangesPath
1.24 +45 -1 cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Cocoon.java 10 Mar 2004 12:58:09 - 1.23
+++ Cocoon.java 8 May 2004 02:19:24 - 1.24
@@ -136,6 +136,9 @@
/** The source resolver */
protected SourceResolver sourceResolver;
+/** An optional Avalon Component that is called before and after
processing all requests. */
+protected RequestListener requestListener;
+
/**
* Creates a new codeCocoon/code instance.
*
@@ -318,6 +321,10 @@
}
this.sourceResolver =
(SourceResolver)this.componentManager.lookup(SourceResolver.ROLE);
+
+if (this.componentManager.hasComponent(RequestListener.ROLE)){
+this.requestListener = (RequestListener)
this.componentManager.lookup(RequestListener.ROLE);
+}
}
/** Dump System Properties */
@@ -480,6 +487,9 @@
this.threads = null;
if ( this.componentManager != null ) {
+ if ( this.requestListener!=null ){
+ this.componentManager.release(this.requestListener);
+ }
this.componentManager.release(this.threadSafeProcessor);
this.threadSafeProcessor = null;
@@ -615,12 +625,38 @@
this.debug(environment, false);
}
+
+if (this.requestListener != null) {
+try {
+requestListener.onRequestStart(environment);
+}
+catch (Exception e) {
+getLogger().error(Error encountered monitoring request
start: + e.getMessage());
+}
+}
+
if (this.threadSafeProcessor != null) {
result = this.threadSafeProcessor.process(environment);
+if (this.requestListener != null) {
+try {
+requestListener.onRequestEnd(environment);
+}
+catch (Exception e) {
+getLogger().error(Error encountered monitoring
request start: + e.getMessage());
+}
+}
} else {
Processor processor =
(Processor)this.componentManager.lookup(Processor.ROLE);
try {
result = processor.process(environment);
+if (this.requestListener != null) {
+try {
+requestListener.onRequestEnd(environment);
+}
+catch (Exception e) {
+getLogger().error(Error encountered monitoring
request start: + e.getMessage());
+}
+}
}
finally {
this.componentManager.release(processor);
@@ -631,6 +667,14 @@
return result;
} catch (Exception any) {
+if (this.requestListener != null) {
+try {
+requestListener.onRequestException(environment, any);
+}
+catch (Exception e) {
+getLogger().error(Error encountered monitoring request
start: + e.getMessage());
+}
+}
// reset response on error
environment.tryResetResponse();
throw any;
1.1
cocoon-2.1/src/java/org/apache/cocoon/RequestListener.java
Index: RequestListener.java
===
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
cvs commit: cocoon-2.1/tools/targets ide-build.xml
joerg 2004/05/07 19:45:08
Modified:tools/targets ide-build.xml
Log:
added the samples directory to the sources
Revision ChangesPath
1.8 +2 -0 cocoon-2.1/tools/targets/ide-build.xml
Index: ide-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/targets/ide-build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ide-build.xml 8 Mar 2004 06:07:15 - 1.7
+++ ide-build.xml 8 May 2004 02:45:08 - 1.8
@@ -47,6 +47,8 @@
path id=srcs
!-- main source dir --
pathelement path=${src}/java/
+ !-- samples source dir --
+ pathelement path=${src}/samples/
!-- deprecated source dir --
pathelement path=${src}/deprecated/java/
!-- test source dir --
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2 Form.js
joerg 2004/05/08 05:13:34 Modified:src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2 Form.js Log: fixing undefined bug part I: var wid = form.getWidget(); wid.email.value = [EMAIL PROTECTED] = wid is no longer undefined, but wid.email is Revision ChangesPath 1.8 +1 -0 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/Form.js Index: Form.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/Form.js,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Form.js 7 May 2004 20:54:21 - 1.7 +++ Form.js 8 May 2004 12:13:34 - 1.8 @@ -44,6 +44,7 @@ form = formMgr.createForm(formDefinition) } this.binding_ = null; +this.form = form; this.formWidget_ = new Widget(form); this.local_ = cocoon.createPageLocal(); this.locale = java.util.Locale.getDefault();
cvs commit: cocoon-2.1 gump.xml
joerg 2004/05/08 07:14:23 Modified:.gump.xml Log: need the junitreport to see what exactly has failed (thanks to Adam R. B. Jack) Revision ChangesPath 1.152 +3 -1 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- gump.xml 8 May 2004 12:39:20 - 1.151 +++ gump.xml 8 May 2004 14:14:23 - 1.152 @@ -99,6 +99,8 @@ javadoc parent=build/cocoon-@@DATE@@/javadocs/ +junitreport nested=build/cocoon-@@DATE@@/test/output/ + nag from=Gump to=dev@cocoon.apache.org regexp pattern=/BUILD FAILED/ subject=Build Failure - Cocoon/ /nag
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/environment/http HttpContext.java
joerg 2004/05/07 10:23:43
Modified:src/java/org/apache/cocoon/environment/http HttpContext.java
Log:
added delegate methods for all methods of ServletContext
(http://marc.theaimsgroup.com/?t=10831043021r=1w=4)
Revision ChangesPath
1.3 +58 -6
cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpContext.java
Index: HttpContext.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpContext.java 5 Mar 2004 13:02:55 - 1.2
+++ HttpContext.java 7 May 2004 17:23:42 - 1.3
@@ -15,14 +15,16 @@
*/
package org.apache.cocoon.environment.http;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.cocoon.environment.Context;
-
-import javax.servlet.ServletContext;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
-import java.io.InputStream;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+
+import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.cocoon.environment.Context;
/**
*
@@ -91,5 +93,55 @@
public String getInitParameter(String name) {
return servletContext.getInitParameter(name);
+}
+
+/*
+ * These methods are not in Cocoon's Context interface, but in the
+ * ServletContext. To use them you have to downcast Cocoon's Context
+ * to this HttpContext until we decide to add them to the Context
+ * interface too.
+ *
+ * The following methods are deprecated since Servlet API 2.0 or 2.1
+ * and will not be implemented here:
+ * - public Servlet getServlet(String name)
+ * - public Enumeration getServletNames()
+ * - public Enumeration getServlets()
+ * - public void log(Exception exception, String msg)
+ */
+
+public ServletContext getContext(String uripath) {
+return this.servletContext.getContext(uripath);
+}
+
+public Enumeration getInitParameterNames() {
+return this.servletContext.getInitParameterNames();
+}
+
+public int getMajorVersion() {
+return this.servletContext.getMajorVersion();
+}
+
+public int getMinorVersion() {
+return this.servletContext.getMinorVersion();
+}
+
+public RequestDispatcher getNamedDispatcher(String name) {
+return this.servletContext.getNamedDispatcher(name);
+}
+
+public RequestDispatcher getRequestDispatcher(String path) {
+return this.servletContext.getRequestDispatcher(path);
+}
+
+public String getServerInfo() {
+return this.servletContext.getServerInfo();
+}
+
+public void log(String msg) {
+this.servletContext.log(msg);
+}
+
+public void log(String msg, Throwable throwable) {
+this.servletContext.log(msg, throwable);
}
}
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
joerg 2004/05/07 10:26:33
Modified:tools/src blocks-build.xsl
Log:
ignore new cocoon documentation tags in javadocs (thanks to Jorg Heymans)
Revision ChangesPath
1.68 +12 -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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- blocks-build.xsl 4 May 2004 07:14:08 - 1.67
+++ blocks-build.xsl 7 May 2004 17:26:33 - 1.68
@@ -229,7 +229,18 @@
--
tag name=avalon.context scope=methods description=Requires
entry: /
tag name=avalon.dependency scope=methods description=Requires
component: /
-
+tag name=cocoon.sitemap.component.configuration enabled=false/
+tag name=cocoon.sitemap.component.documentation enabled=false/
+tag name=cocoon.sitemap.component.documentation.caching
enabled=false/
+tag name=cocoon.sitemap.component.label enabled=false/
+tag name=cocoon.sitemap.component.logger enabled=false/
+tag name=cocoon.sitemap.component.mimetype enabled=false/
+tag name=cocoon.sitemap.component.name enabled=false/
+tag name=cocoon.sitemap.component.parameter enabled=false/
+tag name=cocoon.sitemap.component.pooling.grow enabled=false/
+tag name=cocoon.sitemap.component.pooling.max enabled=false/
+tag name=cocoon.sitemap.component.pooling.min enabled=false/
+
packageset dir=${{java}}
include name=**/
/packageset
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation RequestAttributeGenerator.java
joerg 2004/05/07 10:32:59
Modified:src/blocks/scratchpad/java/org/apache/cocoon/servlet
CocoonFilterGeneratorImpl.java
src/blocks/forms/java/org/apache/cocoon/forms/formmodel
AggregateFieldDefinition.java
src/blocks/woody/java/org/apache/cocoon/woody/formmodel
AggregateFieldDefinition.java
src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl
CachingSourceFactory.java
src/blocks/scratchpad/java/org/apache/cocoon/generation
RequestAttributeGenerator.java
Log:
fixed javadoc errors (thanks to Jorg Heymans)
Revision ChangesPath
1.4 +4 -5
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java
Index: CocoonFilterGeneratorImpl.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CocoonFilterGeneratorImpl.java5 Mar 2004 10:07:26 - 1.3
+++ CocoonFilterGeneratorImpl.java7 May 2004 17:32:58 - 1.4
@@ -117,7 +117,6 @@
* @author a href=mailto:[EMAIL PROTECTED]Bernhard Huber/a
* @version CVS $Id$
*
- * @servlet:filter-nameCocoonFilterGeneratorImpl
*/
public class CocoonFilterGeneratorImpl implements Filter {
@@ -176,7 +175,7 @@
}
/**
- * Sets the filterConfig attribute of the JSPFilterImpl object
+ * Sets the filterConfig attribute of the CocoonFilterGeneratorImpl
object
*
* @param cfg The new filterConfig value
* @since 1.0
@@ -197,7 +196,7 @@
/**
- * Gets the filterConfig attribute of the JSPFilterImpl object
+ * Gets the filterConfig attribute of the CocoonFilterGeneratorImpl
object
*
* @returnThe filterConfig value
* @since 1.0
@@ -473,7 +472,7 @@
* @since 1.0
*/
public String getServletName() {
-return JSPEngineImpl;
+return CocoonFilterGeneratorImpl;
}
1.3 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinition.java
Index: AggregateFieldDefinition.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AggregateFieldDefinition.java 21 Apr 2004 20:30:49 - 1.2
+++ AggregateFieldDefinition.java 7 May 2004 17:32:58 - 1.3
@@ -54,7 +54,7 @@
protected XMLizable splitFailMessage;
/**
- * List containing instances of [EMAIL PROTECTED] #splitMappings}, i.e.
the mapping between
+ * List containing instances of [EMAIL PROTECTED] SplitMapping}, i.e.
the mapping between
* a group (paren) from the regular expression and corresponding field
id.
*/
private List splitMappings = new ArrayList();
1.11 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinition.java
Index: AggregateFieldDefinition.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinition.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AggregateFieldDefinition.java 9 Mar 2004 13:53:55 - 1.10
+++ AggregateFieldDefinition.java 7 May 2004 17:32:59 - 1.11
@@ -54,7 +54,7 @@
protected XMLizable splitFailMessage;
/**
- * List containing instances of [EMAIL PROTECTED] #splitMappings}, i.e.
the mapping between
+ * List containing instances of [EMAIL PROTECTED] SplitMapping}, i.e.
the mapping between
* a group (paren) from the regular expression and corresponding field
id.
*/
private List splitMappings = new ArrayList();
1.10 +3 -3
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
Index: CachingSourceFactory.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CachingSourceFactory.java 25 Apr 2004 20:00:35 - 1.9
+++ CachingSourceFactory.java 7 May 2004 17:32:59 - 1.10
@@ -80,14 +80,14
cvs commit: cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java FormFlow.java
joerg 2004/05/07 10:47:55
Modified:src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java
FormInstance.java
src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java
FormFlow.java
Log:
fixed compile error due to latest changes in cforms
Revision ChangesPath
1.10 +4 -4
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java
Index: FormInstance.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FormInstance.java 1 May 2004 00:05:44 - 1.9
+++ FormInstance.java 7 May 2004 17:47:55 - 1.10
@@ -112,11 +112,11 @@
* If codename/code is undefined, the form widget itself is returned.
* Otherwise, the form's child widget of name codename/code is
returned.
*/
-public Widget getWidget(String name) {
+public Widget getChild(String name) {
if (name == null) {
-return this.form/*Widget*/;
+return this.form;
} else {
-return this.form/*Widget*/.getWidget(name);
+return this.form.getChild(name);
}
}
1.7 +5 -5
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/FormFlow.java
Index: FormFlow.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/FormFlow.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormFlow.java 4 Apr 2004 06:35:08 - 1.6
+++ FormFlow.java 7 May 2004 17:47:55 - 1.7
@@ -34,10 +34,10 @@
FormInstance form = new FormInstance(forms/form1.xml);
-Field birthDate = (Field) form.getWidget(birthdate);
+Field birthDate = (Field) form.getChild(birthdate);
birthDate.setValue(new Date());
-Repeater repeater = (Repeater) form.getWidget(contacts);
+Repeater repeater = (Repeater) form.getChild(contacts);
repeater.addRow();
Field field = (Field) repeater.getWidget(0, firstname);
field.setValue(Jules);
@@ -48,9 +48,9 @@
form.show(form/form1);
-sendPage(page/form1-result, new VarMap().add(email,
((Field)form.getWidget(email)).getValue())
- .add(somebool,
((BooleanField)form.getWidget(somebool)).getValue())
- .add(firstname,
((Field)((Repeater)form.getWidget(contacts)).getWidget(1,
firstname)).getValue()));
+sendPage(page/form1-result, new VarMap().add(email,
((Field)form.getChild(email)).getValue())
+ .add(somebool,
((BooleanField)form.getChild(somebool)).getValue())
+ .add(firstname,
((Field)((Repeater)form.getChild(contacts)).getWidget(1,
firstname)).getValue()));
}
public void doEditForm2() throws BindingException {
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom FOM_Cocoon.java
joerg 2004/05/07 14:13:50
Modified:src/java/org/apache/cocoon/generation
XPathDirectoryGenerator.java
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java
Log:
fixed possible errors with non-ASCII characters, used unicode escape
sequences instead (thanks to Chris Burdess)
Revision ChangesPath
1.9 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Index: XPathDirectoryGenerator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPathDirectoryGenerator.java 5 Mar 2004 13:02:55 - 1.8
+++ XPathDirectoryGenerator.java 7 May 2004 21:13:50 - 1.9
@@ -110,7 +110,7 @@
*
* @author a href=mailto:[EMAIL PROTECTED]Giacomo Pati/a
* @author a href=mailto:[EMAIL PROTECTED]Gianugo Rabellino/a
- * @author a href=mailto:[EMAIL PROTECTED]Jörg Heinicke/a
+ * @author a href=mailto:[EMAIL PROTECTED]J\u00F6rg Heinicke/a
* @version CVS $Id$
*/
public class XPathDirectoryGenerator
1.35 +2 -2
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- FOM_Cocoon.java 7 May 2004 14:42:20 - 1.34
+++ FOM_Cocoon.java 7 May 2004 21:13:50 - 1.35
@@ -58,7 +58,7 @@
*
* @since 2.1
* @author a href=mailto:coliver.at.apache.org;Christopher Oliver/a
- * @author a href=mailto:reinhard.at.apache.org;Reinhard P�tz/a
+ * @author a href=mailto:reinhard.at.apache.org;Reinhard P\u00F6tz/a
* @version CVS $Id$
*/
public class FOM_Cocoon extends ScriptableObject {
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript ScriptableWidget.java
joerg 2004/05/07 15:04:20 Modified:src/blocks/forms/java/org/apache/cocoon/forms/binding JXPathBindingBase.java src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript ScriptableWidget.java Log: imports Revision ChangesPath 1.6 +1 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java Index: JXPathBindingBase.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JXPathBindingBase.java7 May 2004 16:43:42 - 1.5 +++ JXPathBindingBase.java7 May 2004 22:04:20 - 1.6 @@ -20,7 +20,6 @@ import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.logger.Logger; -import org.apache.cocoon.forms.formmodel.ContainerWidget; import org.apache.cocoon.forms.formmodel.Widget; import org.apache.cocoon.util.jxpath.DOMFactory; import org.apache.commons.jxpath.JXPathContext; 1.5 +1 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/ScriptableWidget.java Index: ScriptableWidget.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/ScriptableWidget.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ScriptableWidget.java 7 May 2004 16:43:43 - 1.4 +++ ScriptableWidget.java 7 May 2004 22:04:20 - 1.5 @@ -17,7 +17,6 @@ package org.apache.cocoon.forms.flow.javascript; import org.apache.cocoon.forms.formmodel.AggregateField; import org.apache.cocoon.forms.formmodel.BooleanField; -import org.apache.cocoon.forms.formmodel.ContainerWidget; import org.apache.cocoon.forms.formmodel.Field; import org.apache.cocoon.forms.formmodel.MultiValueField; import org.apache.cocoon.forms.formmodel.Output;
cvs commit: cocoon-2.1/src/resources/javadoc/avalon-logkit - New directory
joerg 2004/05/07 15:10:15 cocoon-2.1/src/resources/javadoc/avalon-logkit - New directory
cvs commit: cocoon-2.1/src/resources/javadoc/avalon-logkit package-list
joerg 2004/05/07 15:27:32
Modified:tools/src blocks-build.xsl
Added: src/resources/javadoc/jstl package-list
src/resources/javadoc/avalon-logkit package-list
Log:
added jstl and avalon logkit to package lists
Revision ChangesPath
1.69 +17 -7 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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- blocks-build.xsl 7 May 2004 17:26:33 - 1.68
+++ blocks-build.xsl 7 May 2004 22:27:32 - 1.69
@@ -213,13 +213,23 @@
useexternalfile=yes
additionalparam=${{javadoc.additionalparam}}
maxmemory=128m
-
-link offline=true href=http://avalon.apache.org/framework/api;
packagelistloc=${{resources.javadoc}}/avalon-framework/
-link offline=true href=http://avalon.apache.org/excalibur/api;
packagelistloc=${{resources.javadoc}}/avalon-excalibur/
-link offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api;
packagelistloc=${{resources.javadoc}}/xerces/
-link offline=true href=http://xml.apache.org/xalan-j/apidocs;
packagelistloc=${{resources.javadoc}}/xalan/
-link offline=true href=http://java.sun.com/j2se/1.4.2/docs/api;
packagelistloc=${{resources.javadoc}}/j2se/
-link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${{resources.javadoc}}/j2ee/
+
+link packagelistloc=${{resources.javadoc}}/avalon-excalibur
+ offline=true href=http://avalon.apache.org/excalibur/api/
+link packagelistloc=${{resources.javadoc}}/avalon-framework
+ offline=true href=http://avalon.apache.org/framework/api/
+link packagelistloc=${{resources.javadoc}}/avalon-logkit
+ offline=true href=http://avalon.apache.org/logkit/api/
+link packagelistloc=${{resources.javadoc}}/j2ee
+ offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api/
+link packagelistloc=${{resources.javadoc}}/j2se
+ offline=true href=http://java.sun.com/j2se/1.4.2/docs/api/
+link packagelistloc=${{resources.javadoc}}/jstl
+ offline=true
href=http://java.sun.com/products/jsp/jstl/1.1/docs/api/
+link packagelistloc=${{resources.javadoc}}/xalan
+ offline=true href=http://xml.apache.org/xalan-j/apidocs/
+link packagelistloc=${{resources.javadoc}}/xerces
+ offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api/
tag name=avalon.component scope=types description=Avalon
component /
tag name=avalon.service scope=types
description=Implements service:; /
1.1 cocoon-2.1/src/resources/javadoc/jstl/package-list
Index: package-list
===
javax.servlet.jsp.jstl.core
1.1
cocoon-2.1/src/resources/javadoc/avalon-logkit/package-list
Index: package-list
===
org.apache.log.output.io
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel AbstractWidget.java
joerg 2004/05/07 15:31:05
Modified:src/blocks/forms/java/org/apache/cocoon/forms/formmodel
AbstractWidget.java
Log:
fixed javadoc error
Revision ChangesPath
1.19 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
Index: AbstractWidget.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AbstractWidget.java 7 May 2004 16:43:42 - 1.18
+++ AbstractWidget.java 7 May 2004 22:31:05 - 1.19
@@ -173,7 +173,7 @@
* return the actual child-widget.
*
* @param id of the child-widget
- * @returns codenull/code if not overriden.
+ * @return codenull/code if not overriden.
*/
protected Widget getChild(String id) {
return null;
cvs commit: cocoon-2.1 build.sh
joerg 2004/05/05 14:03:30 Modified:.build.sh Log: fixing bad variable names errors as suggested by Lars Huttar (http://marc.theaimsgroup.com/?l=xml-cocoon-usersm=108363787604460w=4) Revision ChangesPath 1.12 +4 -4 cocoon-2.1/build.sh Index: build.sh === RCS file: /home/cvs/cocoon-2.1/build.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- build.sh 21 Apr 2004 09:33:22 - 1.11 +++ build.sh 5 May 2004 21:03:30 - 1.12 @@ -25,7 +25,7 @@ fi # - Ignore system CLASSPATH variable -OLD_CLASSPATH=$CLASSPATH +OLD_CLASSPATH=$CLASSPATH unset CLASSPATH CLASSPATH=`echo lib/endorsed/*.jar | tr ' ' $S` export CLASSPATH @@ -39,11 +39,11 @@ $ANT_HOME/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@ # - Restore ANT_HOME and ANT_OPTS -export ANT_HOME=$OLD_ANT_HOME +export ANT_HOME=$OLD_ANT_HOME unset OLD_ANT_HOME -export ANT_OPTS=$OLD_ANT_OPTS +export ANT_OPTS=$OLD_ANT_OPTS unset OLD_ANT_OPTS # - Restore CLASSPATH -export CLASSPATH=$OLD_CLASSPATH +export CLASSPATH=$OLD_CLASSPATH unset OLD_CLASSPATH
cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/forms sample.xml
joerg 2004/05/04 13:19:10 Modified:src/documentation/xdocs/userdocs/forms sample.xml Log: fixed wi/fi (thanks to Helma van der Linden) Revision ChangesPath 1.4 +1 -1 cocoon-2.1/src/documentation/xdocs/userdocs/forms/sample.xml Index: sample.xml === RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/forms/sample.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sample.xml24 Apr 2004 12:09:03 - 1.3 +++ sample.xml4 May 2004 20:19:10 - 1.4 @@ -157,7 +157,7 @@ pThe lt;ft:widget-labelgt; tag will cause the label of a widget to be inserted at the location of the tag. The lt;ft:widgetgt; tag will cause the XML representation of a widget to be inserted at the location of that tag. - The inserted XML will be in the Forms Instance namespace: strongwi/strong./p + The inserted XML will be in the Forms Instance namespace: strongfi/strong./p pThe XML representation of the widget will then be translated to HTML by an XSLT stylesheet (forms-samples-styling.xsl in our case -- see sitemap snippets below).
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/modules/input InputModuleHelper.java
joerg 2004/04/30 16:07:55
Modified:src/java/org/apache/cocoon/components/modules/input
InputModuleHelper.java
Log:
removed unused private field
Revision ChangesPath
1.2 +1 -2
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java
Index: InputModuleHelper.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/InputModuleHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputModuleHelper.java27 Apr 2004 22:25:29 - 1.1
+++ InputModuleHelper.java30 Apr 2004 23:07:55 - 1.2
@@ -40,7 +40,6 @@
private final static int OP_GET = 0;
private final static int OP_VALUES = 1;
private final static int OP_NAMES = 2;
-private final static String[] OPNAME = new String[] {GET_VALUE,
GET_VALUES, GET_NAMES};
private Map inputModules;
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings DateWrapper.java CustomValueWrapBinding.java
joerg 2004/04/30 17:05:45 Modified:src/blocks/portal/java/org/apache/cocoon/environment/portlet ActionResponse.java PortletSession.java PortletEnvironment.java src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java FormInstance.java src/blocks/xsp/java/org/apache/cocoon/components/language/markup CocoonMarkupLanguage.java AbstractMarkupLanguage.java src/blocks/forms/java/org/apache/cocoon/forms/binding CustomJXPathBinding.java AbstractCustomBinding.java src/blocks/forms/java/org/apache/cocoon/forms/formmodel AbstractContainerWidget.java AbstractWidget.java Form.java src/java/org/apache/cocoon/components/modules/input JXPathHelperConfiguration.java src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings DateWrapper.java CustomValueWrapBinding.java Log: javadoc fixes: @see is no inline tag, so must not be used via [EMAIL PROTECTED] reference}, use [EMAIL PROTECTED] reference} instead @inheritDoc is an inline tag, so must be surrounded with curly braces: [EMAIL PROTECTED] Revision ChangesPath 1.3 +5 -5 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionResponse.java Index: ActionResponse.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionResponse.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ActionResponse.java 5 Mar 2004 13:02:08 - 1.2 +++ ActionResponse.java 1 May 2004 00:05:44 - 1.3 @@ -44,7 +44,7 @@ /** * Creates a ActionResponse based on a real - * [EMAIL PROTECTED] ActionResponse} object + * [EMAIL PROTECTED] ActionResponse} object */ protected ActionResponse(javax.portlet.ActionResponse response, PortletPreferences preferences, @@ -108,8 +108,8 @@ * * Redirects to self (starting with the question mark) are processed * differently from other redirects: redirect parameters are parsed and - * set on response using [EMAIL PROTECTED] ActionResponse#setRenderParameter(String, String)} - * method, [EMAIL PROTECTED] ActionResponse#sendRedirect(String)} method is not called. + * set on response using [EMAIL PROTECTED] ActionResponse#setRenderParameter(String, String)} + * method, [EMAIL PROTECTED] ActionResponse#sendRedirect(String)} method is not called. * * @param location * @throws IOException @@ -162,7 +162,7 @@ // ActionResponse API methods /** - * Type cast portletResponse to [EMAIL PROTECTED] ActionResponse} + * Type cast portletResponse to [EMAIL PROTECTED] ActionResponse} * * @return type casted portletResponse */ 1.3 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletSession.java Index: PortletSession.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletSession.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PortletSession.java 5 Mar 2004 13:02:08 - 1.2 +++ PortletSession.java 1 May 2004 00:05:44 - 1.3 @@ -24,7 +24,7 @@ * Provides access to the JSR-168 (Portlet) environment session. * * Portlet scope and application scope session attributes are differentiated - * using attribute name prefix, [EMAIL PROTECTED] PortletEnvironment#SESSION_APPLICATION_SCOPE}. + * using attribute name prefix, [EMAIL PROTECTED] PortletEnvironment#SESSION_APPLICATION_SCOPE}. * * @see javax.portlet.PortletSession * @author a href=mailto:[EMAIL PROTECTED]Alex Rudnev/a 1.3 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java Index: PortletEnvironment.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PortletEnvironment.java 5 Mar 2004 13:02:08 - 1.2 +++ PortletEnvironment.java 1 May 2004 00:05:44 - 1.3 @@ -202,7 +202,7 @@ } /** - * In portlet environment this is the same as [EMAIL PROTECTED] #redirect(boolean, String)} + * In portlet environment this is the same
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/src/webapp/samples/blocks gump2samples.xsl
joerg 2004/04/30 17:51:21 Modified:src/webapp/samples/blocks gump2samples.xsl Log: fixed link from blocks page to samples page Revision ChangesPath 1.4 +2 -2 cocoon-2.1/src/webapp/samples/blocks/gump2samples.xsl Index: gump2samples.xsl === RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/blocks/gump2samples.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gump2samples.xsl 2 Apr 2004 20:40:57 - 1.3 +++ gump2samples.xsl 1 May 2004 00:51:21 - 1.4 @@ -26,7 +26,7 @@ xsl:template match=/root samples name=Blocks Samples group name=Back -sample href=./ name=Back +sample href=.. name=Back Back to the samples home page. /sample /group
cvs commit: cocoon-2.1/src/webapp/stylesheets/system xml2html.xslt
joerg 2004/05/01 06:20:56
Modified:src/webapp/stylesheets/system xml2html.xslt
Log:
added namespace functionality provided by Andrew Thornton
(http://marc.theaimsgroup.com/?t=10830735766r=1w=4),
cleaned up some useless xsl:text,
removed one useless template (match=*[*] was exactly the same like
match=*[node()]),
fixed monospace-style
Revision ChangesPath
1.10 +49 -61cocoon-2.1/src/webapp/stylesheets/system/xml2html.xslt
Index: xml2html.xslt
===
RCS file: /home/cvs/cocoon-2.1/src/webapp/stylesheets/system/xml2html.xslt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xml2html.xslt 6 Mar 2004 13:42:12 - 1.9
+++ xml2html.xslt 1 May 2004 13:20:55 - 1.10
@@ -40,8 +40,8 @@
xsl:template name=head
HEAD
STYLE
- BODY {background-color: white; color: black; font: monospace;}
-.b {cursor:pointer; color:red; font-weight:bold;
text-decoration:none}
+ BODY {background-color: white; color: black; font-family:
monospace;}
+.b {cursor:pointer; color:red; font-weight:bold;
text-decoration:none; padding-right: 2px;}
.e {border: 0px; padding: 0px; margin: 0px 0px 0px 2em;
text-indent:-1em;}
.en {color:#88; font-weight:bold;}
.an {color:#88}
@@ -96,17 +96,13 @@
!-- match processing instructions --
xsl:template match=processing-instruction()
DIV class=e
- SPAN class=m
-xsl:textlt;?/xsl:text
- /SPAN
+ SPAN class=mlt;?/SPAN
SPAN class=pi
xsl:value-of select=name(.)/
xsl:text /xsl:text
xsl:value-of select=./
/SPAN
- SPAN class=m
-xsl:text?/xsl:text
- /SPAN
+ SPAN class=m?/SPAN
/DIV
/xsl:template
@@ -123,17 +119,13 @@
xsl:template match=comment()
DIV class=e
SPAN class=b onclick=click(event)-/SPAN
- SPAN class=m
-xsl:textlt;!--/xsl:text
- /SPAN
+ SPAN class=mlt;!--/SPAN
SPAN class=c
PRE
xsl:value-of select=./
/PRE
/SPAN
- SPAN class=m
-xsl:text--/xsl:text
- /SPAN
+ SPAN class=m--/SPAN
/DIV
/xsl:template
@@ -152,8 +144,8 @@
/xsl:if
/xsl:template
- !-- match empty nodes --
- xsl:template match=*
+ !-- match empty elements --
+ xsl:template match=*[not(node())]
DIV class=e
SPAN class=mlt;/SPAN
SPAN class=en
@@ -163,50 +155,15 @@
xsl:text /xsl:text
/xsl:if
xsl:apply-templates select=@*/
-SPAN class=m
- xsl:text/gt;/xsl:text
-/SPAN
- /DIV
- /xsl:template
-
- xsl:template match=*[node()]
- DIV class=e
- DIV
-SPAN class=b onclick=click(event)-/SPAN
-SPAN class=mlt;/SPAN
-SPAN class=en
- xsl:value-of select=name(.)/
-/SPAN
-xsl:if test=@*
- xsl:text /xsl:text
-/xsl:if
-xsl:apply-templates select=@*/
-SPAN class=m
- xsl:text/xsl:text
-/SPAN
- /DIV
- DIV
-xsl:apply-templates/
-DIV
- SPAN class=m
- xsl:textlt;//xsl:text
- /SPAN
- SPAN class=en
- xsl:value-of select=name(.)/
- /SPAN
- SPAN class=m
- xsl:text/xsl:text
- /SPAN
-/DIV
- /DIV
+xsl:apply-templates select=. mode=namespace/
+SPAN class=m/gt;/SPAN
/DIV
/xsl:template
- xsl:template match=*[text() and not (comment() or
processing-instruction())]
+ !-- match elements with only text(), they are not closeable --
+ xsl:template match=*[text()][not(* or comment() or
processing-instruction())] priority=10
DIV class=e
-SPAN class=m
- xsl:textlt;/xsl:text
-/SPAN
+SPAN class=mlt;/SPAN
SPAN class=en
xsl:value-of select=name(.)/
/SPAN
@@ -214,6 +171,7 @@
xsl:text /xsl:text
/xsl:if
xsl:apply-templates select=@*/
+xsl:apply-templates select=. mode=namespace/
SPAN class=m
xsl:text/xsl:text
/SPAN
@@ -230,7 +188,7 @@
/DIV
/xsl:template
- xsl:template match=*[*] priority=20
+ xsl:template match=*[node()]
DIV class=e
cvs commit: cocoon-2.1/src/blocks/qdox/java/org/apache/cocoon/components/source/impl QDoxSource.java
joerg 2004/04/30 15:50:39 Modified:src/blocks/qdox/java/org/apache/cocoon/components/source/impl QDoxSource.java Log: fixed javadoc: added \ to escape the @link, this mades the javadoc different to the regexp itself, but before it was not shown at all Revision ChangesPath 1.10 +2 -2 cocoon-2.1/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSource.java Index: QDoxSource.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSource.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- QDoxSource.java 29 Apr 2004 11:26:42 - 1.9 +++ QDoxSource.java 30 Apr 2004 22:50:39 - 1.10 @@ -148,7 +148,7 @@ * and 'indexOf(hellip;)' with codereLink.getParen(5)/code./li * /ul * pThe regexp is as follows:/p - * code[EMAIL PROTECTED]((([\w.#,$amp;;\s]+)|([\w.#,$amp;;(\s]+[\w.#,$amp;;)\s]+))\s+([\w()#.,$amp;;\s]+)|([\w.#,$amp;;\s()]+))\s*\}/code + * code[EMAIL PROTECTED]((([\w.#,$amp;;\s]+)|([\w.#,$amp;;(\s]+[\w.#,$amp;;)\s]+))\s+([\w()#.,$amp;;\s]+)|([\w.#,$amp;;\s()]+))\s*\}/code * * @see #reLink */
cvs commit: cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers XHTMLSerializer.java XMLSerializer.java HTMLSerializer.java
joerg 2004/04/30 15:57:23
Modified:
src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding
CharsetFactory.java
src/blocks/woody/java/org/apache/cocoon/woody/util
JavaScriptHelper.java
src/blocks/serializers/java/org/apache/cocoon/components/serializers
XHTMLSerializer.java XMLSerializer.java
HTMLSerializer.java
Log:
fixed javadocs
Revision ChangesPath
1.3 +1 -3
cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
Index: CharsetFactory.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CharsetFactory.java 30 Apr 2004 19:34:46 - 1.2
+++ CharsetFactory.java 30 Apr 2004 22:57:22 - 1.3
@@ -181,8 +181,6 @@
/**
* Return the codeCharset/code instance for the default charset.
*
- * @throws UnsupportedEncodingException If the default is invalid or
- * cannot be accessed.
*/
public Charset getDefaultCharset() {
return(defaultCharset);
1.10 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/util/JavaScriptHelper.java
Index: JavaScriptHelper.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/util/JavaScriptHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JavaScriptHelper.java 30 Apr 2004 22:52:43 - 1.9
+++ JavaScriptHelper.java 30 Apr 2004 22:57:22 - 1.10
@@ -132,7 +132,7 @@
* that can be provided by a flowscript higher in the call stack, giving
visibility to flowscript
* functions and global (session) variables.
*
- * @param request a request where the flowscript scope will be searched
(can be codenull/code).
+ * @param objectModel an objectModel where the flowscript scope will be
searched (can be codenull/code).
* @return an appropriate parent scope.
*/
public static Scriptable getParentScope(Map objectModel) {
1.3 +2 -2
cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
Index: XHTMLSerializer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XHTMLSerializer.java 27 Apr 2004 18:35:21 - 1.2
+++ XHTMLSerializer.java 30 Apr 2004 22:57:22 - 1.3
@@ -99,7 +99,7 @@
* @param qual The fully-qualified name of the root element.
* @param namespaces An array of codeString/code objects containing
* the namespaces to be declared by this element.
- * @param namespaces An array of codeString/code objects containing
+ * @param attributes An array of codeString/code objects containing
* all attributes of this element.
*/
public void startElementImpl(String uri, String local, String qual,
1.5 +2 -2
cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XMLSerializer.java
Index: XMLSerializer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XMLSerializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLSerializer.java30 Apr 2004 22:52:43 - 1.4
+++ XMLSerializer.java30 Apr 2004 22:57:22 - 1.5
@@ -239,7 +239,7 @@
* @param qual The fully-qualified name of the root element.
* @param namespaces An array of codeString/code objects containing
* the namespaces to be declared by this element.
- * @param namespaces An array of codeString/code objects containing
+ * @param attributes An array of codeString/code objects containing
* all attributes of this element.
*/
public void startElementImpl(String uri, String local, String qual,
1.4 +2 -2
cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
Index: HTMLSerializer.java
===
RCS file:
/home
cvs commit: cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers XHTMLSerializer.java
joerg 2004/04/30 15:58:35
Modified:
src/blocks/serializers/java/org/apache/cocoon/components/serializers
XHTMLSerializer.java
Log:
removed unused local variable
Revision ChangesPath
1.4 +1 -2
cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
Index: XHTMLSerializer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XHTMLSerializer.java 30 Apr 2004 22:57:22 - 1.3
+++ XHTMLSerializer.java 30 Apr 2004 22:58:34 - 1.4
@@ -127,7 +127,6 @@
this.closeElement(false);
} else if (local.equalsIgnoreCase(head)) {
String loc = meta;
-String pre = namespaces.getPrefix(XHTML1_NAMESPACE);
String qua = namespaces.qualify(XHTML1_NAMESPACE, loc,
meta);
String nsp[][] = new String[0][0];
String att[][] = new String[2][ATTRIBUTE_LENGTH];
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/util StringUtils.java
joerg 2004/04/28 17:17:25
Modified:src/java/org/apache/cocoon/util StringUtils.java
Log:
reverted the move to o.a.commons.lang.StringUtils for split() as it behaves
differently;
for the other methods restored the implementations and only point out the
deprecation - we should test if here is another behaviour too
Revision ChangesPath
1.4 +21 -9
cocoon-2.1/src/java/org/apache/cocoon/util/StringUtils.java
Index: StringUtils.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/StringUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringUtils.java 28 Mar 2004 14:28:04 - 1.3
+++ StringUtils.java 29 Apr 2004 00:17:25 - 1.4
@@ -31,7 +31,7 @@
* @return An array of whitespace-separated tokens
*/
public static String[] split(String line) {
-return org.apache.commons.lang.StringUtils.split(line, \t\n\r);
+return split(line, \t\n\r);
}
/**
@@ -40,11 +40,9 @@
* @param line The string to be split
* @param delimiter A string containing token separators
* @return An array of token
- * @deprecated Use org.apache.commons.lang.StringUtils.split() instead
*/
public static String[] split(String line, String delimiter) {
-return org.apache.commons.lang.StringUtils.split(line, delimiter);
-//return Tokenizer.tokenize(line, delimiter, false);
+return Tokenizer.tokenize(line, delimiter, false);
}
/**
@@ -67,10 +65,15 @@
* @param str The string to be tested
* @param c the char to be counted
* @return the occurrence of the character in the string.
- * @deprecated Use org.apache.commons.lang.StringUtils.countMatches
+ * @deprecated Use [EMAIL PROTECTED]
org.apache.commons.lang.StringUtils#countMatches(String, String)}
*/
public static int count(String str, char c) {
-return org.apache.commons.lang.StringUtils.countMatches(str,
String.valueOf(c));
+int index = 0;
+char[] chars = str.toCharArray();
+for (int i = 0; i chars.length; i++) {
+if (chars[i] == c) index++;
+}
+return index;
}
/**
@@ -79,10 +82,19 @@
* @param a The first string
* @param b The second string
* @return the index where the two strings stop matching starting from 0
- * @deprecated Use
org.apache.commons.lang.StringUtils.indexOfDifference()
+ * @deprecated Use [EMAIL PROTECTED]
org.apache.commons.lang.StringUtils#indexOfDifference(String, String)}
*/
public static int matchStrings(String a, String b) {
-return org.apache.commons.lang.StringUtils.indexOfDifference(a, b);
+int i;
+char[] ca = a.toCharArray();
+char[] cb = b.toCharArray();
+int len = ( ca.length cb.length ) ? ca.length : cb.length;
+
+for (i = 0; i len; i++) {
+if (ca[i] != cb[i]) break;
+}
+
+return i;
}
/**
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/util NetUtils.java
joerg 2004/04/28 17:20:53
Modified:src/java/org/apache/cocoon/util NetUtils.java
Log:
when using our StringUtils again for splitting we can revert the extra
handling for empty string and charAt(0) == '/'
Revision ChangesPath
1.13 +2 -12 cocoon-2.1/src/java/org/apache/cocoon/util/NetUtils.java
Index: NetUtils.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/NetUtils.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NetUtils.java 28 Apr 2004 22:14:19 - 1.12
+++ NetUtils.java 29 Apr 2004 00:20:53 - 1.13
@@ -321,10 +321,7 @@
* @return The normalized uri
*/
public static String normalize(String uri) {
-if (.equals(uri)) {
-return uri;
-}
-String[] dirty = StringUtils.split(uri, '/');
+String[] dirty = org.apache.cocoon.util.StringUtils.split(uri, /);
int length = dirty.length;
String[] clean = new String[length];
@@ -357,13 +354,6 @@
}
StringBuffer b = new StringBuffer(uri.length());
-
-// Added this check to satisfy NetUtilsTestCase. I cannot ascertain
whether
-// this is correct or not, since the description of this method is
not very
-// clear. [Ugo Cei [EMAIL PROTECTED] 2004-04-19]
-if (uri.charAt(0) == '/') {
-b.append('/');
-}
for (int i = 0; (i length) (clean[i] != null); i++) {
b.append(clean[i]);
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/util/test NetUtilsTestCase.java
joerg 2004/04/28 17:21:50
Modified:src/test/org/apache/cocoon/util/test NetUtilsTestCase.java
Log:
show that NetUtils.normalize() still does not work correctly - see my
following mail
Revision ChangesPath
1.7 +7 -1
cocoon-2.1/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java
Index: NetUtilsTestCase.java
===
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NetUtilsTestCase.java 28 Apr 2004 22:14:19 - 1.6
+++ NetUtilsTestCase.java 29 Apr 2004 00:21:50 - 1.7
@@ -206,7 +206,13 @@
*/
public void testNormalize() throws Exception {
Object[] test_values = {
+new String[]{, },
+new String[]{/, /},
+new String[]{/../, /../},
new String[]{/foo/bar, /foo/bar},
+new String[]{/foo/bar/, /foo/bar/},
+new String[]{/foo/../bar, /bar},
+new String[]{/foo/../bar/, /bar/},
new String[]{bar, bar},
new String[]{foo/../bar, bar},
new String[]{foo/./bar, foo/bar},
cvs commit: cocoon-2.1 build.properties
joerg 2004/04/28 17:33:35
Modified:.build.properties
Log:
test output directory property added
Revision ChangesPath
1.38 +1 -0 cocoon-2.1/build.properties
Index: build.properties
===
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.properties 28 Apr 2004 21:29:08 - 1.37
+++ build.properties 29 Apr 2004 00:33:34 - 1.38
@@ -70,6 +70,7 @@
build.dest=${build}/classes
build.mocks=${build}/mocks
build.test=${build}/test
+build.test.output=${build.test}/output
build.docs=${build}/docs
build.docs.printer=${build}/printer-docs
build.site=${build}/site
cvs commit: cocoon-2.1/tools/targets test-build.xml
joerg 2004/04/28 17:36:06
Modified:tools/targets test-build.xml
Log:
output test results into files, create a nice junit report (= HTML) out of it;
no longer haltonfailure for the tests (we would not get the report), if we
need a failing build we can use failureproperty
Revision ChangesPath
1.7 +14 -3 cocoon-2.1/tools/targets/test-build.xml
Index: test-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/targets/test-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- test-build.xml8 Mar 2004 06:07:15 - 1.6
+++ test-build.xml29 Apr 2004 00:36:06 - 1.7
@@ -25,10 +25,15 @@
!-- Runs JUnit tests --
target name=junit-tests depends=compile-tests
-junit printsummary=yes haltonfailure=yes fork=yes
+delete dir=${build.test.output}/
+mkdir dir=${build.test.output}/
+junit printsummary=yes fork=yes
+ !--jvmarg value=-Xdebug/
+ jvmarg
value=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000/--
classpath refid=test.classpath/
- formatter type=plain usefile=no /
- batchtest
+ formatter type=plain/
+ formatter type=xml/
+ batchtest todir=${build.test.output}
fileset dir=${build.test}
include name=**/*TestCase.class/
include name=**/*Test.class /
@@ -39,6 +44,12 @@
/fileset
/batchtest
/junit
+junitreport todir=${build.test.output}
+ fileset dir=${build.test.output}
+ include name=TEST-*.xml/
+ /fileset
+ report format=frames todir=${build.test.output}/
+/junitreport
/target
!-- Anteater tests --
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/util/test NetUtilsTestCase.java
joerg 2004/04/29 15:49:59
Modified:src/test/org/apache/cocoon/util/test NetUtilsTestCase.java
Log:
normalize() testcases to make it working the same way as
java.net.URI().normalize() in JDK 1.4
Revision ChangesPath
1.9 +11 -7
cocoon-2.1/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java
Index: NetUtilsTestCase.java
===
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NetUtilsTestCase.java 29 Apr 2004 20:10:04 - 1.8
+++ NetUtilsTestCase.java 29 Apr 2004 22:49:59 - 1.9
@@ -199,16 +199,18 @@
/**
- * A unit test for codeNetUtils.normalize()/code
- *
- * @exception Exception Description of Exception
- * @since
+ * A unit test for [EMAIL PROTECTED] NetUtils#normalize(String)}
*/
public void testNormalize() throws Exception {
Object[] test_values = {
new String[]{, },
new String[]{/, /},
-new String[]{/../, /},
+new String[]{/../, /../},
+new String[]{/../../, /../../},
+new String[]{/../../foo, /../../foo},
+new String[]{/../../foo//./../bar, /../../bar},
+new String[]{//foo//bar, //foo/bar},
+new String[]{//foo//./bar, //foo/bar},
new String[]{/foo/bar, /foo/bar},
new String[]{/foo/bar/, /foo/bar/},
new String[]{/foo/../bar, /bar},
@@ -216,12 +218,14 @@
new String[]{bar, bar},
new String[]{foo/../bar, bar},
new String[]{foo/./bar, foo/bar},
-new String[]{foo/bar1/bar2/bar3/../../.., foo},
+new String[]{foo/bar1/bar2/bar3/../../.., foo/},
};
for (int i = 0; i test_values.length; i++) {
String tests[] = (String[]) test_values[i];
String test = tests[0];
String expected = tests[1];
+// alternative for JDK 1.4
+//String expected = new
java.net.URI(test).normalize().toString();
String result = NetUtils.normalize(test);
String message = Test + ' + test + ';
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation AbstractDOMTransformer.java
joerg 2004/04/28 09:35:21
Modified:src/java/org/apache/cocoon/transformation
AbstractDOMTransformer.java
Log:
removed duplicate this.builder = null; in dispose()
Revision ChangesPath
1.3 +1 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDOMTransformer.java 5 Mar 2004 13:02:59 - 1.2
+++ AbstractDOMTransformer.java 28 Apr 2004 16:35:21 - 1.3
@@ -127,7 +127,6 @@
public void dispose() {
this.builder = null;
this.manager = null;
-this.builder = null;
}
/**
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding JXPathBindingBase.java
joerg 2004/04/23 16:34:57 Modified:src/blocks/forms/java/org/apache/cocoon/forms/formmodel ContainerWidget.java AbstractWidget.java Widget.java src/blocks/forms/java/org/apache/cocoon/forms/binding JXPathBindingBase.java Log: fixed javadoc: notation errors; Widget no longer has children, but ContainerWidget has Revision ChangesPath 1.4 +5 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerWidget.java Index: ContainerWidget.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerWidget.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ContainerWidget.java 23 Apr 2004 13:02:31 - 1.3 +++ ContainerWidget.java 23 Apr 2004 23:34:56 - 1.4 @@ -17,7 +17,10 @@ import java.util.Iterator; /** - * Interface to be implemented by Widgets which contain other widgets. + * Interface to be implemented by Widgets which contain other widgets. So all + * widgets together form a widget tree, with its root being the [EMAIL PROTECTED] Form} + * widget, the [EMAIL PROTECTED] ContainerWidget}s being the branches/forks, and the + * [EMAIL PROTECTED] Widget}s with values being the leaves. * * @version $Id$ */ 1.13 +3 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java Index: AbstractWidget.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- AbstractWidget.java 23 Apr 2004 13:02:31 - 1.12 +++ AbstractWidget.java 23 Apr 2004 23:34:56 - 1.13 @@ -74,8 +74,8 @@ * * If subclasses decide to return codenull/code they should also organize * own implementations of [EMAIL PROTECTED] #getId()}, [EMAIL PROTECTED] #getLocation()}, - * [EMAIL PROTECTED] #validate(FormContext)}, [EMAIL PROTECTED] #generateLabel} and - * [EMAIL PROTECTED] #generateDisplayData} to avoid NPE's. + * [EMAIL PROTECTED] #validate(FormContext)}, [EMAIL PROTECTED] #generateLabel(ContentHandler)} and + * [EMAIL PROTECTED] #generateDisplayData(ContentHandler)} to avoid NPE's. * * @return the widgetDefinition from which this widget was instantiated. *(@link WidgetDefinition#createInstance()} 1.8 +2 -8 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java Index: Widget.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Widget.java 23 Apr 2004 13:02:31 - 1.7 +++ Widget.java 23 Apr 2004 23:34:56 - 1.8 @@ -28,19 +28,13 @@ * * ul * lihas an id, unique within its parent context widget. See [EMAIL PROTECTED] #getId()}./li - * lican have children (see [EMAIL PROTECTED] #getWidget(String)}, and can have a parent (see [EMAIL PROTECTED] #getParent()}./li + * lican have a parent (see [EMAIL PROTECTED] #getParent()}./li * lican hold a value (which can be any kind of object). See [EMAIL PROTECTED] #getValue()}./li * lican read its value from a request object (and convert it from a string to its native type). * See [EMAIL PROTECTED] #readFromRequest(FormContext)}./li * lican validate itself. See [EMAIL PROTECTED] #validate(FormContext)}./li * lican generate an XML representation of itself./li * /ul - * - * pBecause widgets can have children, the widgets form a widget tree, with its root - * being the [EMAIL PROTECTED] Form} widget./p - * - * pA widget can have only a value, or only child widgets, or can have both a value and child - * widgets, or can have neither. This all depends on the widget implementation./p * * pWhen a request is submitted, first the [EMAIL PROTECTED] #readFromRequest(FormContext)} method of all widgets * will be called so that they can read their value(s). Next, the [EMAIL PROTECTED] #validate(FormContext)} method will 1.3 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java Index: JXPathBindingBase.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3
cvs commit: cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java FormInstance.java
joerg 2004/04/23 17:00:42
Modified:src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java
FormInstance.java
Log:
clean up: removed the duplicate storage of the Form
Revision ChangesPath
1.7 +3 -6
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java
Index: FormInstance.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormInstance.java 16 Apr 2004 09:39:57 - 1.6
+++ FormInstance.java 24 Apr 2004 00:00:42 - 1.7
@@ -44,7 +44,6 @@
private Form form;
private Binding binding;
-private Widget formWidget;
private Locale locale;
private boolean isValid;
private Object validator; // Used?
@@ -93,10 +92,8 @@
try {
formMgr = (FormManager)getComponent(FormManager.ROLE);
resolver = (SourceResolver)getComponent(SourceResolver.ROLE);
-Form form = formMgr.createForm(formDefinition);
+this.form = formMgr.createForm(formDefinition);
this.binding = null;
-// this.formWidget = new Widget(form); could not create instance
-// this.local = cocoon.createPageLocal(); PageLocal ?
} catch (Exception e) {
throw new CascadingRuntimeException(Could not create form
instance, e);
} finally {
@@ -107,7 +104,7 @@
}
public Widget getModel() {
-return this.formWidget;
+return this.form;
}
/**
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-site/src/documentation/content/xdocs/link hosting.xml
joerg 2004/04/24 07:30:22 Modified:src/documentation/content/xdocs/link hosting.xml Log: http://www.jspzone.net/ Revision ChangesPath 1.10 +1 -0 cocoon-site/src/documentation/content/xdocs/link/hosting.xml Index: hosting.xml === RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/link/hosting.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hosting.xml 18 Feb 2004 18:49:29 - 1.9 +++ hosting.xml 24 Apr 2004 14:30:22 - 1.10 @@ -37,6 +37,7 @@ lilink href=http://www.metawerx.net/;metawerx/link - Cocooon 2.1 on Tomcat/li lilink href=http://jsp-servlet.net/;jsp-servlet.net/link - JSP and Servlet hosting, supports Cocoon 2.1.3, Tomcat 4 and 5, JBoss 3, etc./li lilink href=http://www.eway.fr/;EWAY Telecom/link - Tomcat 5, Cocoon 2/li +lilink href=http://www.jspzone.net/;JSPZone Web Hosting/link - Tomcat 4/5, Cocoon 2.1/li /ul pstrongFree .../strong/p
