cvs commit: cocoon-2.1/src/blocks/woody/samples/resources/htmlarea/popups makefile.xml
crossley2004/03/16 22:48:19 Modified:src/blocks/forms/samples/resources/htmlarea makefile.xml project-config.xml src/blocks/forms/samples/resources/htmlarea/images makefile.xml src/blocks/forms/samples/resources/htmlarea/lang makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/CSS makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/CSS/lang makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/ContextMenu makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/ContextMenu/lang makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/FullPage makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/img makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/lang makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/FullPage/popups makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker/img makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/SpellChecker/lang makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/TableOperations makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/TableOperations/img makefile.xml src/blocks/forms/samples/resources/htmlarea/plugins/TableOperations/lang makefile.xml src/blocks/forms/samples/resources/htmlarea/popups makefile.xml src/blocks/woody/samples/resources/htmlarea makefile.xml project-config.xml src/blocks/woody/samples/resources/htmlarea/images makefile.xml src/blocks/woody/samples/resources/htmlarea/lang makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/CSS makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/CSS/lang makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/ContextMenu/lang makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/FullPage makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/FullPage/img makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/FullPage/lang makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/FullPage/popups makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/SpellChecker makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/SpellChecker/img makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/SpellChecker/lang makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/TableOperations makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/TableOperations/img makefile.xml src/blocks/woody/samples/resources/htmlarea/plugins/TableOperations/lang makefile.xml src/blocks/woody/samples/resources/htmlarea/popups makefile.xml Log: Adding missing XML Declaration. Revision ChangesPath 1.2 +1 -0 cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/makefile.xml Index: makefile.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/htmlarea/makefile.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- makefile.xml 9 Mar 2004 10:33:59 - 1.1 +++ makefile.xml 17 Mar 2004 06:48:17 - 1.2 @@ -1,3 +1,4 @@ +?xml version=1.0?
cvs commit: cocoon-2.1/src/documentation/xdocs license.xml
crossley2004/03/17 01:09:49 Modified:src/documentation/xdocs license.xml Log: Add Apache License 2.0 to top of file. Change the content to AL-2.0 Revision ChangesPath 1.2 +218 -47 cocoon-2.1/src/documentation/xdocs/license.xml Index: license.xml === RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/license.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- license.xml 9 Mar 2003 00:07:35 - 1.1 +++ license.xml 17 Mar 2004 09:09:49 - 1.2 @@ -1,4 +1,19 @@ ?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 document PUBLIC -//APACHE//DTD Documentation V1.0//EN dtd/document-v10.dtd document @@ -10,54 +25,210 @@ /header body -s1 title=Apache Cocoon Public License +s1 title=Apache License source![CDATA[ - - The Apache Software License, Version 1.1 - - - Copyright (C) @year@ The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: This product includes software -developed by the Apache Software Foundation (http://www.apache.org/). -Alternately, this acknowledgment may appear in the software itself, if -and wherever such third-party acknowledgments normally appear. - - 4. The names Apache Cocoon and Apache Software Foundation must not be -used to endorse or promote products derived from this software without -prior written permission. For written permission, please contact -[EMAIL PROTECTED] - - 5. Products derived from this software may not be called Apache, nor may -Apache appear in their name, without prior written permission of the -Apache Software Foundation. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Apache Software Foundation and was originally created by - Stefano Mazzocchi [EMAIL PROTECTED]. For more information on the Apache - Software Foundation, please see http://www.apache.org/.]]/source + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/util/jxpath DOMFactory.java
cziegeler2004/03/17 01:29:15
Modified:.status.xml
src/java/org/apache/cocoon/util/jxpath DOMFactory.java
Log:
action dev=CZ type=fix fixes-bug=27681 due-to=Peter Brant
due-to-email=[EMAIL PROTECTED]
DOMFactory can now create a document element.
/action
Revision ChangesPath
1.284 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- status.xml16 Mar 2004 13:19:32 - 1.283
+++ status.xml17 Mar 2004 09:29:14 - 1.284
@@ -212,6 +212,9 @@
changes
release version=@version@ date=@date@
+ action dev=CZ type=fix fixes-bug=27681 due-to=Peter Brant
due-to-email=[EMAIL PROTECTED]
+ DOMFactory can now create a document element.
+ /action
action dev=CZ type=add
Databases: The xml-encoding for the SQLTransformer is now configurable.
/action
1.3 +25 -7
cocoon-2.1/src/java/org/apache/cocoon/util/jxpath/DOMFactory.java
Index: DOMFactory.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/jxpath/DOMFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMFactory.java 5 Mar 2004 13:03:01 - 1.2
+++ DOMFactory.java 17 Mar 2004 09:29:15 - 1.3
@@ -18,6 +18,7 @@
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -44,20 +45,18 @@
//FIXME: JXPath automatically creates attributes if the element
already exists,
//but does not call this method if the element does not exit
-addDOMElement((Element) parent, index, name);
+addDOMElement((Node) parent, index, name);
return true;
}
-private void addDOMElement(Element parent, int index, String tag) {
+private void addDOMElement(Node parent, int index, String tag) {
int pos = tag.indexOf(':');
String prefix = null;
if (pos != -1) {
prefix = tag.substring(0, pos);
}
-String uri = getNamespaceURI(parent, prefix);
-
-//System.out.println(Found namespace ' + uri + ' for tag + tag);
+String uri = null;
Node child = parent.getFirstChild();
int count = 0;
@@ -68,9 +67,28 @@
child = child.getNextSibling();
}
+Document doc = parent.getOwnerDocument();
+
+if (doc != null) {
+uri = getNamespaceURI((Element)parent, prefix);
+} else {
+if (parent instanceof Document) {
+doc = (Document)parent;
+if (prefix != null) {
+throw new RuntimeException(Cannot map non-null prefix
+
+when creating a document element);
+}
+} else { // Shouldn't happen (must be a DocumentType object)
+throw new RuntimeException(Node of class +
+parent.getClass().getName() + has null owner document
+
+but is not a Document);
+}
+
+}
+
// Keep inserting new elements until we have index + 1 of them
while (count = index) {
-Node newElement = parent.getOwnerDocument().createElementNS(uri,
tag);
+Node newElement = doc.createElementNS(uri, tag);
parent.appendChild(newElement);
count++;
}
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/util/jxpath DOMFactory.java
cziegeler2004/03/17 01:35:35
Modified:src/java/org/apache/cocoon/util/jxpath DOMFactory.java
Log:
action dev=CZ type=fix fixes-bug=27681 due-to=Peter Brant
due-to-email=[EMAIL PROTECTED]
DOMFactory can now create a document element.
/action
Revision ChangesPath
1.3 +25 -7
cocoon-2.2/src/java/org/apache/cocoon/util/jxpath/DOMFactory.java
Index: DOMFactory.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/util/jxpath/DOMFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMFactory.java 8 Mar 2004 14:04:01 - 1.2
+++ DOMFactory.java 17 Mar 2004 09:35:35 - 1.3
@@ -18,6 +18,7 @@
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -44,20 +45,18 @@
//FIXME: JXPath automatically creates attributes if the element
already exists,
//but does not call this method if the element does not exit
-addDOMElement((Element) parent, index, name);
+addDOMElement((Node) parent, index, name);
return true;
}
-private void addDOMElement(Element parent, int index, String tag) {
+private void addDOMElement(Node parent, int index, String tag) {
int pos = tag.indexOf(':');
String prefix = null;
if (pos != -1) {
prefix = tag.substring(0, pos);
}
-String uri = getNamespaceURI(parent, prefix);
-
-//System.out.println(Found namespace ' + uri + ' for tag + tag);
+String uri = null;
Node child = parent.getFirstChild();
int count = 0;
@@ -68,9 +67,28 @@
child = child.getNextSibling();
}
+Document doc = parent.getOwnerDocument();
+
+if (doc != null) {
+uri = getNamespaceURI((Element)parent, prefix);
+} else {
+if (parent instanceof Document) {
+doc = (Document)parent;
+if (prefix != null) {
+throw new RuntimeException(Cannot map non-null prefix
+
+when creating a document element);
+}
+} else { // Shouldn't happen (must be a DocumentType object)
+throw new RuntimeException(Node of class +
+parent.getClass().getName() + has null owner document
+
+but is not a Document);
+}
+
+}
+
// Keep inserting new elements until we have index + 1 of them
while (count = index) {
-Node newElement = parent.getOwnerDocument().createElementNS(uri,
tag);
+Node newElement = doc.createElementNS(uri, tag);
parent.appendChild(newElement);
count++;
}
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/javascript request.xsl response.xsl session.xsl xsp.xsl
crossley2004/03/17 03:28:22 Modified:src/blocks/databases/java/org/apache/cocoon/acting/modular package.html src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java esql.xsl src/blocks/databases/java/org/apache/cocoon/components/modules/database package.html src/blocks/deli/WEB-INF/deli/config/vocab ccppschema-2405.rdfs ccppschema-20010111.rdfs ccppschema-20010330.rdfs ccppschema-20010430.rdfs ccppschema-20020710.rdfs ccppschema-20021212.rdfs ccppschema-20030226.rdfs src/blocks/deli/WEB-INF/deli/legacyProfiles Alcatel_OT301.rdf Alcatel_OT311.rdf Alcatel_OT501.rdf Alcatel_OT511.rdf Alcatel_OT512.rdf Ericsson_A2628.rdf Ericsson_P800.rdf Ericsson_R320.rdf Ericsson_R380.rdf Ericsson_R520.rdf Ericsson_R600.rdf Ericsson_T20.rdf Ericsson_T20e.rdf Ericsson_T39.rdf Ericsson_T65.rdf Ericsson_T68R1.rdf Motorola_A008.rdf Motorola_P7389.rdf Motorola_T191.rdf Motorola_T192.rdf Motorola_T2288.rdf Motorola_T280.rdf Motorola_Ti250.rdf Motorola_Ti260.rdf Motorola_V2288.rdf Motorola_V50.rdf Motorola_V66.rdf Mozilla_099.rdf NEC_21i.rdf Nokia_3330.rdf Nokia_3360.rdf Nokia_3410.rdf Nokia_3510.rdf Nokia_3590.rdf Nokia_5210.rdf Nokia_5510.rdf Nokia_6210.rdf Nokia_6250.rdf Nokia_6310.rdf Nokia_6310i.rdf Nokia_6340.rdf Nokia_6510.rdf Nokia_6590.rdf Nokia_7110.rdf Nokia_7110_4.94.rdf Nokia_7210.rdf Nokia_7650.rdf Nokia_8310.rdf Nokia_8390.rdf Nokia_8910.rdf Nokia_9110i.rdf Nokia_9210_WML.rdf Opera_512_NT40.rdf Siemens_C35i.rdf Siemens_S35.rdf Siemens_S45.rdf Sony_CMD-Z5.rdf Trium_Eclipse.rdf amaya.rdf blank.rdf mozilla.rdf msie.rdf nokia.rdf opera.rdf src/blocks/linkrewriter/samples/bookdemo/docs index.html overview.html src/blocks/linkrewriter/samples/bookdemo/docs/installing index.html src/blocks/lucene/java/org/apache/cocoon/components/search package.html src/blocks/mail/java/org/apache/cocoon/components/language/markup/xsp/java sendmail.xsl src/blocks/ojb/samples/forms employee.xml employee_bind.xml employee_template.xml src/blocks/ojb/samples/jdo/xsp demo1.xsp src/blocks/ojb/samples/odmg/xsp demo1.xsp src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp/python xsp.xsl src/blocks/scratchpad/java/org/apache/cocoon/components/store default.ccf transient.ccf src/blocks/scratchpad/samples/module-source form2.html form4.html src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java session-fw.xsl src/blocks/web3/samples/dtd rfc-in.dtd rfc-out.dtd src/blocks/xsp/conf xsp-markup.xconf xsp-program-generator.xconf xsp-program-language.xconf xsp-xscript.xconf xsp.xsamples src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java action.xsl capture.xsl cookie.xsl form-validator.xsl input.xsl log.xsl logicsheet-util.xsl request.xsl response.xsl sel.xsl session.xsl soap.xsl util.xsl xscript-lib.xsl xscript.xsl xsp.xsl src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/javascript request.xsl response.xsl session.xsl xsp.xsl Added: src/blocks/slide README.txt Removed: src/blocks/slide README Log: Add Apache License 2.0 Revision ChangesPath 1.2 +15 -0 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/modular/package.html http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/modular/package.html.diff?r1=1.1r2=1.2 1.9 +13 -50 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/xml XMLUtils.java
cziegeler2004/03/17 03:50:21
Modified:src/java/org/apache/cocoon/transformation
CIncludeTransformer.java
AbstractSAXTransformer.java
src/java/org/apache/cocoon/xml XMLUtils.java
Log:
Don't use hard-coded encoding for serializing dom to string (addresses bug
26924)
Revision ChangesPath
1.10 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CIncludeTransformer.java 5 Mar 2004 13:02:59 - 1.9
+++ CIncludeTransformer.java 17 Mar 2004 11:50:21 - 1.10
@@ -290,7 +290,7 @@
// parameter value
} else if (name.equals(CINCLUDE_VALUE_ELEMENT)
this.state == STATE_INCLUDE) {
-
this.startSerializedXMLRecording(XMLUtils.defaultSerializeToXMLFormat(true));
+
this.startSerializedXMLRecording(XMLUtils.createPropertiesForXML(true));
} else if (name.equals(CINCLUDE_CACHED_INCLUDE_ELEMENT)) {
1.11 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Index: AbstractSAXTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractSAXTransformer.java 5 Mar 2004 13:02:59 - 1.10
+++ AbstractSAXTransformer.java 17 Mar 2004 11:50:21 - 1.11
@@ -476,7 +476,7 @@
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug(BEGIN startSerializedXMLRecording
format=+format);
}
-this.stack.push((format == null ?
XMLUtils.defaultSerializeToXMLFormat() : format));
+this.stack.push((format == null ?
XMLUtils.createPropertiesForXML(false) : format));
this.startRecording();
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug(END startSerializedXMLRecording);
@@ -628,7 +628,7 @@
if (this.getLogger().isDebugEnabled()) {
Object serializedXML = null;
try {
-serializedXML = (recordedDocFrag == null ? null :
XMLUtils.serializeNodeToXML(recordedDocFrag));
+serializedXML = (recordedDocFrag == null ? null :
XMLUtils.serializeNode(recordedDocFrag,
XMLUtils.createPropertiesForXML(false)));
} catch (ProcessingException ignore) {
serializedXML = recordedDocFrag;
}
1.7 +27 -8 cocoon-2.1/src/java/org/apache/cocoon/xml/XMLUtils.java
Index: XMLUtils.java
===
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/XMLUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLUtils.java 5 Mar 2004 13:03:01 - 1.6
+++ XMLUtils.java 17 Mar 2004 11:50:21 - 1.7
@@ -122,10 +122,14 @@
* @return an codeXMLConsumer/code for codech/code an
codelh/code
*/
public static XMLConsumer getConsumer(ContentHandler ch, LexicalHandler
lh) {
-if (ch instanceof XMLConsumer)
+if (ch instanceof XMLConsumer) {
return (XMLConsumer)ch;
-else
+} else {
+if ( lh == null ch instanceof LexicalHandler ) {
+lh = (LexicalHandler)ch;
+}
return new ContentHandlerWrapper(ch, lh);
+}
}
/**
@@ -143,6 +147,7 @@
/**
* Serialize a DOM node to a String.
* The defaultSerializeToXMLFormat() is used to format the serialized
xml.
+ * @deprecated use serializeNode(Node, Properties) instead
*/
public static String serializeNodeToXML(Node node)
throws ProcessingException {
@@ -157,6 +162,7 @@
* Encoding: ISO-8859-1
* Omit xml declaration: no
* Indent: yes
+ * @deprecated Use createPropertiesForXML(false) instead and add the
encoding
*/
public static Properties defaultSerializeToXMLFormat() {
return defaultSerializeToXMLFormat(false);
@@ -170,17 +176,30 @@
* Encoding: ISO-8859-1
* Omit xml declaration: according to the flag
* Indent: yes
+ * @deprecated Use createPropertiesForXML(boolean) instead and add the
encoding
*/
public static Properties defaultSerializeToXMLFormat(boolean
omitXMLDeclaration) {
-Properties format = new
cvs commit: cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components PipelineAuthenticator.java
cziegeler2004/03/17 04:09:52
Modified:
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components
DefaultSessionManager.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components
PortalManagerImpl.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/transformation
SessionPostTransformer.java
src/java/org/apache/cocoon/components/source SourceUtil.java
src/java/org/apache/cocoon/transformation
SourceWritingTransformer.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/generation
ConfigurationGenerator.java
src/java/org/apache/cocoon/xml/dom DocumentWrapper.java
src/blocks/webdav/java/org/apache/cocoon/transformation
DASLTransformer.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
PipelineAuthenticator.java
Log:
Don't use deprecated methods
Revision ChangesPath
1.6 +5 -5
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java
Index: DefaultSessionManager.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultSessionManager.java5 Mar 2004 13:02:22 - 1.5
+++ DefaultSessionManager.java17 Mar 2004 12:09:51 - 1.6
@@ -182,7 +182,7 @@
frag = context.getXML(path);
if (this.getLogger().isDebugEnabled() ) {
-this.getLogger().debug(END getContextFragment
documentFragment= + (frag == null ? null :
XMLUtils.serializeNodeToXML(frag)));
+this.getLogger().debug(END getContextFragment
documentFragment= + (frag == null ? null : XMLUtils.serializeNode(frag,
XMLUtils.createPropertiesForXML(false;
}
return frag;
}
@@ -248,7 +248,7 @@
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug(BEGIN setContextFragment name= +
contextName + , path= + path +
- , fragment= + (fragment == null ? null :
XMLUtils.serializeNodeToXML(fragment)));
+ , fragment= + (fragment == null ? null :
XMLUtils.serializeNode(fragment, XMLUtils.createPropertiesForXML(false;
}
// test arguments
if (contextName == null) {
@@ -294,7 +294,7 @@
if (this.getLogger().isDebugEnabled() ) {
this.getLogger().debug(BEGIN appendContextFragment name= +
contextName +
, path= + path +
- , fragment= + (fragment == null ? null :
XMLUtils.serializeNodeToXML(fragment)));
+ , fragment= + (fragment == null ? null :
XMLUtils.serializeNode(fragment, XMLUtils.createPropertiesForXML(false;
}
// test arguments
if (contextName == null) {
@@ -339,7 +339,7 @@
// synchronized via context
if (this.getLogger().isDebugEnabled() ) {
this.getLogger().debug(BEGIN mergeContextFragment name= +
contextName + , path= + path +
-, fragment= + (fragment == null ? null :
XMLUtils.serializeNodeToXML(fragment)));
+, fragment= + (fragment == null ? null :
XMLUtils.serializeNode(fragment, XMLUtils.createPropertiesForXML(false;
}
// test arguments
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortalManagerImpl.java5 Mar 2004 13:02:18 - 1.4
+++ PortalManagerImpl.java17 Mar 2004 12:09:51 - 1.5
@@ -752,7 +752,7 @@
}
if (this.getLogger().isDebugEnabled() ) {
-this.getLogger().debug(END getStatusProfile
statusProfile=+(statusProfile == null ? null :
XMLUtils.serializeNodeToXML(statusProfile)));
+this.getLogger().debug(END getStatusProfile
statusProfile=+(statusProfile == null ? null :
XMLUtils.serializeNode(statusProfile, XMLUtils.createPropertiesForXML(false;
}
return statusProfile;
}
@@ -4230,7 +4230,7 @@
}
if
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/source SourceUtil.java
cziegeler2004/03/17 04:26:59
Modified:src/java/org/apache/cocoon/xml XMLUtils.java
src/java/org/apache/cocoon/xml/dom DocumentWrapper.java
src/java/org/apache/cocoon/transformation
CIncludeTransformer.java
SourceWritingTransformer.java
AbstractSAXTransformer.java
src/java/org/apache/cocoon/components/source SourceUtil.java
Log:
Don't use hard-coded encoding for serializing dom to string (addresses bug
26924)
Revision ChangesPath
1.6 +24 -45cocoon-2.2/src/java/org/apache/cocoon/xml/XMLUtils.java
Index: XMLUtils.java
===
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/XMLUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLUtils.java 8 Mar 2004 14:04:00 - 1.5
+++ XMLUtils.java 17 Mar 2004 12:26:59 - 1.6
@@ -122,10 +122,14 @@
* @return an codeXMLConsumer/code for codech/code an
codelh/code
*/
public static XMLConsumer getConsumer(ContentHandler ch, LexicalHandler
lh) {
-if (ch instanceof XMLConsumer)
+if (ch instanceof XMLConsumer) {
return (XMLConsumer)ch;
-else
+} else {
+if ( lh == null ch instanceof LexicalHandler ) {
+lh = (LexicalHandler)ch;
+}
return new ContentHandlerWrapper(ch, lh);
+}
}
/**
@@ -141,45 +145,20 @@
}
/**
- * Serialize a DOM node to a String.
- * The defaultSerializeToXMLFormat() is used to format the serialized
xml.
- */
-public static String serializeNodeToXML(Node node)
-throws ProcessingException {
-return serializeNode(node, XMLUtils.defaultSerializeToXMLFormat());
-}
-
-/**
- * This is the default properties set used to serialize xml.
- * It is used by the serializeNodeToXML() method.
- * The format is as follows:
- * Method: xml
- * Encoding: ISO-8859-1
- * Omit xml declaration: no
- * Indent: yes
- */
-public static Properties defaultSerializeToXMLFormat() {
-return defaultSerializeToXMLFormat(false);
-}
-
-/**
- * This is the default properties set used to serialize xml.
- * It is used by the serializeNodeToXML() method.
+ * Create a new properties set for serializing xml
* The omit xml declaration property can be controlled by the flag.
* Method: xml
- * Encoding: ISO-8859-1
* Omit xml declaration: according to the flag
* Indent: yes
*/
-public static Properties defaultSerializeToXMLFormat(boolean
omitXMLDeclaration) {
-Properties format = new Properties();
+public static Properties createPropertiesForXML(boolean
omitXMLDeclaration) {
+final Properties format = new Properties();
format.put(OutputKeys.METHOD, xml);
-format.put(OutputKeys.ENCODING, ISO-8859-1);
format.put(OutputKeys.OMIT_XML_DECLARATION, (omitXMLDeclaration ?
yes : no));
format.put(OutputKeys.INDENT, yes);
-return format;
+return format;
}
-
+
/**
* Serialize a DOM node to a String.
* The format of the output can be specified with the properties.
@@ -347,7 +326,7 @@
* @param localName The local name (without prefix)
* @exception org.xml.sax.SAXException Any SAX exception, possibly
*wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void createElement(ContentHandler contentHandler, String
localName)
throws SAXException {
@@ -363,7 +342,7 @@
* @param stringValue The content of the Element
* @exception org.xml.sax.SAXException Any SAX exception, possibly
*wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
*/
public static void createElement(ContentHandler contentHandler, String
localName, String stringValue)
throws SAXException {
@@ -381,7 +360,7 @@
*Attributes object.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
*wrapping another exception.
- * @see #endElement
+ * @see #endElement(ContentHandler, String)
* @see org.xml.sax.Attributes
*/
public static void createElement(ContentHandler contentHandler, String
localName, Attributes atts)
@@ -401,7 +380,7 @@
* @param stringValue The content of the Element
* @exception org.xml.sax.SAXException Any SAX exception, possibly
*wrapping another exception.
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/source SourceUtil.java
cziegeler2004/03/17 04:33:34
Modified:src/java/org/apache/cocoon/components/cprocessor
TreeProcessor.java
src/java/org/apache/cocoon/transformation
AbstractSAXTransformer.java
src/java/org/apache/cocoon/components/source SourceUtil.java
Log:
Don't use hard-coded encoding for serializing dom to string (addresses bug
26924)
Revision ChangesPath
1.24 +1 -1
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java
Index: TreeProcessor.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TreeProcessor.java12 Mar 2004 14:59:27 - 1.23
+++ TreeProcessor.java17 Mar 2004 12:33:34 - 1.24
@@ -362,7 +362,7 @@
parser.parse(SourceUtil.getInputSource(source), pipe);
if ( domBuilder != null ) {
this.getLogger().debug(Configuration from sitemap: +
this.m_source.getURI());
-
this.getLogger().debug(XMLUtils.serializeNodeToXML(domBuilder.getDocument()));
+
this.getLogger().debug(XMLUtils.serializeNode(domBuilder.getDocument(),
XMLUtils.createPropertiesForXML(false)));
}
Configuration config = configHandler.getConfiguration();
1.12 +3 -1
cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Index: AbstractSAXTransformer.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractSAXTransformer.java 17 Mar 2004 12:26:59 - 1.11
+++ AbstractSAXTransformer.java 17 Mar 2004 12:33:34 - 1.12
@@ -31,10 +31,12 @@
import org.apache.cocoon.transformation.helpers.ParametersRecorder;
import org.apache.cocoon.transformation.helpers.TextRecorder;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.SaxBuffer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.xml.sax.XMLizable;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
1.15 +4 -1
cocoon-2.2/src/java/org/apache/cocoon/components/source/SourceUtil.java
Index: SourceUtil.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/SourceUtil.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SourceUtil.java 17 Mar 2004 12:26:59 - 1.14
+++ SourceUtil.java 17 Mar 2004 12:33:34 - 1.15
@@ -20,6 +20,9 @@
import java.io.OutputStream;
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
+
+import javax.xml.transform.OutputKeys;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
cvs commit: cocoon-2.1/src/blocks/scratchpad/conf ehstore.xconf
unico 2004/03/17 07:00:41
Modified:src/blocks/scratchpad/java/org/apache/cocoon/components/store
EHStore.java
src/blocks/scratchpad/conf ehstore.xconf
Added: src/blocks/scratchpad/java/org/apache/cocoon/components/store
ehcache-defaults.xml
Log:
default configuration and documentation
Revision ChangesPath
1.3 +47 -7
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/EHStore.java
Index: EHStore.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/EHStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EHStore.java 8 Mar 2004 22:44:51 - 1.2
+++ EHStore.java 17 Mar 2004 15:00:41 - 1.3
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.io.Serializable;
+import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
@@ -38,8 +39,15 @@
* Store implementation based on EHCache.
* (http://ehcache.sourceforge.net/)
*
- * TODO: CacheManager expects to be a singleton. So configuring
- * multiple EHStore intances could lead to errors.
+ * p
+ * IMPORTANT:br
+ * (from http://ehcache.sourceforge.net/documentation/)
+ * Persistence:
+ * The Disk Cache used by EHCache is not meant to be persistence mechanism.
+ * The data file for each cache is deleted, if it exists, on startup.
+ * No data from a previous instance of an application is persisted through
the disk cache.
+ * The data file for each cache is also deleted on shutdown.
+ * /p
*/
public class EHStore extends AbstractLogEnabled
implements Store, Parameterizable, Initializable, Disposable, ThreadSafe {
@@ -47,30 +55,62 @@
private Cache m_cache;
private CacheManager m_cacheManager;
+// configuration options
private String m_cacheName;
private int m_maximumSize;
private boolean m_overflowToDisk;
+private String m_configFile;
+
+// lifecycle
public EHStore() {
}
+/**
+ * Configure the store. The following options can be used:
+ * ul
+ * licodecache-name/code (main) - When configuring multiple
+ * EHStore intances you must specify a different name for each./li
+ * licodemaxobjects/code (1) - The maximum number of
in-memory objects./li
+ * licodeoverflow-to-disk/disk (true) - Whether to spool elements
to disk after
+ * maxobjects has been exceeded.
+ * licodeconfig-file/code
(org/apache/cocoon/components/store/ehcache-defaults.xml) -
+ * The default configuration file to use. This file is the only way to
specify the path where
+ * the disk store puts its .cache files. The current default value is
codejava.io.tmp/code.
+ * (On a standard Linux system this will be /tmp). Note that since the
EHCache manager is
+ * a singleton object the value of this parameter will only have
effect when this store is the
+ * first to create it. Configuring different stores with different
values for this parameter
+ * will have no effect.
+ * /ul
+ */
public void parameterize(Parameters parameters) throws
ParameterException {
-m_cacheName = parameters.getParameter(cache-name,main);
-m_maximumSize = parameters.getParameterAsInteger(maxobjects,100);
-m_overflowToDisk =
parameters.getParameterAsBoolean(overflow-to-disk,true);
+m_cacheName = parameters.getParameter(cache-name, main);
+m_maximumSize = parameters.getParameterAsInteger(maxobjects,
1);
+m_overflowToDisk =
parameters.getParameterAsBoolean(overflow-to-disk, true);
+m_configFile = parameters.getParameter(config-file,
+org/apache/cocoon/components/store/ehcache-defaults.xml);
}
+/**
+ * Initialize the CacheManager and created the Cache.
+ */
public void initialize() throws Exception {
-m_cacheManager = CacheManager.create();
-m_cache = new
Cache(m_cacheName,m_maximumSize,m_overflowToDisk,true,0,0);
+URL configFile =
Thread.currentThread().getContextClassLoader().getResource(m_configFile);
+m_cacheManager = CacheManager.create(configFile);
+m_cache = new Cache(m_cacheName, m_maximumSize, m_overflowToDisk,
true, 0, 0);
m_cacheManager.addCache(m_cache);
}
+/**
+ * Shutdown the CacheManager.
+ */
public void dispose() {
m_cacheManager.shutdown();
m_cacheManager = null;
m_cache = null;
}
+
+//
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/xml ParamSaxBuffer.java
vgritsenko2004/03/17 08:20:08
Modified:src/java/org/apache/cocoon/xml ParamSaxBuffer.java
Log:
it seems to me condition was wrong here
Revision ChangesPath
1.4 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java
Index: ParamSaxBuffer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParamSaxBuffer.java 5 Mar 2004 13:03:01 - 1.3
+++ ParamSaxBuffer.java 17 Mar 2004 16:20:08 - 1.4
@@ -51,7 +51,7 @@
* substitution.
*/
public void characters(char ch[], int start, int length) throws
SAXException {
-int end = start + length;
+final int end = start + length;
for (int i = start; i end; i++) {
if (ch[i] == '{') {
// Send any collected characters so far
@@ -68,7 +68,7 @@
}
name.append(ch[j]);
}
-if (j == length) {
+if (j == end) {
throw new SAXException(Unclosed '}');
}
addBit(new Parameter(name.toString()));
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/xml ParamSaxBuffer.java
vgritsenko2004/03/17 08:37:18
Modified:src/java/org/apache/cocoon/xml ParamSaxBuffer.java
Log:
sync with 2.1: it seems to me condition was wrong here
Revision ChangesPath
1.3 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java
Index: ParamSaxBuffer.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/ParamSaxBuffer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParamSaxBuffer.java 8 Mar 2004 14:04:00 - 1.2
+++ ParamSaxBuffer.java 17 Mar 2004 16:37:18 - 1.3
@@ -26,7 +26,7 @@
*
* Any code{name}/code expression inside of the character events can be
* replaced by the content of another SaxBuffer if it is present in the map
- * passed to the [EMAIL PROTECTED] toSAX(ContentHandler, Map)} method.
+ * passed to the [EMAIL PROTECTED] #toSAX(ContentHandler, Map)} method.
*
* @author a href=mailto:[EMAIL PROTECTED]Vadim Gritsenko/a
* @version CVS $Id$
@@ -51,7 +51,7 @@
* substitution.
*/
public void characters(char ch[], int start, int length) throws
SAXException {
-int end = start + length;
+final int end = start + length;
for (int i = start; i end; i++) {
if (ch[i] == '{') {
// Send any collected characters so far
@@ -68,7 +68,7 @@
}
name.append(ch[j]);
}
-if (j == length) {
+if (j == end) {
throw new SAXException(Unclosed '}');
}
addBit(new Parameter(name.toString()));
cvs commit: cocoon-2.1/src/webapp/stylesheets/system xmlform2html.xslt
tcurdt 2004/03/17 09:18:04 Removed: src/blocks/xmlform/samples samples.xml sitemap.xmap src/blocks/xmlform/samples/schematron wizard-xmlform-sch-report.xml src/blocks/xmlform/samples/stylesheets wizard2page.xsl src/blocks/xmlform/samples/webservice error.xml ok.xml usagefeedback.wsdl src/blocks/xmlform/samples/wizard Readme.txt confirm.xml deployment.xml end.xml start.xml system.xml userIdentity.xml src/blocks/xmlform/test/org/apache/cocoon/components/validation ZNestedBean.java ZTestBean.java ZValidationTest.java zxmlform-sch-report-test.xml src/blocks/xmlform/test/org/apache/cocoon/components/xmlform TestBean.java TestXMLFormAction.java XMLFormTestCase.java XMLFormTestCase.xtest testform1.xml testform2.xml testresult1.xml testresult2.xml testschema.xml src/documentation/xdocs/howto howto-i18n-xmlform.xml howto-xindice-xmlform.xml src/documentation/xdocs/howto/xmlform-wizard book.xml howto-xmlform-wizard-1.xml howto-xmlform-wizard-2.xml howto-xmlform-wizard-3.xml howto-xmlform-wizard-4.xml howto-xmlform-wizard-5.xml howto-xmlform-wizard.xml src/documentation/xdocs/userdocs/concepts xmlform.xml src/documentation/xdocs/userdocs/flow jxforms.xml src/webapp/stylesheets/system xmlform2html.xslt Log: removed xmlform and jxforms block including it's documentation, hope I got everything and nothing is left broken
cvs commit: cocoon-2.1/src/blocks/slide/samples flow.js sitemap.xmap
unico 2004/03/17 09:27:59
Modified:src/blocks/slide/java/org/apache/cocoon/samples/slide
AdminHelper.java
src/blocks/slide/samples/styles locks2html.xsl
content2html.xsl
src/blocks/slide/samples flow.js sitemap.xmap
Log:
- fix content and properties viewing and path resolving
- make adding locks easier by providing list of options for type and subject
Revision ChangesPath
1.7 +5 -2
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/samples/slide/AdminHelper.java
Index: AdminHelper.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/samples/slide/AdminHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AdminHelper.java 5 Mar 2004 13:02:23 - 1.6
+++ AdminHelper.java 17 Mar 2004 17:27:59 - 1.7
@@ -559,14 +559,17 @@
String path,
String subject,
String type,
+ String expiration,
String exclusive,
String inherit) throws Exception {
String uri = getUriFromPath(nat,path);
boolean isExclusive = Boolean.valueOf(exclusive).booleanValue();
boolean isInherit = Boolean.valueOf(inherit).booleanValue();
- // expires after one minute
- Date expire = new Date(System.currentTimeMillis() + 1000*60);
+
+ // expiration in minutes
+ int intExpiration = Integer.valueOf(expiration).intValue();
+ Date expire = new Date(System.currentTimeMillis() +
intExpiration*1000*60);
SlideToken slideToken = new SlideTokenImpl(new
CredentialsToken(caller));
Lock lock = nat.getLockHelper();
1.3 +41 -6 cocoon-2.1/src/blocks/slide/samples/styles/locks2html.xsl
Index: locks2html.xsl
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/samples/styles/locks2html.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locks2html.xsl6 Mar 2004 02:25:51 - 1.2
+++ locks2html.xsl17 Mar 2004 17:27:59 - 1.3
@@ -26,6 +26,11 @@
xsl:param name=path/
xsl:param name=typelocks/xsl:param
+ xsl:param name=userspath/
+ xsl:param name=rolespath/
+ xsl:param name=groupspath/
+ xsl:param name=actionspath/
+
xsl:template name=middle
column title=Locks
table bgcolor=#ff border=0 cellspacing=0 cellpadding=2
width=100% align=center
@@ -38,7 +43,7 @@
bType/b
/td
td align=left
- bExpiration/b
+ bExpiration (mins)/b
/td
td align=left
bInheritable/b
@@ -79,13 +84,43 @@
form action={$base}/addlock method=post
input type=hidden name=resourcePath value={$path}/
td align=left
-input name=subject type=text size=20 maxlength=40/
+select name=subject
+ optionself/option
+ optionowner/option
+ optionauthenticated/option
+ optionunauthenticated/option
+ optionall/option
+ xsl:for-each select=/document/roles/role
+xsl:variable name=roleuri select=uri/text() /
+xsl:variable name=rolename
select=substring-after($roleuri,concat($rolespath,'/'))/
+option value={$roleuri}
+ role: xsl:value-of select=$rolename/
+/option
+ /xsl:for-each
+ xsl:for-each select=/document/users/user
+xsl:variable name=useruri select=uri/text() /
+xsl:variable name=username
select=substring-after($useruri,concat($userspath,'/'))/
+option value={$useruri}
+ user: xsl:value-of select=$username/
+/option
+ /xsl:for-each
+/select
+ /td
+ td align=left
+select name=type
+ optionall/option
+ optiondefault/option
+ xsl:for-each select=/document/privileges/privilege
+xsl:variable name=actionuri select=uri/text() /
+xsl:variable name=actionname
select=substring-after($actionuri,concat($actionspath,'/'))/
+option value={$actionuri}
+ xsl:value-of select=$actionname/
+/option
+
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/03/17 10:48:49
Modified:tools/src blocks-build.xsl
Log:
Changing the order decreases the build time on my system by 30%!
Revision ChangesPath
1.53 +13 -13cocoon-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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- blocks-build.xsl 16 Mar 2004 14:27:35 - 1.52
+++ blocks-build.xsl 17 Mar 2004 18:48:49 - 1.53
@@ -382,19 +382,6 @@
target name={$block-name}-compile
depends={$block-name}-build,{$block-name}-prepare,{$block-name}-mocks
- copy filtering=on todir=${{build.blocks}}/{$block-name}/dest
-fileset dir=${{blocks}}/{$block-name}/java
- patternset refid=unprocessed.sources/
-/fileset
- /copy
-
- copy filtering=off todir=${{build.blocks}}/{$block-name}/dest
-fileset dir=${{blocks}}/{$block-name}/java
- include name=**/Manifest.mf/
- include name=META-INF/**/
-/fileset
- /copy
-
!-- This is a little bit tricky:
As the javac task checks, if a src directory is available and
stops if its not available, we use the following property
@@ -426,6 +413,19 @@
classpath refid=classpath/
exclude name=**/samples/**/*.java/
/javac
+
+ copy filtering=on todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ patternset refid=unprocessed.sources/
+/fileset
+ /copy
+
+ copy filtering=off todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ include name=**/Manifest.mf/
+ include name=META-INF/**/
+/fileset
+ /copy
jar jarfile=${{build.blocks}}/{$block-name}-block.jar index=true
fileset dir=${{build.blocks}}/{$block-name}/dest
cvs commit: cocoon-2.1/legal ant-contrib-0.6.jar.license.txt
cziegeler2004/03/17 11:15:08
Modified:tools/targets init-build.xml
tools/src blocks-build.xsl
Added: tools/lib ant-contrib-0.6.jar
legalant-contrib-0.6.jar.license.txt
Log:
Improving build time by start using ant-contrib if task instead of antcall
Revision ChangesPath
1.1 cocoon-2.1/tools/lib/ant-contrib-0.6.jar
Binary file
1.12 +2 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- init-build.xml16 Mar 2004 13:18:48 - 1.11
+++ init-build.xml17 Mar 2004 19:15:08 - 1.12
@@ -178,6 +178,8 @@
nowarn=on
compiler=${compiler}/
+!-- Ant-Contrib tasks --
+taskdef resource=net/sf/antcontrib/antcontrib.properties /
/target
!-- === Preparation Targets =
--
1.54 +34 -35cocoon-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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- blocks-build.xsl 17 Mar 2004 18:48:49 - 1.53
+++ blocks-build.xsl 17 Mar 2004 19:15:08 - 1.54
@@ -337,9 +337,19 @@
/xsl:if
!-- Test if this block has samples --
- available property={$block-name}.has.samples
file=${{blocks}}/{$block-name}/samples/sitemap.xmap/
-
- antcall target={$block-name}-samples/
+ if
+available file=${{blocks}}/{$block-name}/samples/sitemap.xmap/
+then
+ copy filtering=on
todir=${{build.webapp}}/samples/{$block-name}
+fileset dir=${{blocks}}/{$block-name}/samples/
+ /copy
+
+ !-- copy sample classes --
+ copy todir=${{build.webapp.classes}} filtering=off
+fileset dir=${{build.blocks}}/{$block-name}/samples/
+ /copy
+/then
+ /if
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
@@ -354,13 +364,30 @@
/xsl:if
!-- Test if this block has libraries --
- available property={$block-name}.has.lib type=dir
file=${{blocks}}/{$block-name}/lib//
+ if
+available type=dir file=${{blocks}}/{$block-name}/lib//
+then
+ copy filtering=off todir=${{build.webapp.lib}}
+fileset dir=${{blocks}}/{$block-name}/lib
+ include name=*.jar/
+ exclude name=servlet*.jar/
+/fileset
+ /copy
+/then
+ /if
!-- Test if this block has global WEB-INF files --
- available property={$block-name}.has.webinf type=dir
file=${{blocks}}/{$block-name}/WEB-INF//
+ if
+available type=dir file=${{blocks}}/{$block-name}/WEB-INF//
+then
+ copy filtering=on todir=${{build.webapp.webinf}}
+fileset dir=${{blocks}}/{$block-name}/WEB-INF/
+ include name=**/
+/fileset
+ /copy
+/then
+ /if
- antcall target={$block-name}-lib/
- antcall target={$block-name}-webinf/
/target
target name={$block-name}-prepare
unless=unless.exclude.block.{$block-name}
@@ -475,23 +502,6 @@
/javac
/target
-target name={$block-name}-lib if={$block-name}.has.lib
- copy filtering=off todir=${{build.webapp.lib}}
-fileset dir=${{blocks}}/{$block-name}/lib
- include name=*.jar/
- exclude name=servlet*.jar/
-/fileset
- /copy
-/target
-
-target name={$block-name}-webinf if={$block-name}.has.webinf
- copy filtering=on todir=${{build.webapp.webinf}}
-fileset dir=${{blocks}}/{$block-name}/WEB-INF/
- include name=**/
-/fileset
- /copy
-/target
-
target name={$block-name}-roles
unless=unless.exclude.block.{$block-name}
xpatch file=${{build.dest}}/org/apache/cocoon/cocoon.roles
srcdir=${{blocks}}
include name={$block-name}/conf/*.xroles/
@@ -511,17 +521,6 @@
xpatch file=${{build.webapp}}/WEB-INF/web.xml srcdir=${{blocks}}
include name={$block-name}/conf/*.xweb/
/xpatch
-/target
-
-target name={$block-name}-samples if={$block-name}.has.samples
- copy filtering=on todir=${{build.webapp}}/samples/{$block-name}
-fileset dir=${{blocks}}/{$block-name}/samples/
- /copy
-
- !-- copy sample classes --
- copy todir=${{build.webapp.classes}} filtering=off
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/03/17 11:30:29
Modified:tools/src blocks-build.xsl
Log:
Build time from 6:45 to 2:50 - and hopefully everything is still working...
Revision ChangesPath
1.55 +26 -36cocoon-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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- blocks-build.xsl 17 Mar 2004 19:15:08 - 1.54
+++ blocks-build.xsl 17 Mar 2004 19:30:29 - 1.55
@@ -298,11 +298,21 @@
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
- xsl:if test=depend
-xsl:attribute name=dependsxsl:value-of
select=@name/xsl:for-each
select=depend[contains(@project,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@project/-patch/xsl:for-each/xsl:attribute
- /xsl:if
+ xsl:attribute name=dependsxsl:value-of
select=$block-name/-preparexsl:if test=depend,xsl:value-of
select=@name/xsl:for-each
select=depend[contains(@project,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@project/-patch/xsl:for-each/xsl:if/xsl:attribute
- antcall target={$block-name}-patches/
+ xpatch file=${{build.webapp}}/sitemap.xmap srcdir=${{blocks}}
+include name={$block-name}/conf/*.xmap/
+ /xpatch
+ xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
+include name={$block-name}/conf/*.xconf/
+ /xpatch
+ xpatch file=${{build.webapp}}/WEB-INF/logkit.xconf
srcdir=${{blocks}}
+include name={$block-name}/conf/*.xlog/
+ /xpatch
+ xpatch file=${{build.webapp}}/WEB-INF/web.xml srcdir=${{blocks}}
+include name={$block-name}/conf/*.xweb/
+ /xpatch
+
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
@@ -310,7 +320,9 @@
xsl:attribute name=dependsxsl:value-of
select=@name/xsl:for-each
select=depend[contains(@project,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@project/-roles/xsl:for-each/xsl:attribute
/xsl:if
- antcall target={$block-name}-roles/
+ xpatch file=${{build.dest}}/org/apache/cocoon/cocoon.roles
srcdir=${{blocks}}
+include name={$block-name}/conf/*.xroles/
+ /xpatch
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
@@ -502,27 +514,6 @@
/javac
/target
-target name={$block-name}-roles
unless=unless.exclude.block.{$block-name}
- xpatch file=${{build.dest}}/org/apache/cocoon/cocoon.roles
srcdir=${{blocks}}
-include name={$block-name}/conf/*.xroles/
- /xpatch
-/target
-
-target name={$block-name}-patches depends={$block-name}-prepare
unless=unless.exclude.block.{$block-name}
- xpatch file=${{build.webapp}}/sitemap.xmap srcdir=${{blocks}}
-include name={$block-name}/conf/*.xmap/
- /xpatch
- xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
-include name={$block-name}/conf/*.xconf/
- /xpatch
- xpatch file=${{build.webapp}}/WEB-INF/logkit.xconf
srcdir=${{blocks}}
-include name={$block-name}/conf/*.xlog/
- /xpatch
- xpatch file=${{build.webapp}}/WEB-INF/web.xml srcdir=${{blocks}}
-include name={$block-name}/conf/*.xweb/
- /xpatch
-/target
-
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
xsl:if test=depend
xsl:attribute name=depends
@@ -585,16 +576,15 @@
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
!-- Test if this block has Anteater tests --
- available property={$block-name}.has.anteater-tests
file=${{blocks}}/{$block-name}/test/anteater/
-
- antcall target={$block-name}-prepare-anteater-tests/
-/target
-
-target name={$block-name}-prepare-anteater-tests
if={$block-name}.has.anteater-tests
- copy todir=${{build.test}}/anteater
-fileset
cvs commit: cocoon-2.1/tools/src cforms-repeater-syntax.xsl
joerg 2004/03/17 11:50:00 Modified:tools/src cforms-repeater-syntax.xsl Log: handling of convertor was missing Revision ChangesPath 1.5 +6 -3 cocoon-2.1/tools/src/cforms-repeater-syntax.xsl Index: cforms-repeater-syntax.xsl === RCS file: /home/cvs/cocoon-2.1/tools/src/cforms-repeater-syntax.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cforms-repeater-syntax.xsl13 Mar 2004 17:52:01 - 1.4 +++ cforms-repeater-syntax.xsl17 Mar 2004 19:50:00 - 1.5 @@ -15,7 +15,8 @@ limitations under the License. -- xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; - xmlns:fb=http://apache.org/cocoon/forms/1.0#binding; + xmlns:fb=http://apache.org/cocoon/forms/1.0#binding; + xmlns:fd=http://apache.org/cocoon/forms/1.0#definition; xsl:template match=node()|@* xsl:copy @@ -29,10 +30,12 @@ xsl:if test=@unique-row-id and @unique-path and not(fb:unique-row | fb:identity) fb:identity -fb:value id=[EMAIL PROTECTED] path=[EMAIL PROTECTED]/ +fb:value id=[EMAIL PROTECTED] path=[EMAIL PROTECTED] + xsl:apply-templates select=fd:convertor/ +/fb:value /fb:identity /xsl:if -xsl:apply-templates select=node()/ +xsl:apply-templates select=node()[not(self::fd:convertor)]/ /xsl:copy /xsl:template
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/03/17 11:51:14
Modified:tools/src blocks-build.xsl
Log:
Removed all antcalls - very fast build now (at least compared to the old
system)
Now, let the flame war begin (if something is not working)
Revision ChangesPath
1.56 +164 -158 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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- blocks-build.xsl 17 Mar 2004 19:30:29 - 1.55
+++ blocks-build.xsl 17 Mar 2004 19:51:14 - 1.56
@@ -269,21 +269,16 @@
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}/
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
- xsl:if test=depend
-xsl:attribute name=depends
+ xsl:attribute name=depends
+xsl:if test=depend
+ xsl:value-of select=$block-name/xsl:text-prepare,/xsl:text
xsl:value-of select=@name/,xsl:value-of
select=@name/-excludedxsl:text/
xsl:for-each select=$cocoon-block-dependencies
xsl:text,/xsl:text
xsl:value-of select=concat(@project, '-compile')/
/xsl:for-each
-/xsl:attribute
- /xsl:if
-
- !-- Test if this block has special build --
- available property={$block-name}.has.build
file=${{blocks}}/{$block-name}/build.xml/
-
- !-- Test if this block has mocks --
- available property={$block-name}.has.mocks type=dir
file=${{blocks}}/{$block-name}/mocks//
+/xsl:if
+ /xsl:attribute
xsl:if test=@status='unstable'
echo message= WARNING
===/
@@ -294,11 +289,119 @@
echo
message=/
/xsl:if
- antcall target={$block-name}-compile/
+ !-- Test if this block has special build --
+ if
+available file=${{blocks}}/{$block-name}/build.xml/
+then
+ ant inheritAll=true
+ inheritRefs=false
+ target=main
+ antfile=${{blocks}}/{$block-name}/build.xml
+property name=block.dir value=${{blocks}}/{$block-name}/
+ /ant
+/then
+ /if
+
+ !-- Test if this block has mocks --
+ if
+available type=dir file=${{blocks}}/{$block-name}/mocks//
+then
+ mkdir dir=${{build.blocks}}/{$block-name}/mocks/
+ javac srcdir=${{blocks}}/{$block-name}/mocks
+ destdir=${{build.blocks}}/{$block-name}/mocks
+ debug=${{compiler.debug}}
+ optimize=${{compiler.optimize}}
+ deprecation=${{compiler.deprecation}}
+ target=${{target.vm}}
+ nowarn=${{compiler.nowarn}}
+ compiler=${{compiler}}
+classpath refid=classpath/
+ /javac
+/then
+ /if
+
+ !-- This is a little bit tricky:
+ As the javac task checks, if a src directory is available and
+ stops if its not available, we use the following property
+ to either point to a jdk dependent directory or - if not
+ available - to the usual java source directory.
+ If someone knows a better solution...
+ --
+ !-- Currently, we have no JVM dependent sources
+ condition property=dependend.vm value=${{target.vm}}
+available file=${{blocks}}/{$block-name}/java${{target.vm}}/
+ /condition
+ condition property=dependend.vm value=
+not
+ available file=${{blocks}}/{$block-name}/java${{target.vm}}/
+/not
+ /condition
+ --
+ javac destdir=${{build.blocks}}/{$block-name}/dest
+ debug=${{compiler.debug}}
+ optimize=${{compiler.optimize}}
+ deprecation=${{compiler.deprecation}}
+ target=${{target.vm}}
+ nowarn=${{compiler.nowarn}}
+ compiler=${{compiler}}
+src path=${{blocks}}/{$block-name}/java/
+!-- Currently, we have no JVM dependent sources
+src path=${{blocks}}/{$block-name}/java${{dependend.vm}}/
+--
+classpath refid=classpath/
+exclude name=**/samples/**/*.java/
+ /javac
+
+ copy filtering=on todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ patternset refid=unprocessed.sources/
+/fileset
+ /copy
+
+ copy filtering=off todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ include name=**/Manifest.mf/
+ include
cvs commit: cocoon-2.1/src/webapp/samples/test/sendpage - New directory
unico 2004/03/17 11:53:25 cocoon-2.1/src/webapp/samples/test/sendpage - New directory
cvs commit: cocoon-2.1/src/webapp/samples/test/sendpage flow.js explain-test.xml sitemap.xmap
unico 2004/03/17 11:53:29
Added: src/webapp/samples/test/sendpage flow.js explain-test.xml
sitemap.xmap
Log:
test scenario for FOM sendpage bug: sendpage fails to send internal-only
pipelines
Revision ChangesPath
1.1 cocoon-2.1/src/webapp/samples/test/sendpage/flow.js
Index: flow.js
===
/*
* 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.
*/
function testSendPage() {
var page = cocoon.parameters[page];
cocoon.sendPage(page,null);
}
1.1
cocoon-2.1/src/webapp/samples/test/sendpage/explain-test.xml
Index: explain-test.xml
===
?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.
--
!-- CVS $Id: explain-test.xml,v 1.1 2004/03/17 19:53:29 unico Exp $ --
page
titlesendpage test/title
content
para
Test links:
ul
lilink href=testInternalfails/should pass/link/li
lilink href=testExternalpasses/should pass/link/li
/ul
/para
/content
/page
1.1 cocoon-2.1/src/webapp/samples/test/sendpage/sitemap.xmap
Index: sitemap.xmap
===
?xml version=1.0 encoding=UTF-8?
!--
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the License);
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an AS IS BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--
map:sitemap xmlns:map=http://apache.org/cocoon/sitemap/1.0;
map:flow language=javascript
map:script src=flow.js/
/map:flow
map:pipelines
map:pipeline internal-only=true
map:match pattern=internal
map:read src=sitemap.xmap/
/map:match
/map:pipeline
map:pipeline
map:match pattern=external
map:read src=sitemap.xmap/
/map:match
map:match pattern=testInternal
map:call function=testSendPage
map:parameter name=page value=internal/
/map:call
/map:match
map:match pattern=testExternal
map:call function=testSendPage
map:parameter name=page value=external/
/map:call
/map:match
/map:pipeline
/map:pipelines
/map:sitemap
cvs commit: cocoon-2.1/tools/src/anttasks XConfToolTask.java
cziegeler2004/03/17 12:04:18
Modified:tools/src/anttasks XConfToolTask.java
Log:
Improve performance by caching read documents
Revision ChangesPath
1.22 +36 -19cocoon-2.1/tools/src/anttasks/XConfToolTask.java
Index: XConfToolTask.java
===
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/XConfToolTask.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XConfToolTask.java16 Mar 2004 14:23:28 - 1.21
+++ XConfToolTask.java17 Mar 2004 20:04:18 - 1.22
@@ -42,7 +42,9 @@
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
/**
* Ant task to patch xmlfiles.
@@ -70,13 +72,16 @@
private static final String NL=System.getProperty(line.separator);
private static final String FSEP=System.getProperty(file.separator);
+
+/** Cache the read configuration files (Documents) */
+private static Map fileCache = new HashMap();
+
private File file;
//private File directory;
private File srcdir;
private boolean addComments;
/** for resolving entities such as dtds */
private XMLCatalog xmlCatalog = new XMLCatalog();
-private DocumentBuilderFactory builderFactory;
private DocumentBuilder builder;
private Transformer transformer;
@@ -119,8 +124,23 @@
* Initialize internal instance of XMLCatalog
*/
public void init() throws BuildException {
- super.init();
- xmlCatalog.setProject(project);
+super.init();
+try {
+xmlCatalog.setProject(project);
+DocumentBuilderFactory builderFactory =
DocumentBuilderFactory.newInstance();
+builderFactory.setValidating(false);
+builderFactory.setExpandEntityReferences(false);
+builderFactory.setNamespaceAware(false);
+builderFactory.setAttribute(
+
http://apache.org/xml/features/nonvalidating/load-external-dtd;,
+ Boolean.FALSE);
+builder = builderFactory.newDocumentBuilder();
+transformer = TransformerFactory.newInstance().newTransformer();
+} catch (TransformerException e) {
+throw new BuildException(TransformerException: +e);
+} catch (ParserConfigurationException e) {
+throw new BuildException(ParserConfigurationException: +e);
+}
}
/**
@@ -131,20 +151,18 @@
throw new BuildException(file attribute is required, location);
}
try {
-builderFactory = DocumentBuilderFactory.newInstance();
-builderFactory.setValidating(false);
-builderFactory.setExpandEntityReferences(false);
-builderFactory.setNamespaceAware(false);
-builderFactory.setAttribute(
-
http://apache.org/xml/features/nonvalidating/load-external-dtd;,
-Boolean.FALSE);
-builder = builderFactory.newDocumentBuilder();
-transformer = TransformerFactory.newInstance().newTransformer();
-
-// load xml
-log(Reading: + this.file, Project.MSG_DEBUG);
-final Document document =
builder.parse(this.file.toURL().toExternalForm());
+final String fileName = this.file.toURL().toExternalForm();
+Document document = (Document)this.fileCache.get(fileName);
+if ( document != null ) {
+log(Using file from cache: + this.file,
Project.MSG_DEBUG);
+this.fileCache.remove(fileName);
+} else {
+// load xml
+log(Reading: + this.file, Project.MSG_DEBUG);
+document = builder.parse(fileName);
+}
+
if (this.srcdir == null) {
this.srcdir = project.resolveFile(.);
}
@@ -216,14 +234,13 @@
} else {
log(No Changes: + this.file, Project.MSG_DEBUG);
}
+this.fileCache.put(fileName, document);
} catch (TransformerException e) {
throw new BuildException(TransformerException: +e);
} catch (SAXException e) {
throw new BuildException(SAXException: +e);
} catch (DOMException e) {
throw new BuildException(DOMException: +e);
-} catch (ParserConfigurationException e) {
-throw new BuildException(ParserConfigurationException: +e);
} catch (UnknownHostException e) {
throw new BuildException(UnknownHostException. Probable cause:
The parser is
cvs commit: cocoon-2.1/src/blocks/eventcache/conf eventcache.xconf eventregistry.xconf
cziegeler2004/03/17 12:09:35 Modified:src/blocks/eventcache/conf eventcache.xconf Removed: src/blocks/eventcache/conf eventregistry.xconf Log: Reduce number of configuration files Revision ChangesPath 1.6 +5 -0 cocoon-2.1/src/blocks/eventcache/conf/eventcache.xconf Index: eventcache.xconf === RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/conf/eventcache.xconf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eventcache.xconf 6 Mar 2004 02:25:38 - 1.5 +++ eventcache.xconf 17 Mar 2004 20:09:35 - 1.6 @@ -18,4 +18,9 @@ xconf xpath=/cocoon unless=[EMAIL PROTECTED]'org.apache.cocoon.caching.impl.EventAwareCacheImpl'] component role=org.apache.cocoon.caching.Cache/EventAware class=org.apache.cocoon.caching.impl.EventAwareCacheImpl/ +!-- The event registry which maps Cache events to Pipeline keys -- +!--component role=org.apache.cocoon.caching.EventRegistry + class=org.apache.cocoon.caching.impl.DefaultEventRegistryImpl/-- +component role=org.apache.cocoon.caching.EventRegistry + class=org.apache.cocoon.caching.impl.StoreEventRegistryImpl/ /xconf
cvs commit: cocoon-2.1/tools/targets upgrade-build.xml
joerg 2004/03/17 12:39:42 Modified:tools/targets upgrade-build.xml Log: fix timestamp: hour in day instead of hours in am/pm Revision ChangesPath 1.7 +1 -1 cocoon-2.1/tools/targets/upgrade-build.xml Index: upgrade-build.xml === RCS file: /home/cvs/cocoon-2.1/tools/targets/upgrade-build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- upgrade-build.xml 13 Mar 2004 03:46:21 - 1.6 +++ upgrade-build.xml 17 Mar 2004 20:39:42 - 1.7 @@ -20,7 +20,7 @@ /description tstamp -format property=timestamp pattern=MMdd_hhmmss/ +format property=timestamp pattern=MMdd_kkmmss/ /tstamp target
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor TreeProcessor.java
cziegeler2004/03/17 12:47:16
Modified:src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
Log:
Disable the recently changed behaviour of internal redirects as this
breaks flow redirects to internal pipelines :(
Revision ChangesPath
1.23 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TreeProcessor.java12 Mar 2004 14:57:59 - 1.22
+++ TreeProcessor.java17 Mar 2004 20:47:16 - 1.23
@@ -360,7 +360,7 @@
}
Environment newEnv = new ForwardEnvironmentWrapper(environment,
this.manager, uri, getLogger());
-((ForwardEnvironmentWrapper)newEnv).setExternal(true);
+//((ForwardEnvironmentWrapper)newEnv).setExternal(true);
if (facade != null) {
// Change the facade delegate
cvs commit: cocoon-2.2/tools/src/anttasks XConfToolTask.java
cziegeler2004/03/17 12:53:58
Modified:src/webapp/samples sitemap.xmap
src/java/org/apache/cocoon/components/cprocessor
TreeProcessor.java
tools/src/anttasks XConfToolTask.java
Added: src/webapp/samples/stylesheets sort-samples.xsl
Log:
Disabling new internal redirect handling
Sync XConfTask
Add sorting stylesheet for block samples
Revision ChangesPath
1.1
cocoon-2.2/src/webapp/samples/stylesheets/sort-samples.xsl
Index: sort-samples.xsl
===
?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.
--
!--+
| Sort groups in alphabetical order.
|
| CVS $Id: sort-samples.xsl,v 1.1 2004/03/17 20:53:58 cziegeler Exp $
+--
xsl:stylesheet version=1.0
xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
xsl:template match=samples
samples
xsl:apply-templates select=[EMAIL PROTECTED]'Back']/
xsl:for-each select=group[not(@name='Back')]
xsl:sort select=@name/
xsl:apply-templates select=./
/xsl:for-each
/samples
/xsl:template
xsl:template match=@*|node()
xsl:copy
xsl:apply-templates select=@*|node()/
/xsl:copy
/xsl:template
xsl:template match=text()
xsl:value-of select=./
/xsl:template
/xsl:stylesheet
1.21 +2 -1 cocoon-2.2/src/webapp/samples/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/sitemap.xmap,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sitemap.xmap 10 Mar 2004 16:26:19 - 1.20
+++ sitemap.xmap 17 Mar 2004 20:53:58 - 1.21
@@ -95,6 +95,7 @@
map:match pattern=blocks
map:generate src=block-samples.xml/
+map:transform src=stylesheets/sort-samples.xsl/
map:transform
src=context://samples/common/style/xsl/html/simple-samples2html.xsl
map:parameter name=contextPath value={request:contextPath}/
/map:transform
1.25 +1 -1
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java
Index: TreeProcessor.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TreeProcessor.java17 Mar 2004 12:33:34 - 1.24
+++ TreeProcessor.java17 Mar 2004 20:53:58 - 1.25
@@ -391,7 +391,7 @@
}
Environment newEnv = new ForwardEnvironmentWrapper(environment,
m_manager, uri, getLogger());
-((ForwardEnvironmentWrapper)newEnv).setExternal(true);
+//((ForwardEnvironmentWrapper)newEnv).setExternal(true);
if (facade != null) {
// Change the facade delegate
1.12 +94 -34cocoon-2.2/tools/src/anttasks/XConfToolTask.java
Index: XConfToolTask.java
===
RCS file: /home/cvs/cocoon-2.2/tools/src/anttasks/XConfToolTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XConfToolTask.java10 Mar 2004 09:08:25 - 1.11
+++ XConfToolTask.java17 Mar 2004 20:53:58 - 1.12
@@ -41,6 +41,10 @@
import java.io.File;
import java.io.IOException;
import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
* Ant task to patch xmlfiles.
@@ -68,12 +72,18 @@
private static final String NL=System.getProperty(line.separator);
private static final String FSEP=System.getProperty(file.separator);
+
+/** Cache the read configuration files (Documents) */
+private static Map fileCache = new HashMap();
+
private File file;
//private File directory;
private File srcdir;
private boolean addComments;
/** for resolving entities such as dtds */
private XMLCatalog xmlCatalog = new XMLCatalog();
+
cvs commit: cocoon-2.1/src/test/anteater internalSendPage.xml
unico 2004/03/17 13:10:24
Modified:src/test/anteater internalSendPage.xml
Log:
bug in test :-/, no more bug in cocoon :-)
Revision ChangesPath
1.2 +2 -2 cocoon-2.1/src/test/anteater/internalSendPage.xml
Index: internalSendPage.xml
===
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/internalSendPage.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- internalSendPage.xml 17 Mar 2004 20:20:18 - 1.1
+++ internalSendPage.xml 17 Mar 2004 21:10:24 - 1.2
@@ -24,13 +24,13 @@
target name=internal-sendpage-test
property name=internal-sendpage-test
value=${anteater.env.cocoon}/samples/test/sendpage/
-httpRequest href=${internal-sendpage-test}/external
+httpRequest href=${internal-sendpage-test}/testExternal
match
responseCode value=200/
/match
/httpRequest
-httpRequest href=${internal-sendpage-test}/internal
+httpRequest href=${internal-sendpage-test}/testInternal
match
responseCode value=200/
/match
cvs commit: cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search LuceneIndexContentHandler.java
joerg 2004/03/17 13:21:56
Modified:src/blocks/lucene/java/org/apache/cocoon/components/search
LuceneIndexContentHandler.java
Log:
removed useless JavaDoc ('description of parameter/ method')
Revision ChangesPath
1.6 +9 -110
cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java
Index: LuceneIndexContentHandler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LuceneIndexContentHandler.java6 Mar 2004 14:44:46 - 1.5
+++ LuceneIndexContentHandler.java17 Mar 2004 21:21:55 - 1.6
@@ -43,9 +43,11 @@
{
public static final String LUCENE_URI =
http://apache.org/cocoon/lucene/1.0;;
-/** If this attribute is specified on element, values of all attributes
- * if this element added to the text of the element, and to the document
- * body text */
+/**
+ * If this attribute is specified on element, values of all attributes
+ * are added to the text of the element, and to the document
+ * body text
+ */
public static final String LUCENE_ATTR_TO_TEXT_ATTRIBUTE = text-attr;
StringBuffer bodyText;
@@ -55,9 +57,7 @@
private HashSet fieldTags;
/**
- *Constructor for the LuceneIndexContentHandler object
- *
- * @since
+ * Constructor for the LuceneIndexContentHandler object
*/
public LuceneIndexContentHandler() {
this.bodyText = new StringBuffer();
@@ -69,56 +69,30 @@
}
/**
- *Sets the fieldTags attribute of the LuceneIndexContentHandler object
+ * Sets the fieldTags attribute of the LuceneIndexContentHandler object
*
* @param fieldTags The new fieldTags value
- * @since
*/
public void setFieldTags(HashSet fieldTags) {
this.fieldTags = fieldTags;
}
/**
- *Sets the documentLocator attribute of the LuceneIndexContentHandler
object
+ * Sets the documentLocator attribute of the LuceneIndexContentHandler
object
*
* @param locator The new documentLocator value
- * @since
*/
public void setDocumentLocator(Locator locator) { }
-
-/**
- *Description of the Method
- *
- * @returnDescription of the Returned Value
- * @since
- */
public List allDocuments() {
return documents;
}
-
-/**
- *Description of the Method
- *
- * @returnDescription of the Returned Value
- * @since
- */
public Iterator iterator() {
return documents.iterator();
}
-
-/**
- *Description of the Method
- *
- * @param ch Description of Parameter
- * @param start Description of Parameter
- * @param length Description of Parameter
- * @since
- */
public void characters(char[] ch, int start, int length) {
-
if (ch.length 0 start = 0 length 1) {
if (elementStack.size() 0) {
IndexHelperField tos = (IndexHelperField)
elementStack.peek();
@@ -129,28 +103,10 @@
}
}
-
-/**
- *Description of the Method
- *
- * @since
- */
public void endDocument() {
-/*
- * empty
- */
bodyDocument.add(Field.UnStored(LuceneXMLIndexer.BODY_FIELD,
bodyText.toString()));
}
-
-/**
- *Description of the Method
- *
- * @param namespaceURI Description of Parameter
- * @param localName Description of Parameter
- * @param qName Description of Parameter
- * @since
- */
public void endElement(String namespaceURI, String localName, String
qName) {
IndexHelperField tos = (IndexHelperField) elementStack.pop();
String lname = tos.getLocalFieldName();
@@ -174,7 +130,6 @@
}
if (text != null text.length() 0) {
-
if (isFieldTag(lname)) {
bodyDocument.add(Field.UnIndexed(lname,
text.toString()));
}
@@ -182,76 +137,21 @@
}
}
-
-/**
- *Description of the Method
- *
- * @param prefix Description of Parameter
- * @since
- */
public void endPrefixMapping(String prefix) { }
-
-/**
- *Description of the Method
- *
- * @param ch Description of Parameter
- * @param start Description of Parameter
- * @param length Description of Parameter
- * @since
- */
cvs commit: cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search LuceneIndexContentHandler.java
joerg 2004/03/17 13:30:13
Modified:src/blocks/lucene/java/org/apache/cocoon/components/search
LuceneIndexContentHandler.java
Log:
tabs 2 spaces
Revision ChangesPath
1.7 +5 -5
cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java
Index: LuceneIndexContentHandler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneIndexContentHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LuceneIndexContentHandler.java17 Mar 2004 21:21:55 - 1.6
+++ LuceneIndexContentHandler.java17 Mar 2004 21:30:13 - 1.7
@@ -130,10 +130,10 @@
}
if (text != null text.length() 0) {
- if (isFieldTag(lname)) {
- bodyDocument.add(Field.UnIndexed(lname,
text.toString()));
- }
- bodyDocument.add(Field.UnStored(lname, text.toString()));
+if (isFieldTag(lname)) {
+bodyDocument.add(Field.UnIndexed(lname, text.toString()));
+}
+bodyDocument.add(Field.UnStored(lname, text.toString()));
}
}
cvs commit: cocoon-2.1/src/blocks/slide/samples/screens login.jx
unico 2004/03/17 13:49:08
Modified:src/blocks/slide/samples/screens login.jx
Removed: src/blocks/slide README.txt
Log:
Make the readme documentation more visible by moving it to the samples
welcome page.
Revision ChangesPath
1.4 +25 -3 cocoon-2.1/src/blocks/slide/samples/screens/login.jx
Index: login.jx
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/screens/login.jx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- login.jx 6 Mar 2004 06:16:52 - 1.3
+++ login.jx 17 Mar 2004 21:49:08 - 1.4
@@ -24,9 +24,31 @@
a href=../Back/a - to Cocoon examples main page
/column
column title=Login
-p class=samplesNoteThese Slide examples require Java Transaction
-API library to be present. Get jta.jar and place it to the lib folder
-before trying these examples. You will also need enabled uploads in
web.xml .
+p
+ These samples examplify an administration application for Slide. The
+ administration functionality is directly built on Slide's internal
API.
+ Showing the use of the Slide source and namespace access. A
different approach
+ would be to let all communication take place over WebDAV.
+/p
+p
+ In order to configure WebDAV access for Slide you can uncomment the
example
+ servlet declaration and servlet-mapping in web.xml.
+ You can then connect your favorite WebDAV client to
+ http://localhost:/webdav/.
+/p
+p
+ By default write privileges are only granted to
+ authenticated users. This means that you would have to configure
authentication
+ in order to login and start editing files.br/
+ You can find more info on how to do this for both Jetty and Tomcat
in the
+ a href=http://jakarta.apache.org/slide/howto-jaas.html;Slide
documentation/a.
+ br/
+ Alternatively you could edit WEB-INF/slide.xconf domain
configuration file and
+ grant the desired privileges to the unauthenticated user.
+/p
+p class=samplesNote
+ In order to use the upload feature within these samples
+ you will need to set enable-uploads parameter in web.xml to true.
/p
table border=0 cellspacing=0 cellpadding=2
form action=${request.contextPath}${base}/login.cont
method=post
cvs commit: cocoon-2.1/src/blocks/slide/samples/screens login.jx
unico 2004/03/17 13:52:21 Modified:src/blocks/slide/samples/screens login.jx Log: more precise formulation Revision ChangesPath 1.5 +1 -1 cocoon-2.1/src/blocks/slide/samples/screens/login.jx Index: login.jx === RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/screens/login.jx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- login.jx 17 Mar 2004 21:49:08 - 1.4 +++ login.jx 17 Mar 2004 21:52:21 - 1.5 @@ -39,7 +39,7 @@ p By default write privileges are only granted to authenticated users. This means that you would have to configure authentication - in order to login and start editing files.br/ + in order to login and start editing files over WebDAV.br/ You can find more info on how to do this for both Jetty and Tomcat in the a href=http://jakarta.apache.org/slide/howto-jaas.html;Slide documentation/a. br/
cvs commit: cocoon-2.2/src/test/anteater calc.xml
unico 2004/03/17 13:59:01
Modified:src/test/anteater calc.xml
Log:
use jxcalc path since calc was removed during xsp blockification
Revision ChangesPath
1.7 +1 -1 cocoon-2.2/src/test/anteater/calc.xml
Index: calc.xml
===
RCS file: /home/cvs/cocoon-2.2/src/test/anteater/calc.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- calc.xml 10 Mar 2004 09:52:39 - 1.6
+++ calc.xml 17 Mar 2004 21:59:01 - 1.7
@@ -25,7 +25,7 @@
the calculator example, and goes back in the processing several
times. --
target name=calc
-property name=calc value=${anteater.env.cocoon}/samples/flow/calc//
+property name=calc
value=${anteater.env.cocoon}/samples/flow/jxcalc//
httpRequest href=${calc}/
description=Test the 'calc' JavaScript implementation
cvs commit: cocoon-2.1/src/blocks/slide/samples/screens login.jx
unico 2004/03/17 14:05:47 Modified:src/blocks/slide/samples/screens login.jx Log: better blah Revision ChangesPath 1.6 +2 -2 cocoon-2.1/src/blocks/slide/samples/screens/login.jx Index: login.jx === RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/screens/login.jx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- login.jx 17 Mar 2004 21:52:21 - 1.5 +++ login.jx 17 Mar 2004 22:05:46 - 1.6 @@ -43,8 +43,8 @@ You can find more info on how to do this for both Jetty and Tomcat in the a href=http://jakarta.apache.org/slide/howto-jaas.html;Slide documentation/a. br/ - Alternatively you could edit WEB-INF/slide.xconf domain configuration file and - grant the desired privileges to the unauthenticated user. + Alternatively you could grant the desired privileges to the unauthenticated user + via the administration app. /p p class=samplesNote In order to use the upload feature within these samples
cvs commit: cocoon-2.1/src/blocks/slide/samples flow.js
unico 2004/03/17 14:44:43
Modified:src/blocks/slide/java/org/apache/cocoon/samples/slide
AdminHelper.java
src/blocks/slide/samples/styles users2html.xsl
src/blocks/slide/samples flow.js
Log:
add ability to change a user's password
Revision ChangesPath
1.8 +35 -0
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/samples/slide/AdminHelper.java
Index: AdminHelper.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/samples/slide/AdminHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AdminHelper.java 17 Mar 2004 17:27:59 - 1.7
+++ AdminHelper.java 17 Mar 2004 22:44:43 - 1.8
@@ -338,6 +338,41 @@
throw e;
}
}
+
+public static void changePassword(NamespaceAccessToken nat,
+ String caller,
+ String username,
+ String password) throws Exception {
+
+String usersPath = nat.getNamespaceConfig().getUsersPath();
+String userUri = usersPath + / + username;
+
+SlideToken slideToken = new SlideTokenImpl(new
CredentialsToken(caller));
+Structure structure = nat.getStructureHelper();
+Content content = nat.getContentHelper();
+
+try {
+
+nat.begin();
+
+NodeRevisionDescriptors revisions =
content.retrieve(slideToken,userUri);
+NodeRevisionDescriptor revision =
content.retrieve(slideToken,revisions);
+revision.setLastModified(new Date());
+revision.setProperty(new NodeProperty(password, password,
NodeProperty.SLIDE_NAMESPACE));
+content.store(slideToken, userUri, revision, null);
+
+nat.commit();
+}
+catch (Exception e) {
+try {
+nat.rollback();
+}
+catch (Exception f) {
+f.printStackTrace();
+}
+throw e;
+}
+}
public static List listPermissions(NamespaceAccessToken nat,
String caller,
1.4 +23 -9 cocoon-2.1/src/blocks/slide/samples/styles/users2html.xsl
Index: users2html.xsl
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/samples/styles/users2html.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- users2html.xsl6 Mar 2004 02:25:51 - 1.3
+++ users2html.xsl17 Mar 2004 22:44:43 - 1.4
@@ -43,7 +43,11 @@
td align=left
bUser/b
/td
-td align=left/
+td/
+td align=left
+ bPassword/b
+/td
+td/
td align=left
bRoles/b
/td
@@ -53,13 +57,22 @@
xsl:variable name=useruri select=uri/text() /
xsl:variable name=username
select=substring-after($useruri,concat($userspath,'/')) /
tr
- form action={$base}/removeobject method=post
-input type=hidden name=objecturi value={$useruri}/
+ td align=left
+xsl:value-of select=$username/br/
+ /td
+ td align=left
+form action={$base}/removeobject
+ input type=hidden name=objecturi value={$useruri}/
+ input type=submit name=doRemoveUser value=Delete/
+/form
+ /td
+ form action={$base}/changepwd method=post
+input type=hidden name=username value={$username}/
td align=left
- xsl:value-of select=$username/
+ input type=password name=password size=10
maxlength=40/
/td
-td align=left
- input type=submit name=doRemoveUser value=Delete
user/
+td
+ input type=submit name=doSetPassword value=Change/
/td
/form
form action={$base}/removemember method=post
@@ -81,8 +94,7 @@
/form
/tr
tr
- td align=left/
- td align=left/
+ td colspan=4/
form action={$base}/addmember method=post
input type=hidden name=subjecturi value={$useruri}/
td align=left
@@ -99,6 +111,7 @@
td align=left
input type=submit
cvs commit: cocoon-2.1/src/blocks/slide/samples flow.js
unico 2004/03/17 14:53:57 Modified:src/blocks/slide/samples flow.js Log: redirect again (I thought not redirecting should cause an exception. It's wasn't happening.) Revision ChangesPath 1.16 +1 -0 cocoon-2.1/src/blocks/slide/samples/flow.js Index: flow.js === RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/flow.js,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- flow.js 17 Mar 2004 22:44:43 - 1.15 +++ flow.js 17 Mar 2004 22:53:57 - 1.16 @@ -249,6 +249,7 @@ var password = cocoon.request.getParameter(password); AdminHelper.changePassword(nat, principal, username, password); + cocoon.redirectTo(users); } // -- screens
cvs commit: cocoon-2.1/src/webapp/samples/test/redirect - New directory
unico 2004/03/17 15:21:08 cocoon-2.1/src/webapp/samples/test/redirect - New directory
cvs commit: cocoon-2.1/src/webapp/samples/test/redirect explain-test.xml flow.js sitemap.xmap
unico 2004/03/17 15:21:15
Added: src/webapp/samples/test/redirect explain-test.xml flow.js
sitemap.xmap
Log:
test harness for different redirect scenarios
especially check out donothing-from-flow pipeline, its not working as expected
expected would be a 500 response but currently is 200
Revision ChangesPath
1.1
cocoon-2.1/src/webapp/samples/test/redirect/explain-test.xml
Index: explain-test.xml
===
?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.
--
!-- CVS $Id: explain-test.xml,v 1.1 2004/03/17 23:21:15 unico Exp $ --
page
titlesendpage-redirect test/title
content
para
Test for different kinds of redirect scenarios.
/para
para
Test links:
ul
lilink href=redirect-to-from-sitemapsitemap redirect-to
statement/link/li
lilink href=redirect-to-from-flowcocoon.redirectTo FOM
call/link/li
lilink href=send-statuscocoon.sendStatus FOM
call/link/li
lilink href=send-pagecocoon.sendPage FOM
call/link/li
lilink href=donothing-from-flowcall an empty flow
function/link/li
lilink href=donothing-from-sitemapinvoke an empty match
statement/link/li
/ul
/para
/content
/page
1.1 cocoon-2.1/src/webapp/samples/test/redirect/flow.js
Index: flow.js
===
/*
* 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.
*/
function redirectTo() {
cocoon.redirectTo(explain-test.html);
}
function sendStatus() {
cocoon.sendStatus(204);
}
function sendPage() {
cocoon.sendPage(read, null);
}
function doNothing() {
}
1.1 cocoon-2.1/src/webapp/samples/test/redirect/sitemap.xmap
Index: sitemap.xmap
===
?xml version=1.0 encoding=UTF-8?
!--
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the License);
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an AS IS BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--
map:sitemap xmlns:map=http://apache.org/cocoon/sitemap/1.0;
map:flow language=javascript
map:script src=flow.js/
/map:flow
map:pipelines
map:pipeline internal-only=true
map:match pattern=read
map:read src=sitemap.xmap/
/map:match
/map:pipeline
map:pipeline
map:match pattern=redirect-to-from-sitemap
map:redirect-to uri=explain-test.html/
/map:match
map:match pattern=redirect-to-from-flow
map:call function=redirectTo/
/map:match
map:match pattern=send-status
map:call function=sendStatus/
/map:match
map:match pattern=send-page
map:call function=sendPage/
/map:match
map:match pattern=donothing-from-flow
map:call function=doNothing/
/map:match
map:match pattern=donothing-from-sitemap/
/map:pipeline
/map:pipelines
/map:sitemap
cvs commit: cocoon-2.1/src/test/anteater redirect.xml
unico 2004/03/17 15:32:00
Added: src/test/anteater redirect.xml
Log:
anteater script for redirect scenarios (last one fails)
Revision ChangesPath
1.1 cocoon-2.1/src/test/anteater/redirect.xml
Index: redirect.xml
===
?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.
--
project name=redirect-test default=redirect-test
group id=default
property name=usetidy value=false/
/group
target name=redirect-test
property name=redirect-test
value=${anteater.env.cocoon}/samples/test/redirect/
httpRequest href=${redirect-test}/redirect-to-from-sitemap
match
responseCode value=302/
/match
/httpRequest
httpRequest href=${redirect-test}/redirect-to-from-flow
match
responseCode value=302/
/match
/httpRequest
httpRequest href=${redirect-test}/send-status
match
responseCode value=204/
/match
/httpRequest
httpRequest href=${redirect-test}/send-page
match
responseCode value=200/
/match
/httpRequest
httpRequest href=${redirect-test}/donothing-from-sitemap
match
responseCode value=404/
/match
/httpRequest
httpRequest href=${redirect-test}/donothing-from-flow
match
responseCode value=404/
/match
/httpRequest
/target
/project
