cvs commit: cocoon-2.1 gump.xml
stephan 2004/03/10 00:25:34 Modified:.gump.xml Log: Remove entry for precept block. Revision ChangesPath 1.120 +1 -20 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- gump.xml 9 Mar 2004 15:11:16 - 1.119 +++ gump.xml 10 Mar 2004 08:25:34 - 1.120 @@ -349,25 +349,6 @@ nag from=Gump to=dev@cocoon.apache.org/ /project - project name=cocoon-block-precept status=unstable -packageorg.apache.cocoon/package - -ant target=gump-block - property name=block-name value=precept/ - property name=version value=@@DATE@@/ -/ant - -depend project=cocoon inherit=all/ -depend project=castor/ - -work nested=tools/anttasks/ -home nested=build/cocoon-@@DATE@@/ - -jar name=blocks/precept-block.jar/ - -nag from=Gump to=dev@cocoon.apache.org/ - /project - project name=cocoon-block-poi status=stable packageorg.apache.cocoon/package
cvs commit: cocoon-2.2/tools/src/loader Loader.java
cziegeler2004/03/10 01:08:26
Modified:tools/src/anttasks ManifestToolTask.java XConfToolTask.java
tools/src blocks-build.xsl check-jars.xsl
tools/src/loader Loader.java
Log:
Add license to tools/src (and add changes from 2.1.x branch)
Revision ChangesPath
1.3 +8 -7 cocoon-2.2/tools/src/anttasks/ManifestToolTask.java
Index: ManifestToolTask.java
===
RCS file: /home/cvs/cocoon-2.2/tools/src/anttasks/ManifestToolTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ManifestToolTask.java 8 Mar 2004 14:04:19 - 1.2
+++ ManifestToolTask.java 10 Mar 2004 09:08:25 - 1.3
@@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.io.*;
-import java.util.*;
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.types.*;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
/**
* Creates Manifest file with the all the JARs and modification dates
@@ -89,7 +91,6 @@
w.write(\n);
}
}
-
}
w.close();
}
1.11 +118 -64 cocoon-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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XConfToolTask.java8 Mar 2004 14:04:19 - 1.10
+++ XConfToolTask.java10 Mar 2004 09:08:25 - 1.11
@@ -13,16 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.XMLCatalog;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
@@ -30,24 +32,31 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Transformer;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
import javax.xml.transform.TransformerException;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.net.UnknownHostException;
/**
* Ant task to patch xmlfiles.
*
+ *
+ * replace-properties no|false,anything else
+ * xpath: xpath expression for context node
+ * unless-path: xpath expression that must return empty node set
+ * unless: (deprecated) xpath expression that must return empty node set
+ * if-prop: use path file only when project property is set
+ * remove: xpath expression to remove before adding nodes
+ * add-attribute: name of attribute to add to context node (requires value)
+ * value: value of attribute to add to context node (requires add-attribute)
+ * insert-before: xpath expression, add new nodes before
+ * insert-after: xpath expression, add new nodes after
+ *
* @author a href=mailto:[EMAIL PROTECTED]Carsten Ziegeler/a
* @author a href=mailto:[EMAIL PROTECTED]Vadim Gritsenko/a
* @author a href=mailto:[EMAIL PROTECTED]Marcus Crafter/a
@@ -60,7 +69,7 @@
private static final String NL=System.getProperty(line.separator);
private static final String FSEP=System.getProperty(file.separator);
private File file;
-private File directory;
+//private File directory;
private File srcdir;
private boolean addComments;
/** for resolving entities such as dtds */
@@ -89,8 +98,7 @@
*
* @param xmlCatalog the XMLCatalog instance to use to look up DTDs
*/
-public void addConfiguredXMLCatalog(XMLCatalog xmlCatalog)
-{
+public void addConfiguredXMLCatalog(XMLCatalog xmlCatalog) {
cvs commit: cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor EnumConvertorBuilderTestCase.java EnumConvertorTestCase.conf.xml EnumConvertorTestCase.java
stephan 2004/03/10 01:13:22
Modified:src/blocks/forms/test/org/apache/cocoon/forms/datatype
DynamicSelectionListTestCase.dest.xml
DynamicSelectionListTestCase.java
DynamicSelectionListTestCase.source.xml
DynamicSelectionListTestCase.xtest
EnumSelectionListTestCase.dest-no-null.xml
EnumSelectionListTestCase.dest.xml
EnumSelectionListTestCase.java
EnumSelectionListTestCase.xtest
FlowJXPathSelectionListTestCase.dest.xml
FlowJXPathSelectionListTestCase.java
FlowJXPathSelectionListTestCase.source.xml
FlowJXPathSelectionListTestCase.xtest
FlowJXPathSelectionListTestCaseWithNull.dest.xml
src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor
EnumConvertorBuilderTestCase.java
EnumConvertorTestCase.conf.xml
EnumConvertorTestCase.java
Log:
woody - forms
Revision ChangesPath
1.2 +5 -5
cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml
Index: DynamicSelectionListTestCase.dest.xml
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicSelectionListTestCase.dest.xml 9 Mar 2004 13:03:10 -
1.1
+++ DynamicSelectionListTestCase.dest.xml 10 Mar 2004 09:13:22 -
1.2
@@ -3,7 +3,7 @@
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 not use this file except in compliance fith the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -14,8 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-wi:selection-list xmlns:wi=http://apache.org/cocoon/woody/instance/1.0;
+fi:selection-list xmlns:fi=http://apache.org/cocoon/forms/1.0#instance;
- wi:item value=10/11/03wi:label10/11/03/wi:label/wi:item
- wi:item value=2/4/63wi:labelMy birthdate/wi:label/wi:item
-/wi:selection-list
+ fi:item value=10/11/03fi:label10/11/03/fi:label/fi:item
+ fi:item value=2/4/63fi:labelMy birthdate/fi:label/fi:item
+/fi:selection-list
1.3 +3 -3
cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java
Index: DynamicSelectionListTestCase.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicSelectionListTestCase.java 9 Mar 2004 13:08:46 - 1.2
+++ DynamicSelectionListTestCase.java 10 Mar 2004 09:13:22 - 1.3
@@ -83,7 +83,7 @@
public void testGenerateSaxFragment() throws Exception {
DOMBuilder dest = new DOMBuilder();
ResourceSource source =
-new
ResourceSource(resource://org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.source.xml);
+new
ResourceSource(resource://org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.source.xml);
Document sourceDoc = parser.parse(source.getInputStream());
Element datatypeElement = (Element)
sourceDoc.getElementsByTagNameNS(Constants.DEFINITION_NS, convertor).item(0);
Datatype datatype = datatypeManager.createDatatype(datatypeElement,
false);
@@ -91,7 +91,7 @@
new DynamicSelectionList(datatype, null, serviceManager);
list.generateSaxFragment(dest, Locale.ENGLISH, source);
ResourceSource expectedSource =
-new
ResourceSource(resource://org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.dest.xml);
+new
ResourceSource(resource://org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml);
Document expected = parser.parse(expectedSource.getInputStream());
assertEqual(Test if output is what is expected,
expected, dest.getDocument());
1.2 +10 -10
cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.source.xml
Index: DynamicSelectionListTestCase.source.xml
===
RCS file:
cvs commit: cocoon-2.2/tools/ide/eclipse classpath-tmpl.xml make-classpath.xsl
cziegeler2004/03/10 01:13:43 Modified:tools/ide/eclipse classpath-tmpl.xml make-classpath.xsl Log: Add missing license Revision ChangesPath 1.2 +15 -0 cocoon-2.2/tools/ide/eclipse/classpath-tmpl.xml Index: classpath-tmpl.xml === RCS file: /home/cvs/cocoon-2.2/tools/ide/eclipse/classpath-tmpl.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- classpath-tmpl.xml18 Nov 2003 18:56:13 - 1.1 +++ classpath-tmpl.xml10 Mar 2004 09:13:42 - 1.2 @@ -1,4 +1,19 @@ ?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. +-- data src-dirsitem@SRC_DIRS@/item/src-dirs mock-dirsitem@MOCKS_DIRS@/item/mock-dirs 1.3 +16 -1 cocoon-2.2/tools/ide/eclipse/make-classpath.xsl Index: make-classpath.xsl === RCS file: /home/cvs/cocoon-2.2/tools/ide/eclipse/make-classpath.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- make-classpath.xsl8 Dec 2003 11:41:18 - 1.2 +++ make-classpath.xsl10 Mar 2004 09:13:42 - 1.3 @@ -1,5 +1,20 @@ ?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. +-- +!-- Build the Eclipse .classpath file from a list of path items (see eclipse-project target in build.xml)
cvs commit: cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype DynamicSelectionListTestCase.dest.xml EnumSelectionListTestCase.dest-no-null.xml EnumSelectionListTestCase.dest.xml FlowJXPathSelectionListTestCase.dest.xml FlowJXPathSelectionListTestCaseWithNull.dest.xml
stephan 2004/03/10 01:19:44 Modified:src/blocks/forms/test/org/apache/cocoon/forms/datatype DynamicSelectionListTestCase.dest.xml EnumSelectionListTestCase.dest-no-null.xml EnumSelectionListTestCase.dest.xml FlowJXPathSelectionListTestCase.dest.xml FlowJXPathSelectionListTestCaseWithNull.dest.xml Log: Search destroy(fith - with). Revision ChangesPath 1.3 +1 -1 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml Index: DynamicSelectionListTestCase.dest.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DynamicSelectionListTestCase.dest.xml 10 Mar 2004 09:13:22 - 1.2 +++ DynamicSelectionListTestCase.dest.xml 10 Mar 2004 09:19:44 - 1.3 @@ -3,7 +3,7 @@ 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 fith 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 1.3 +1 -1 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest-no-null.xml Index: EnumSelectionListTestCase.dest-no-null.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest-no-null.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EnumSelectionListTestCase.dest-no-null.xml10 Mar 2004 09:13:22 - 1.2 +++ EnumSelectionListTestCase.dest-no-null.xml10 Mar 2004 09:19:44 - 1.3 @@ -3,7 +3,7 @@ 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 fith 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 1.3 +1 -1 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest.xml Index: EnumSelectionListTestCase.dest.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EnumSelectionListTestCase.dest.xml10 Mar 2004 09:13:22 - 1.2 +++ EnumSelectionListTestCase.dest.xml10 Mar 2004 09:19:44 - 1.3 @@ -3,7 +3,7 @@ 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 fith 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 1.3 +1 -1 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.dest.xml Index: FlowJXPathSelectionListTestCase.dest.xml === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.dest.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FlowJXPathSelectionListTestCase.dest.xml 10 Mar 2004 09:13:22 - 1.2 +++ FlowJXPathSelectionListTestCase.dest.xml 10 Mar 2004 09:19:44 - 1.3 @@ -3,7 +3,7 @@ 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 fith 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 1.3 +1 -1 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCaseWithNull.dest.xml Index: FlowJXPathSelectionListTestCaseWithNull.dest.xml === RCS file:
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/javascript request.xsl xsp.xsl session.xsl response.xsl
cziegeler2004/03/10 01:41:35 Modified:src/java/org/apache/cocoon/components/language/markup/xsp/java util.xsl soap.xsl cookie.xsl sel.xsl request.xsl action.xsl response.xsl form-validator.xsl logicsheet-util.xsl xscript-lib.xsl capture.xsl session.xsl xsp.xsl jpath.xsl input.xsl xscript.xsl log.xsl src/java/org/apache/cocoon/components/language/markup/xsp/javascript request.xsl xsp.xsl session.xsl response.xsl Log: Add missing license Revision ChangesPath 1.5 +13 -51 cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl Index: util.xsl === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java/util.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- util.xsl 3 Jun 2003 14:34:29 - 1.4 +++ util.xsl 10 Mar 2004 09:41:34 - 1.5 @@ -1,57 +1,19 @@ ?xml version=1.0? - -!-- $Id$-- !-- + Copyright 1999-2004 The Apache Software Foundation - - The Apache Software License, Version 1.1 - - - Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without modifica- - tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - - 3. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: This product includes software -developed by the Apache Software Foundation (http://www.apache.org/). -Alternately, this acknowledgment may appear in the software itself, if -and wherever such third-party acknowledgments normally appear. - - 4. The names 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/. - + 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 Util logicsheet for the Java language * 1.4 +12 -49 cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/java/soap.xsl Index: soap.xsl === RCS file:
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
stephan 2004/03/10 01:44:34
Modified:tools/src blocks-build.xsl
Log:
Minor typo.
Revision ChangesPath
1.50 +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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- blocks-build.xsl 10 Mar 2004 09:36:15 - 1.49
+++ blocks-build.xsl 10 Mar 2004 09:44:34 - 1.50
@@ -30,7 +30,7 @@
include name=*.jar/
/fileset
!-- Currently, we have no JVM dependent libraries
- fileset dir=${{lib.core}/jvm${target.vm}}
+ fileset dir=${{lib.core}}/jvm${{target.vm}}
include name=*.jar/
/fileset
--
cvs commit: cocoon-2.2/src/webapp/resources/styles main.css
cziegeler2004/03/10 02:05:07 Modified:src/webapp/stylesheets/system linkstatus2html.xslt error2html.xslt directory2html.xslt xmlform2html.xslt sitemap2html.xslt xml2html.xslt status2html.xslt src/webapp/WEB-INF instrumentation.xconf cocoon.xconf logkit.xconf web.xml src/webapp/WEB-INF/classes CatalogManager.properties src/webapp/samples sitemap.xmap samples.xml components-samples.xml block-samples.xml samples.xwelcome src/webapp welcome.xml not-found.xml sitemap.xmap welcome.xslt src/webapp/resources/scripts main.js src/webapp/resources/styles main.css Log: Update license Revision ChangesPath 1.2 +42 -24 cocoon-2.2/src/webapp/stylesheets/system/linkstatus2html.xslt Index: linkstatus2html.xslt === RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/linkstatus2html.xslt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linkstatus2html.xslt 26 Mar 2003 21:21:30 - 1.1 +++ linkstatus2html.xslt 10 Mar 2004 10:05:06 - 1.2 @@ -1,33 +1,51 @@ ?xml version=1.0? -xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; -xmlns:linkstatus=http://apache.org/cocoon/linkstatus/2.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$ -- + +xsl:stylesheet version=1.0 +xmlns:xsl=http://www.w3.org/1999/XSL/Transform; +xmlns:linkstatus=http://apache.org/cocoon/linkstatus/2.0; xsl:template match=linkstatus:linkstatus - html - body - table border=1 - trthURL/ththreferrer/ththcontent-type/ththstatus/ththmessage/th/tr -xsl:apply-templates/ - /table - /body - /html +html + body +table border=1 + trthURL/ththreferrer/ththcontent-type/ththstatus/ththmessage/th/tr + xsl:apply-templates/ +/table + /body +/html /xsl:template xsl:template match=linkstatus:link -trxsl:attribute name = bgcolor xsl:choose - xsl:when test=normalize-space(@status)='200'#00ff00/xsl:when - xsl:when test=normalize-space(@status)='404'#00/xsl:when - xsl:otherwise#ff/xsl:otherwise/xsl:choose -/xsl:attribute - - - tdaxsl:attribute name=hrefxsl:value-of select=@href//xsl:attribute -xsl:value-of select=@href//a/td - tdaxsl:attribute name=hrefxsl:value-of select=@referrer//xsl:attribute -referrer/a/td - tdxsl:value-of select=@content//td - tdxsl:value-of select=@status//td - tdxsl:value-of select=@message//td +tr + xsl:attribute name = bgcolor +xsl:choose + xsl:when test=normalize-space(@status)='200'#00ff00/xsl:when + xsl:when test=normalize-space(@status)='404'#00/xsl:when + xsl:otherwise#ff/xsl:otherwise +/xsl:choose + /xsl:attribute + tda href=[EMAIL PROTECTED]xsl:value-of select=@href//a/td + tda href=[EMAIL PROTECTED]referrer/a/td + tdxsl:value-of select=@content//td + tdxsl:value-of select=@status//td + tdxsl:value-of select=@message//td /tr /xsl:template 1.11 +128 -133 cocoon-2.2/src/webapp/stylesheets/system/error2html.xslt Index: error2html.xslt === RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/error2html.xslt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- error2html.xslt 2 Feb 2004 16:34:26 - 1.10 +++ error2html.xslt 10 Mar 2004 10:05:06 - 1.11 @@ -1,142 +1,137 @@ ?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 + +
cvs commit: cocoon-2.2/src/webapp/samples/common view-source.xsp
cziegeler2004/03/10 02:18:54 Modified:src/webapp/samples/aggregation/content test4.xml somehtml.xhtml test2.xml includehtml.xml xmlbase.xml test.xml test3.xml test5.xml loopinclusion.xml src/webapp/samples/flow/test sendpage.js sitemap.xmap src/webapp/samples/aggregation/stylesheets moreover.xsl slashdot.xsl news.xsl xmlhack.xsl src/webapp/samples/flow/prefs/screens welcome.xml userInfo.xml login.xml registrationSuccessful.xml src/webapp/samples/flow/calc/screens getNumberB.xsp getOperator.xsp displayResult.xsp getNumberA.xsp src/webapp/samples/hello-world/style/xsl page2sxd.xsl page2fo.xsl page2vrml.xsl page2sxi.xsl page2sxc.xsl page2html.xsl page2chtml.xsl page2xls.xsl page2svg.xsl page2itext.xsl page2wml.xsl page2sxw.xsl page2swf.xsl page2vml.xsl src/webapp/samples/aggregation samples.xml sitemap.xmap src/webapp/samples/flow sitemap.xmap samples.xml src/webapp/samples/hello-world samples.xml sitemap.xmap src/webapp/samples/errorhandling/exception sitemap.xmap error-giving-page.xml src/webapp/samples/flow/prefs prefs.js sitemap.xmap src/webapp/samples/errorhandling samples.xml sitemap.xmap src/webapp/samples/flow/jxcalc/screens displayResult.xml getNumberA.xml getNumberB.xml getOperator.xml src/webapp/samples/catalog style.xsl catalog-demo.xml sitemap.xmap sdocbook2body.xsl samples.xml article.xml src/webapp/samples/filter tobefiltered.xml src/webapp/samples/flow/test/screens showString.xml src/webapp/samples/flow/jxcalc sitemap.xmap src/webapp/samples/hello-world/content hello.xml hello_zip.xml src/webapp/samples/flow/calc calc.js sitemap.xmap src/webapp/samples/common/style/xsl/html complex-page2html.xsl simple-page2html.xsl simple-samples2html.xsl src/webapp/samples/hello-world/webservice HelloWorld.wsdl src/webapp/samples/common view-source.xsp Added: src/webapp/samples/aggregation aggregate.xml src/webapp/samples/hello-world/style page2wordml.xsl Removed: src/webapp/samples/aggregation aggregate.xsp src/webapp/samples/flow/jxcalc calc.js Log: Update license Revision ChangesPath 1.2 +15 -0 cocoon-2.2/src/webapp/samples/aggregation/content/test4.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/test4.xml.diff?r1=1.1r2=1.2 1.2 +16 -0 cocoon-2.2/src/webapp/samples/aggregation/content/somehtml.xhtml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/somehtml.xhtml.diff?r1=1.1r2=1.2 1.2 +15 -0 cocoon-2.2/src/webapp/samples/aggregation/content/test2.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/test2.xml.diff?r1=1.1r2=1.2 1.2 +15 -0 cocoon-2.2/src/webapp/samples/aggregation/content/includehtml.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/includehtml.xml.diff?r1=1.1r2=1.2 1.2 +15 -0 cocoon-2.2/src/webapp/samples/aggregation/content/xmlbase.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/xmlbase.xml.diff?r1=1.1r2=1.2 1.2 +15 -2 cocoon-2.2/src/webapp/samples/aggregation/content/test.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/test.xml.diff?r1=1.1r2=1.2 1.2 +16 -0 cocoon-2.2/src/webapp/samples/aggregation/content/test3.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/test3.xml.diff?r1=1.1r2=1.2 1.2 +15 -0 cocoon-2.2/src/webapp/samples/aggregation/content/test5.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/test5.xml.diff?r1=1.1r2=1.2 1.2 +15 -0 cocoon-2.2/src/webapp/samples/aggregation/content/loopinclusion.xml http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/aggregation/content/loopinclusion.xml.diff?r1=1.1r2=1.2 1.4 +15 -0 cocoon-2.2/src/webapp/samples/flow/test/sendpage.js http://cvs.apache.org/viewcvs/cocoon-2.2/src/webapp/samples/flow/test/sendpage.js.diff?r1=1.3r2=1.4 1.7 +15 -0 cocoon-2.2/src/webapp/samples/flow/test/sitemap.xmap
cvs commit: cocoon-2.2/src/webapp/samples/i18n/translations/tiered - New directory
cziegeler2004/03/10 02:20:19 cocoon-2.2/src/webapp/samples/i18n/translations/tiered - New directory
cvs commit: cocoon-2.2/src/webapp/samples/i18n tiered.xml simple2page.xsl sitemap.xmap simple.xsp simple.xml menu.xml multi.xml
cziegeler2004/03/10 02:20:25 Modified:src/webapp/samples/i18n/translations messages_ja.xml menu_de.xml messages_in.xml messages_pl.xml messages_fr.xml messages_zh_TW.xml menu_ru.xml messages_en.xml messages_zh_CN.xml messages_fr_CH.xml menu_in.xml menu_en.xml messages_hy.xml menu_el.xml messages_tr.xml menu_zh_CN.xml messages_ru.xml menu_ko.xml menu_zh_TW.xml messages_es.xml messages_ko.xml menu.xml messages.xml messages_pt.xml messages_de.xml messages_el.xml menu_ja.xml src/webapp/samples/i18n simple2page.xsl sitemap.xmap simple.xsp simple.xml menu.xml multi.xml Added: src/webapp/samples/i18n/translations/tiered messages_en.xml messages_ru.xml src/webapp/samples/i18n tiered.xml Log: Update license Revision ChangesPath 1.1 cocoon-2.2/src/webapp/samples/i18n/translations/tiered/messages_en.xml Index: messages_en.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. -- !--+ | English override message catalogue file for Cocoon 2 i18n sample | | CVS $Id: messages_en.xml,v 1.1 2004/03/10 10:20:24 cziegeler Exp $ +-- catalogue xml:lang=en message key=a_keyThis is a tiered key value./message /catalogue 1.1 cocoon-2.2/src/webapp/samples/i18n/translations/tiered/messages_ru.xml Index: messages_ru.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. -- !--+ | Russian override message catalogue file for Cocoon 2 i18n sample | | CVS $Id: messages_ru.xml,v 1.1 2004/03/10 10:20:24 cziegeler Exp $ +-- catalogue xml:lang=ru message key=a_keyЭто локально перекрытое значение по ключу./message /catalogue 1.3 +16 -1 cocoon-2.2/src/webapp/samples/i18n/translations/messages_ja.xml Index: messages_ja.xml === RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_ja.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- messages_ja.xml 29 Jul 2003 02:36:30 - 1.2 +++ messages_ja.xml 10 Mar 2004 10:20:24 - 1.3 @@ -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. +-- !--+ | Japanese message catalogue file for Cocoon 2 i18n sample 1.3 +16 -1 cocoon-2.2/src/webapp/samples/i18n/translations/menu_de.xml Index: menu_de.xml === RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_de.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- menu_de.xml 29 Jul 2003 02:36:30 -
cvs commit: cocoon-2.2/src/webapp/samples/myapp/xsp page.xsp
cziegeler2004/03/10 02:23:33 Modified:src/webapp/samples/modules properties.xsp properties2html.xsl menu.xml site2html.xsl sitemap.xmap forrestconf.xml menu2html.xsl index.xhtml page.css src/webapp/samples/paginator/pagesheets list.pagesheet text.pagesheet src/webapp/samples/myapp/xml page.xml src/webapp/samples/paginator/stylesheets pagedlist2html.xsl list2html.xsl src/webapp/samples/myapp/xsl style.xsl src/webapp/samples/myapp sitemap.xmap src/webapp/samples/paginator/content text.xml list.xml src/webapp/samples/paginator sitemap.xmap samples.xml src/webapp/samples/myapp/xsp page.xsp Log: Update license Revision ChangesPath 1.2 +16 -1 cocoon-2.2/src/webapp/samples/modules/properties.xsp Index: properties.xsp === RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/modules/properties.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- properties.xsp9 Mar 2003 00:11:15 - 1.1 +++ properties.xsp10 Mar 2004 10:23:32 - 1.2 @@ -1,4 +1,19 @@ ?xml version=1.0 encoding=ISO-8859-1? +!-- + 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. +-- !-- $Id$ -- xsp:page language=java xmlns:xsp=http://apache.org/xsp; properties 1.2 +15 -0 cocoon-2.2/src/webapp/samples/modules/properties2html.xsl Index: properties2html.xsl === RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/modules/properties2html.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- properties2html.xsl 9 Mar 2003 00:11:15 - 1.1 +++ properties2html.xsl 10 Mar 2004 10:23:32 - 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. +-- xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; xsl:param name=titleInput Module/xsl:param 1.10 +15 -0 cocoon-2.2/src/webapp/samples/modules/menu.xml Index: menu.xml === RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/modules/menu.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- menu.xml 31 Oct 2003 13:12:05 - 1.9 +++ menu.xml 10 Mar 2004 10:23:32 - 1.10 @@ -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 book PUBLIC -//APACHE//DTD Cocoon Documentation Book V1.0//EN dtd/book-cocoon-v10.dtd -- book software=Apache Cocoon 1.3 +15 -0 cocoon-2.2/src/webapp/samples/modules/site2html.xsl Index: site2html.xsl === RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/modules/site2html.xsl,v retrieving revision 1.2
cvs commit: cocoon-2.2/src/webapp/samples/test/reader-mime-type - New directory
cziegeler2004/03/10 02:32:45 cocoon-2.2/src/webapp/samples/test/reader-mime-type - New directory
cvs commit: cocoon-2.2/src/webapp/samples/text-wrap/data - New directory
cziegeler2004/03/10 02:32:45 cocoon-2.2/src/webapp/samples/text-wrap/data - New directory
cvs commit: cocoon-2.2/src/webapp/samples/test/internal-request/mounted - New directory
cziegeler2004/03/10 02:32:45 cocoon-2.2/src/webapp/samples/test/internal-request/mounted - New directory
cvs commit: cocoon-2.2/src/webapp/samples/sources sitemap.xmap samples.xml
cziegeler2004/03/10 02:32:57 Modified:src/webapp/samples/xsp/java logicsheet.xsp request.xsp cookie.xsp cacheable.xsp response.xsp resolver.xsp simple.xsp sessionpage.xsp upload.xsp hello.xsp session.xsp src/webapp/samples/xsp/logicsheets hello.xsl src/webapp/samples/test sitemap.xmap src/webapp/samples/stylesheets dynamic-page2html.xsl src/webapp/samples/xsp/javascript simple.xsp hello.xsp response.xsp request.xsp session.xsp src/webapp/samples/sources/content dynamic.xsp simple.xml simple.xsp src/webapp/samples/stream sitemap.xmap src/webapp/samples/xsp/python hello.xsp src/webapp/samples/sources/style simple-page2html.xsp dynamic-xsp2xsp.xsl src/webapp/samples/xsp samples.xml sitemap.xmap src/webapp/samples/xsp/stream OrderPage.xml src/webapp/samples/sources sitemap.xmap samples.xml Added: src/webapp/samples/text-wrap/xslt docwrap.xsl split.xsl docsplit.xsl docraw.xsl docnbsp.xsl wrap2para.xsl src/webapp/samples/test/internal-request sitemap.xmap explain-test.xml a.xml src/webapp/samples/text-wrap/data ascii-art.xml with-word-boundaries.xml cdata-model-2.xml without-word-boundaries.xml cdata-model.xml src/webapp/samples/test/sendpage-redirect flow.js sitemap.xmap explain-test.xml src/webapp/samples/test dir-links.xsl index.xml src/webapp/samples/sources/content upload.xml src/webapp/samples/test/internal-request/mounted sitemap.xmap c.xml src/webapp/samples/text-wrap welcome.html sitemap.xmap src/webapp/samples/test/reader-mime-type test10.html sitemap.xmap explain-test.xml Removed: src/webapp/samples/test a.xml src/webapp/samples/test/simpletest-mounted c.xml sitemap.xmap Log: Update license Revision ChangesPath 1.1 cocoon-2.2/src/webapp/samples/text-wrap/xslt/docwrap.xsl Index: docwrap.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. -- xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; !-- docwrap.xsl - text line wrapping This stylesheet includes wrap2para.xsl to handle just source elements that have PCDATA. Any other type of source element is the reponsibility of the caller xslt. -- xsl:include href=wrap2para.xsl/ xsl:template match=document html head titlexsl:value-of select=header/title//title /head xsl:apply-templates/ /html /xsl:template xsl:template match=body body h1xsl:value-of select=header/title//h1 pComment from stylesheet: Only lt;sourcegt; elements that did not contain an xml content model, had their long lines handled by the included wrap2para.xsl stylesheet. /p xsl:apply-templates/ /body /xsl:template xsl:template match=section xsl:apply-templates/ /xsl:template xsl:template match=source pre class=code xsl:apply-templates/ /pre /xsl:template xsl:template match=source[not(*)] div style=padding:4pt; margin-bottom:8pt; border-width:1px; border-style:solid; border-color:#0086b2; xsl:call-template name=format-source xsl:with-param name=source select=string(.)/ /xsl:call-template /div /xsl:template xsl:template match=title h2xsl:apply-templates//h2 /xsl:template xsl:template match=p pxsl:apply-templates//p /xsl:template /xsl:stylesheet 1.1 cocoon-2.2/src/webapp/samples/text-wrap/xslt/split.xsl Index: split.xsl === ?xml version=1.0? !-- Copyright 1999-2004 The Apache Software Foundation Licensed under
cvs commit: cocoon-2.2/src/webapp/samples/test/sendpage-redirect - New directory
cziegeler2004/03/10 02:32:45 cocoon-2.2/src/webapp/samples/test/sendpage-redirect - New directory
cvs commit: cocoon-2.1 status.xml
reinhard2004/03/10 03:06:20 Modified:.status.xml Log: formatting Revision ChangesPath 1.271 +17 -15cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- status.xml9 Mar 2004 11:32:41 - 1.270 +++ status.xml10 Mar 2004 11:06:20 - 1.271 @@ -230,20 +230,22 @@ /action action dev=RP type=update Renaming Woody to CocoonForms - - The Woody block (src/blocks/woody) has moved into the new Cocoon Forms -block (src/blocks/forms). - - new namespaces: - * from xmlns:wd=http://apache.org/cocoon/woody/definition/1.0; - to xmlns:fd=http://apache.org/cocoon/forms/1.0#definition; - * from xmlns:wb=http://apache.org/cocoon/woody/binding/1.0; - to xmlns:fb=http://apache.org/cocoon/forms/1.0#binding; - * from xmlns:wi=http://apache.org/cocoon/woody/instance/1.0; - to xmlns:fi=http://apache.org/cocoon/forms/1.0#instance; - * from xmlns:wt=http://apache.org/cocoon/woody/template/1.0; - to xmlns:ft=http://apache.org/cocoon/forms/1.0#template; - - Java packages moved from org.apache.cocoon.woody to -org.apache.cocoon.forms - - Petstore and Apples examples have been renamed + ul + liThe Woody block (src/blocks/woody) has moved into the new Cocoon Forms + block (src/blocks/forms)./li + linew namespaces:br/ + ul + lifrom xmlns:wd=http://apache.org/cocoon/woody/definition/1.0; + to xmlns:fd=http://apache.org/cocoon/forms/1.0#definition;/li + lifrom xmlns:wb=http://apache.org/cocoon/woody/binding/1.0; + to xmlns:fb=http://apache.org/cocoon/forms/1.0#binding;/li + lifrom xmlns:wi=http://apache.org/cocoon/woody/instance/1.0; + to xmlns:fi=http://apache.org/cocoon/forms/1.0#instance;/li + lifrom xmlns:wt=http://apache.org/cocoon/woody/template/1.0; + to xmlns:ft=http://apache.org/cocoon/forms/1.0#template;/li + /ul/li + liJava packages moved from org.apache.cocoon.woody to org.apache.cocoon.forms/li + /ul /action action dev=AG type=update Updated Velocity engine to 1.4-rc1
cvs commit: cocoon-2.1/src/blocks/xsp/conf - New directory
stephan 2004/03/10 03:19:48 cocoon-2.1/src/blocks/xsp/conf - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/samples - New directory
stephan 2004/03/10 03:19:48 cocoon-2.1/src/blocks/xsp/samples - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java - New directory
stephan 2004/03/10 03:19:48 cocoon-2.1/src/blocks/xsp/java - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/samples/python - New directory
stephan 2004/03/10 03:20:20 cocoon-2.1/src/blocks/xsp/samples/python - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org - New directory
stephan 2004/03/10 03:20:20 cocoon-2.1/src/blocks/xsp/java/org - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/samples/javascript - New directory
stephan 2004/03/10 03:20:20 cocoon-2.1/src/blocks/xsp/samples/javascript - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/samples/java - New directory
stephan 2004/03/10 03:20:20 cocoon-2.1/src/blocks/xsp/samples/java - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/samples/logicsheets - New directory
stephan 2004/03/10 03:20:20 cocoon-2.1/src/blocks/xsp/samples/logicsheets - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache - New directory
stephan 2004/03/10 03:21:10 cocoon-2.1/src/blocks/xsp/java/org/apache - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon - New directory
stephan 2004/03/10 03:21:23 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/acting - New directory
stephan 2004/03/10 03:21:37 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/acting - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components - New directory
stephan 2004/03/10 03:21:37 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/generating - New directory
stephan 2004/03/10 03:21:37 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/generating - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language - New directory
stephan 2004/03/10 03:21:57 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/xscript - New directory
stephan 2004/03/10 03:21:57 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/xscript - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/generator - New directory
stephan 2004/03/10 03:22:25 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/generator - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming - New directory
stephan 2004/03/10 03:22:25 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup - New directory
stephan 2004/03/10 03:22:25 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/xscript/xslt - New directory
stephan 2004/03/10 03:22:25 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/xscript/xslt - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp - New directory
stephan 2004/03/10 03:23:08 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript - New directory
stephan 2004/03/10 03:23:08 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java - New directory
stephan 2004/03/10 03:23:08 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/javascript - New directory
stephan 2004/03/10 03:25:10 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/javascript - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java - New directory
stephan 2004/03/10 03:25:10 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java - New directory
cvs commit: cocoon-2.2 mount-table.xml.sample
joerg 2004/03/10 03:37:27 Modified:.mount-table.xml.sample Log: *** keyword substitution change *** Revision ChangesPath 1.3 +46 -46cocoon-2.2/mount-table.xml.sample Index: mount-table.xml.sample === RCS file: /home/cvs/cocoon-2.2/mount-table.xml.sample,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mount-table.xml.sample10 Mar 2004 08:43:23 - 1.2 +++ mount-table.xml.sample10 Mar 2004 11:37:27 - 1.3 @@ -1,46 +1,46 @@ -!-- - 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. --- -mount-table - !-- -The mount table allows to mount directories external to the Cocoon webapp without -changing the main sitemap. To activate the mount-table, just copy or rename this file -to mount-table.xml to see it automatically activated. - -Each mount below will direct requests starting with the given uri-prefix to the corresponding -sitemap. The syntax is exactly the same as the one of map:mount. - -The mount-table is especially useful for two purposes: -- for all users, to mount into Cocoon external directories (demos, prototypes, projects) without - having to change the main Cocoon sitemap. This allows these mounts to survive a update to a - more recent version of Cocoon. - -- for cocoon contributors, to mount the source of Cocoon examples instead of their copy placed in - build/webapp by the build process. This avoids many of the hassles related to editing a copy of - the sources, often leading to sync problems. - -- - - !-- - example: mount the woody source samples at woody-samples/ - (don't forget the / at the end of the path name) - -- - mount uri-prefix=woody-samples/ src=../../src/blocks/woody/samples// - - - !-- example: mount a prototype located elsewhere on the filesystem at proto/ - (kept commented as the path is not likely to exist on your filesystem) -- - mount uri-prefix=proto/ src=file://c:/my/projects/prototype// - -/mount-table +!-- + 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. +-- +mount-table + !-- +The mount table allows to mount directories external to the Cocoon webapp without +changing the main sitemap. To activate the mount-table, just copy or rename this file +to mount-table.xml to see it automatically activated. + +Each mount below will direct requests starting with the given uri-prefix to the corresponding +sitemap. The syntax is exactly the same as the one of map:mount. + +The mount-table is especially useful for two purposes: +- for all users, to mount into Cocoon external directories (demos, prototypes, projects) without + having to change the main Cocoon sitemap. This allows these mounts to survive a update to a + more recent version of Cocoon. + +- for cocoon contributors, to mount the source of Cocoon examples instead of their copy placed in + build/webapp by the build process. This avoids many of the hassles related to editing a copy of + the sources, often leading to sync problems. + -- + + !-- + example: mount the woody source samples at woody-samples/ + (don't forget the / at the end of the path name) + -- + mount uri-prefix=woody-samples/ src=../../src/blocks/woody/samples// + + + !-- example: mount a prototype located elsewhere on the filesystem at proto/ + (kept commented as the path is not likely to exist on your filesystem) -- + mount uri-prefix=proto/ src=file://c:/my/projects/prototype// + +/mount-table
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl SizingAspect.java
cziegeler2004/03/10 04:28:29
Modified:src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl
DefaultAspectDataHandler.java
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl
SizingAspect.java
Log:
Fix sizing bug and minor performance improvement
Revision ChangesPath
1.7 +11 -4
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/DefaultAspectDataHandler.java
Index: DefaultAspectDataHandler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/DefaultAspectDataHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultAspectDataHandler.java 5 Mar 2004 13:02:10 - 1.6
+++ DefaultAspectDataHandler.java 10 Mar 2004 12:28:29 - 1.7
@@ -83,7 +83,7 @@
* @see
org.apache.cocoon.portal.aspect.AspectDataHandler#getAspectDatas(org.apache.cocoon.portal.aspect.Aspectalizable)
*/
public Map getAspectDatas(Aspectalizable owner) {
-Map datas = new AspectDatasHashMap(owner, this);
+AspectDatasHashMap datas = new AspectDatasHashMap(owner, this);
Iterator iter = this.description.getAspectDescriptions().iterator();
while ( iter.hasNext() ) {
AspectDescription current = (AspectDescription)iter.next();
@@ -92,6 +92,7 @@
datas.put( current.getName(), data );
}
}
+datas.initialize();
return datas;
}
@@ -166,6 +167,7 @@
protected AspectDataHandler handler;
protected Aspectalizable owner;
+protected boolean init = false;
public AspectDatasHashMap(Aspectalizable owner, AspectDataHandler
handler) {
this.handler = handler;
@@ -176,9 +178,14 @@
* @see java.util.Map#put(java.lang.Object, java.lang.Object)
*/
public Object put(Object key, Object value) {
-this.handler.setAspectData(this.owner, key.toString(), value);
-value = this.handler.getAspectData(this.owner, key.toString());
+if ( this.init ) {
+this.handler.setAspectData(this.owner, key.toString(), value);
+value = this.handler.getAspectData(this.owner, key.toString());
+}
return super.put(key, value);
}
+public void initialize() {
+this.init = true;
+}
}
1.8 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java
Index: SizingAspect.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SizingAspect.java 5 Mar 2004 13:02:13 - 1.7
+++ SizingAspect.java 10 Mar 2004 12:28:29 - 1.8
@@ -72,7 +72,7 @@
XMLUtils.createElement(handler, maximize-uri,
service.getComponentManager().getLinkService().getLinkURI(event));
}
-if (size == SizingStatus.STATUS_MINIMIZED) {
+if (size.equals(SizingStatus.STATUS_MINIMIZED)) {
showContent = false;
}
}
cvs commit: cocoon-2.1/lib jars.xml
cziegeler2004/03/10 04:56:29 Modified:src/blocks/portal/java/org/apache/cocoon/portal/pluto/service/log LogServiceImpl.java lib jars.xml Added: src/blocks/portal/lib pluto-20040310.jar portlet-api-20040310.jar legalportlet-api-20040310.jar.license.txt pluto-20040310.jar.license.txt src/blocks/portal/java/org/apache/cocoon/portal/pluto/service/log LoggerImpl.java Removed: src/blocks/portal/lib pluto-20040121.jar portlet-api-20040121.jar legalpluto-20040121.jar.license.txt portlet-api-20040121.jar.license.txt Log: Updating to latest pluto version Revision ChangesPath 1.1 cocoon-2.1/src/blocks/portal/lib/pluto-20040310.jar Binary file 1.1 cocoon-2.1/src/blocks/portal/lib/portlet-api-20040310.jar Binary file 1.1 cocoon-2.1/legal/portlet-api-20040310.jar.license.txt Index: portlet-api-20040310.jar.license.txt === Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. Legal Entity shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. You (or Your) shall mean an individual or Legal Entity exercising permissions granted by this License. Source form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. Object form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. Work shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). Derivative Works shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. Contribution shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, submitted means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as Not a Contribution. Contributor shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto PortalContextProviderImpl.java
cziegeler2004/03/10 04:57:48 Modified:src/blocks/portal/java/org/apache/cocoon/portal/pluto PortalContextProviderImpl.java Log: Use Cocoon version for portal version Revision ChangesPath 1.5 +3 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortalContextProviderImpl.java Index: PortalContextProviderImpl.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortalContextProviderImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PortalContextProviderImpl.java5 Mar 2004 13:02:14 - 1.4 +++ PortalContextProviderImpl.java10 Mar 2004 12:57:48 - 1.5 @@ -23,6 +23,7 @@ import javax.portlet.PortletMode; import javax.portlet.WindowState; +import org.apache.cocoon.Constants; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; import org.apache.pluto.services.information.PortalContextProvider; @@ -70,7 +71,7 @@ // these are the minimum states that the portal needs to support this.states = this.getDefaultStates(); // set info -this.info = Apache Cocoon/1.0; +this.info = Apache Cocoon/ + Constants.VERSION; this.properties = new HashMap(); this.init(objectModel); }
cvs commit: cocoon-2.1/src/webapp/samples/xsp/stream OrderPage.xml
stephan 2004/03/10 04:58:14 Modified:.gump.xml status.xml src/java/org/apache/cocoon Cocoon.java cocoon.roles src/java/org/apache/cocoon/bean CocoonBean.java CocoonWrapper.java src/java/org/apache/cocoon/transformation SimpleFormTransformer.java src/webapp sitemap.xmap src/webapp/WEB-INF cocoon.xconf src/webapp/samples samples.xml sitemap.xmap Added: src/blocks/xsp/conf xsp-action.xmap xsp-generator.xmap xsp-markup.xconf xsp-program-generator.xconf xsp-program-language.xconf xsp-xscript.xconf xsp.xroles xsp.xsamples src/blocks/xsp/java/org/apache/cocoon/acting InputModuleAction.java ServerPagesAction.java src/blocks/xsp/java/org/apache/cocoon/components/language LanguageException.java src/blocks/xsp/java/org/apache/cocoon/components/language/generator CompiledComponent.java GeneratorSelector.java ProgramGenerator.java ProgramGeneratorImpl.java src/blocks/xsp/java/org/apache/cocoon/components/language/markup AbstractMarkupLanguage.java CocoonMarkupLanguage.java Logicsheet.java LogicsheetCodeGenerator.java MarkupCodeGenerator.java MarkupLanguage.java NamedLogicsheet.java src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp JSGenerator.java SOAPHelper.java XSLTExtension.java XSPCookieHelper.java XSPGenerator.java XSPMarkupLanguage.java XSPModuleHelper.java XSPObjectHelper.java XSPRequestHelper.java XSPResponseHelper.java XSPSessionHelper.java XSPUtil.java src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java action.xsl capture.xsl cookie.xsl form-validator.xsl input.xsl jpath.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 src/blocks/xsp/java/org/apache/cocoon/components/language/programming AbstractProgrammingLanguage.java CodeFormatter.java CompiledProgrammingLanguage.java CompilerError.java LanguageCompiler.java Program.java ProgrammingLanguage.java src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java AbstractJavaCompiler.java EclipseJavaCompiler.java JavaLanguage.java JavaProgram.java Javac.java Jikes.java JstyleFormatter.java NullFormatter.java Pizza.java src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript CompiledJavascriptLanguage.java JavascriptLanguage.java JavascriptProgram.java src/blocks/xsp/java/org/apache/cocoon/components/xscript StringBufferContentHandler.java XScriptManager.java XScriptManagerImpl.java XScriptObject.java XScriptObjectFromURL.java XScriptObjectInlineXML.java XScriptObjectResult.java XScriptVariableScope.java src/blocks/xsp/java/org/apache/cocoon/components/xscript/xslt copy-of.xsl value-of.xsl src/blocks/xsp/java/org/apache/cocoon/generating AbstractServerPage.java ServerPagesGenerator.java src/blocks/xsp/samples samples.xml sitemap.xmap src/blocks/xsp/samples/java cacheable.xsp cookie.xsp hello.xsp logicsheet.xsp request.xsp resolver.xsp response.xsp session.xsp sessionpage.xsp simple.xsp upload.xsp src/blocks/xsp/samples/javascript hello.xsp request.xsp response.xsp session.xsp simple.xsp src/blocks/xsp/samples/logicsheets hello.xsl src/blocks/xsp/samples/python hello.xsp src/blocks/xsp/samples/stream OrderPage.xml src/java/org/apache/cocoon/transformation/helpers FormValidatorHelper.java Removed: src/java/org/apache/cocoon/acting
cvs commit: cocoon-2.1/src/blocks/xsp/samples/soap - New directory
stephan 2004/03/10 06:19:43 cocoon-2.1/src/blocks/xsp/samples/soap - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/samples/soap/pages - New directory
stephan 2004/03/10 06:19:58 cocoon-2.1/src/blocks/xsp/samples/soap/pages - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/samples/soap/stylesheets - New directory
stephan 2004/03/10 06:19:58 cocoon-2.1/src/blocks/xsp/samples/soap/stylesheets - New directory
cvs commit: cocoon-2.1 blocks.properties
cziegeler2004/03/10 06:30:41 Modified:.blocks.properties Log: Remove precept Revision ChangesPath 1.63 +0 -1 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- blocks.properties 9 Mar 2004 15:10:35 - 1.62 +++ blocks.properties 10 Mar 2004 14:30:41 - 1.63 @@ -109,7 +109,6 @@ #exclude.block.petstore=true #-[dependency]: portal depends on authentication-fw, html, session-fw. #exclude.block.portal=true -#exclude.block.precept=true #exclude.block.proxy=true #exclude.block.qdox=true #-[dependency]: repository depends on databases, eventcache.
cvs commit: cocoon-2.1 gump.xml
cziegeler2004/03/10 06:31:28 Modified:.gump.xml Log: Scratchpad depends on xsp Revision ChangesPath 1.122 +2 -1 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- gump.xml 10 Mar 2004 12:58:03 - 1.121 +++ gump.xml 10 Mar 2004 14:31:28 - 1.122 @@ -145,6 +145,7 @@ depend project=cocoon-block-velocity/ depend project=cocoon-block-cron/ depend project=cocoon-block-batik/ +depend project=cocoon-block-xsp/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
cvs commit: cocoon-2.1 blocks.properties gump.xml
stephan 2004/03/10 06:39:52 Modified:.blocks.properties gump.xml Log: python block depend on xsp. Revision ChangesPath 1.64 +1 -0 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- blocks.properties 10 Mar 2004 14:30:41 - 1.63 +++ blocks.properties 10 Mar 2004 14:39:52 - 1.64 @@ -73,6 +73,7 @@ #exclude.block.web3=true #-[dependency]: xmldb depends on databases. #exclude.block.xmldb=true +#exclude.block.xsp=true # Unstable blocks -- 1.123 +2 -1 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- gump.xml 10 Mar 2004 14:31:28 - 1.122 +++ gump.xml 10 Mar 2004 14:39:52 - 1.123 @@ -438,6 +438,7 @@ /ant depend project=cocoon inherit=all/ +depend project=cocoon-block-xsp/ option project=jython/ work nested=tools/anttasks/
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation SimpleFormTransformer.java
unico 2004/03/10 07:19:32 Modified:src/java/org/apache/cocoon/transformation/helpers FormValidatorHelper.java src/java/org/apache/cocoon/transformation SimpleFormTransformer.java Log: fix package name Revision ChangesPath 1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java Index: FormValidatorHelper.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/FormValidatorHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormValidatorHelper.java 10 Mar 2004 12:58:13 - 1.1 +++ FormValidatorHelper.java 10 Mar 2004 15:19:32 - 1.2 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.components.transformation.helpers; +package org.apache.cocoon.transformation.helpers; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; 1.13 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java Index: SimpleFormTransformer.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- SimpleFormTransformer.java10 Mar 2004 12:58:13 - 1.12 +++ SimpleFormTransformer.java10 Mar 2004 15:19:32 - 1.13 @@ -25,7 +25,7 @@ import org.apache.cocoon.ProcessingException; import org.apache.cocoon.acting.ValidatorActionResult; -import org.apache.cocoon.components.transformation.helpers.FormValidatorHelper; +import org.apache.cocoon.transformation.helpers.FormValidatorHelper; import org.apache.cocoon.components.modules.input.InputModule; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashMap;
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/generation - New directory
unico 2004/03/10 07:20:46 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/generation - New directory
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/generation AbstractServerPage.java ServerPagesGenerator.java
unico 2004/03/10 07:20:54
Added: src/blocks/xsp/java/org/apache/cocoon/generation
AbstractServerPage.java ServerPagesGenerator.java
Removed: src/blocks/xsp/java/org/apache/cocoon/generating
AbstractServerPage.java ServerPagesGenerator.java
Log:
fix package name
Revision ChangesPath
1.1
cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/generation/AbstractServerPage.java
Index: AbstractServerPage.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 express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.cocoon.generation;
import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.environment.Request;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import java.io.File;
import java.io.Serializable;
/**
* Base implementation of codeServerPagesGenerator/code. This class
* declares variables that must be explicitly initialized by code generators.
*
* @author a href=mailto:[EMAIL PROTECTED]Ricardo Rocha/a
* @version CVS $Id: AbstractServerPage.java,v 1.1 2004/03/10 15:20:51 unico
Exp $
*/
public abstract class AbstractServerPage
extends ServletGenerator
implements CompiledComponent, CacheableProcessingComponent, Cacheable,
Recomposable {
/**
* Code generators should produce a constructor
* block that initializes the generator's
* creation date and file dependency list.
* Example:
*
* {
*this.dateCreated = 958058788948L;
*this.dependencies = new File[] {
* new File(source.xml),
*};
* }
*
*/
/** The creation date */
protected long dateCreated = -1L;
/** The dependency file list */
protected File[] dependencies = null;
/**
* Recompose with the actual codeComponentManager/code that should
* be used.
*/
public void recompose(ComponentManager manager) throws ComponentException
{
this.manager = manager;
}
/**
* Determines whether this generator's source files have changed
*
* @return Whether any of the files this generator depends on has changed
* since it was created
*/
public boolean modifiedSince(long date) {
if (date == 0 || dateCreated date) {
return true;
}
for (int i = 0; i dependencies.length; i++) {
if (dateCreated dependencies[i].lastModified()) {
return true;
}
}
return false;
}
/**
* Determines whether generated content has changed since
* last invocation. Users may override this method to take
* advantage of SAX event cacheing
*
* @param request The request whose data must be inspected to assert
whether
* dynamically generated content has changed
* @return Whether content has changes for this request's data
*/
public boolean hasContentChanged(Request request) {
return true;
}
/**
* Generate the unique key.
* This key must be unique inside the space of this component.
* This method must be invoked before the generateValidity() method.
*
* @return The generated key or codenull/code if the component
* is currently not cacheable.
*/
public Serializable getKey() {
return null;
}
/**
* Generate the validity object.
* Before this method can be invoked the generateKey() method
* must be invoked.
*
* @return The generated validity object, codeNOPCacheValidity/code
* is the default if hasContentChange()
cvs commit: cocoon-2.1/src/blocks/xsp/samples/util - New directory
unico 2004/03/10 07:37:47 cocoon-2.1/src/blocks/xsp/samples/util - New directory
cvs commit: cocoon-2.1/src/webapp/samples/protected sitemap.xmap
unico 2004/03/10 08:16:12
Modified:src/webapp/samples/protected sitemap.xmap
Added: src/webapp/samples/protected/docs protected.xml
Removed: src/webapp/samples/protected/docs protected.xsp
Log:
remove dependency on xsp from protected samples
Revision ChangesPath
1.1
cocoon-2.1/src/webapp/samples/protected/docs/protected.xml
Index: protected.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: protected.xml,v 1.1 2004/03/10 16:16:12 unico Exp $ --
page
resources
resource type=file
href=descriptors/auth.xml?cocoon-view=pretty-contentAuthenticator/resource
resource type=file
href=descriptors/params.xml?cocoon-view=pretty-contentValidator/resource
resource type=doc
href=userdocs/actions/database-actions.htmlActions/resource
/resources
titleProtected area/title
content
linkbar/
para
Wow, you have entered secret area,
now its time to examine sub-sitemap and
think about what can be improved regarding flow control and especially
aspect capturing, so that it is not necessary to check session in every
map:match fragment. :-))
br/
#160; -- Martin Man
/para
paraYou are logged in under username:
${parameters.getParameter('username')}/para
paraYour department id is:
${parameters.getParameter('department_id')}/para
paraYour web page theme is: ${parameters.getParameter('theme')}/para
/content
/page
!-- vim: set et ts=2 sw=2: --
1.7 +6 -2 cocoon-2.1/src/webapp/samples/protected/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/protected/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:26:20 - 1.6
+++ sitemap.xmap 10 Mar 2004 16:16:12 - 1.7
@@ -104,7 +104,11 @@
map:parameter name=descriptor value=descriptors/params.xml/
map:parameter name=validate
value=username,department_id,theme/
!-- generate protected content --
- map:generate type=serverpages src=docs/protected.xsp/
+ map:generate type=jx src=docs/protected.xml
+map:parameter name=username value={session-attr:username}/
+map:parameter name=department_id
value={session-attr:department_id}/
+map:parameter name=theme value={session-attr:theme}/
+ /map:generate
map:transform src=stylesheets/{theme}-page2html.xsl
map:parameter name=servletPath value={request:servletPath}/
map:parameter name=sitemapURI value={request:sitemapURI}/
cvs commit: cocoon-2.2/src/webapp/samples/protected/docs protected.xml protected.xsp
unico 2004/03/10 08:19:27
Modified:src/webapp/samples/protected sitemap.xmap
Added: src/webapp/samples/protected/docs protected.xml
Removed: src/webapp/samples/protected/docs protected.xsp
Log:
remove dependency on xsp from protected samples
Revision ChangesPath
1.7 +6 -2 cocoon-2.2/src/webapp/samples/protected/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/protected/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 10 Mar 2004 10:27:53 - 1.6
+++ sitemap.xmap 10 Mar 2004 16:19:27 - 1.7
@@ -104,7 +104,11 @@
map:parameter name=descriptor value=descriptors/params.xml/
map:parameter name=validate
value=username,department_id,theme/
!-- generate protected content --
- map:generate type=serverpages src=docs/protected.xsp/
+ map:generate type=jx src=docs/protected.xml
+map:parameter name=username value={session-attr:username}/
+map:parameter name=department_id
value={session-attr:department_id}/
+map:parameter name=theme value={session-attr:theme}/
+ /map:generate
map:transform src=stylesheets/{theme}-page2html.xsl
map:parameter name=servletPath value={request:servletPath}/
map:parameter name=sitemapURI value={request:sitemapURI}/
1.1
cocoon-2.2/src/webapp/samples/protected/docs/protected.xml
Index: protected.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: protected.xml,v 1.1 2004/03/10 16:19:27 unico Exp $ --
page
resources
resource type=file
href=descriptors/auth.xml?cocoon-view=pretty-contentAuthenticator/resource
resource type=file
href=descriptors/params.xml?cocoon-view=pretty-contentValidator/resource
resource type=doc
href=userdocs/actions/database-actions.htmlActions/resource
/resources
titleProtected area/title
content
linkbar/
para
Wow, you have entered secret area,
now its time to examine sub-sitemap and
think about what can be improved regarding flow control and especially
aspect capturing, so that it is not necessary to check session in every
map:match fragment. :-))
br/
#160; -- Martin Man
/para
paraYou are logged in under username:
${parameters.getParameter('username')}/para
paraYour department id is:
${parameters.getParameter('department_id')}/para
paraYour web page theme is: ${parameters.getParameter('theme')}/para
/content
/page
!-- vim: set et ts=2 sw=2: --
cvs commit: cocoon-2.2/src/webapp/samples/myapp/xsp page.xsp
unico 2004/03/10 08:26:19
Modified:src/webapp/samples sitemap.xmap
Removed: src/webapp/samples/xsp samples.xml sitemap.xmap
src/webapp/samples/xsp/java logicsheet.xsp simple.xsp
request.xsp cookie.xsp sessionpage.xsp
cacheable.xsp upload.xsp hello.xsp session.xsp
response.xsp resolver.xsp
src/webapp/samples/xsp/logicsheets hello.xsl
src/webapp/samples/myapp/xml page.xml
src/webapp/samples/soap/stylesheets soap-getquote1.xsl
soap-getquote3.xsl
src/webapp/samples/soap/pages/xscript getquote1.xsp test.xsp
getquote3.xsp getquote2.xsp simple.xsp
src/webapp/samples/xsp/stream OrderPage.xml
src/webapp/samples/xsp/javascript simple.xsp response.xsp
request.xsp hello.xsp session.xsp
src/webapp/samples/myapp sitemap.xmap readme.html
src/webapp/samples/soap/pages currency.xsp temperature.xsp
src/webapp/samples/soap samples.xml sitemap.xmap
src/webapp/samples/myapp/xsl style.xsl
src/webapp/samples/xsp/python hello.xsp
src/webapp/samples/common view-source.xsp
src/webapp/samples/myapp/xsp page.xsp
Log:
xsp has become a block
Revision ChangesPath
1.20 +6 -24 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sitemap.xmap 10 Mar 2004 10:05:07 - 1.19
+++ sitemap.xmap 10 Mar 2004 16:26:19 - 1.20
@@ -28,13 +28,7 @@
map:transformers default=xslt/
map:readers default=resource/
map:serializers default=html/
- map:matchers default=wildcard
- map:matcher logger=sitemap.matcher.header name=filename
src=org.apache.cocoon.matching.modular.CachingRegexpMatcher
-input-module name=request-param
- parameterfilename/parameter
-/input-module
- /map:matcher
- /map:matchers
+ map:matchers default=wildcard/
map:selectors default=browser/
/map:components
@@ -143,9 +137,9 @@
map:match pattern=clearcache.html
map:act type=clear-cache
map:generate src=status type=status/
-map:transform src=context://stylesheets/system/status2html.xslt
+ map:transform src=context://stylesheets/system/status2html.xslt
map:parameter name=contextPath value={request:contextPath}/
-/map:transform
+ /map:transform
map:serialize/
/map:act
/map:match
@@ -153,9 +147,9 @@
map:match pattern=clearpersistentstore.html
map:act type=clear-persistent-store
map:generate src=status type=status/
-map:transform src=context://stylesheets/system/status2html.xslt
+ map:transform src=context://stylesheets/system/status2html.xslt
map:parameter name=contextPath value={request:contextPath}/
-/map:transform
+ /map:transform
map:serialize/
/map:act
/map:match
@@ -172,18 +166,6 @@
map:mount uri-prefix={1} src={1}/ check-reload=yes/
/map:match
- /map:pipeline
-
- map:pipeline internal-only=true
- map:match pattern=view-source
-!-- colourize files that are known to be XML --
-map:match type=filename pattern=((xml)|(xsp)|(xmap)|(xconf))$
- map:generate src=common/view-source.xsp type=serverpages/
- map:serialize/
-/map:match
-!-- all other files are just send as text --
-map:read mime-type=text/plain src=../{request-param:filename}/
- /map:match
/map:pipeline
/map:pipelines
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/language LanguageException.java
unico 2004/03/10 09:58:05 Modified:src/java/org/apache/cocoon/servlet CocoonServlet.java src/java/org/apache/cocoon/bean OldCocoonBean.java CocoonBean.java ProcessorBean.java OldCocoonWrapper.java BatchProcessorBean.java src/java/org/apache/cocoon Cocoon.java src/java/org/apache/cocoon/transformation SimpleFormTransformer.java Added: src/java/org/apache/cocoon ModifiableProcessor.java src/java/org/apache/cocoon/transformation/helpers FormValidatorHelper.java Removed: src/java/org/apache/cocoon/components/language/markup/xsp SOAPHelper.java XSLTExtension.java XSPMarkupLanguage.java XSPGenerator.java XSPSessionHelper.java JSGenerator.java XSPModuleHelper.java XSPFormValidatorHelper.java XSPCookieHelper.java XSPResponseHelper.java XSPObjectHelper.java XSPRequestHelper.java XSPUtil.java src/java/org/apache/cocoon/components/language/markup Logicsheet.java MarkupLanguage.java CocoonMarkupLanguage.java LogicsheetCodeGenerator.java NamedLogicsheet.java AbstractMarkupLanguage.java MarkupCodeGenerator.java src/java/org/apache/cocoon/components/language/markup/xsp/javascript response.xsl session.xsl request.xsl xsp.xsl src/java/org/apache/cocoon/components/language/generator CompiledComponent.java ProgramGeneratorImpl.java ProgramGenerator.java src/java/org/apache/cocoon/components/language/programming CompiledProgrammingLanguage.java Program.java CodeFormatter.java CompilerError.java AbstractProgrammingLanguage.java ProgrammingLanguage.java LanguageCompiler.java src/java/org/apache/cocoon/components/language/markup/xsp/java request.xsl capture.xsl soap.xsl util.xsl action.xsl cookie.xsl session.xsl log.xsl form-validator.xsl sel.xsl response.xsl xscript.xsl xsp.xsl logicsheet-util.xsl input.xsl xscript-lib.xsl jpath.xsl src/java/org/apache/cocoon CompilingProcessor.java src/java/org/apache/cocoon/generation ServerPagesGenerator.java AbstractServerPage.java src/java/org/apache/cocoon/components/language/programming/java NullFormatter.java AbstractJavaCompiler.java JavaProgram.java JavaLanguage.java Jikes.java Pizza.java EclipseJavaCompiler.java Javac.java src/java/org/apache/cocoon/acting ServerPagesAction.java InputModuleAction.java src/java/org/apache/cocoon/components/language/programming/javascript JavascriptProgram.java JavascriptLanguage.java CompiledJavascriptLanguage.java src/java/org/apache/cocoon/components/language LanguageException.java Log: xsp moved to a block Revision ChangesPath 1.29 +5 -12 cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java Index: CocoonServlet.java === RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- CocoonServlet.java8 Mar 2004 14:03:29 - 1.28 +++ CocoonServlet.java10 Mar 2004 17:58:04 - 1.29 @@ -50,7 +50,7 @@ import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.logger.Logger; -import org.apache.cocoon.CompilingProcessor; +import org.apache.cocoon.ModifiableProcessor; import org.apache.cocoon.ConnectionResetException; import org.apache.cocoon.Constants; import org.apache.cocoon.ResourceNotFoundException; @@ -70,13 +70,6 @@ /** * This is the entry point for Cocoon execution as an HTTP Servlet. * - * @author a href=mailto:[EMAIL PROTECTED]Pierpaolo Fumagalli/a - * (Apache Software Foundation) - * @author a href=mailto:[EMAIL PROTECTED]Stefano Mazzocchi/a - * @author a href=mailto:[EMAIL PROTECTED]Nicola Ken Barozzi/a - * @author a href=mailto:[EMAIL PROTECTED]Berin Loritsch/a - * @author a href=mailto:[EMAIL PROTECTED]Carsten Ziegeler/a - * @author a href=mailto:[EMAIL
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/matching MountTableMatcher.java
unico 2004/03/10 09:58:54
Modified:src/java/org/apache/cocoon/matching MountTableMatcher.java
Log:
meta tags
Revision ChangesPath
1.3 +6 -1
cocoon-2.2/src/java/org/apache/cocoon/matching/MountTableMatcher.java
Index: MountTableMatcher.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/MountTableMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MountTableMatcher.java8 Mar 2004 14:02:41 - 1.2
+++ MountTableMatcher.java10 Mar 2004 17:58:54 - 1.3
@@ -73,6 +73,11 @@
*
* @author a href=http://www.apache.org/~sylvain/;Sylvain Wallez/a
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type=Matcher
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=mount-table
*/
public class MountTableMatcher extends AbstractLogEnabled implements
Matcher, ThreadSafe, Serviceable, Parameterizable {
cvs commit: cocoon-2.2/src/java/org/apache/cocoon cocoon.properties
unico 2004/03/10 09:59:35 Modified:src/java/org/apache/cocoon cocoon.properties Log: increment year Revision ChangesPath 1.21 +1 -1 cocoon-2.2/src/java/org/apache/cocoon/cocoon.properties Index: cocoon.properties === RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/cocoon.properties,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cocoon.properties 10 Mar 2004 09:46:24 - 1.20 +++ cocoon.properties 10 Mar 2004 17:59:35 - 1.21 @@ -21,7 +21,7 @@ version=2.2-dev released.version= -year=1999-2003 +year=1999-2004 name=cocoon Name=Cocoon fullname=Apache Cocoon
cvs commit: cocoon-2.2/src/webapp sitemap.xmap
unico 2004/03/10 10:00:11 Modified:src/webapp sitemap.xmap Log: declare mount-table matcher Revision ChangesPath 1.42 +4 -1 cocoon-2.2/src/webapp/sitemap.xmap Index: sitemap.xmap === RCS file: /home/cvs/cocoon-2.2/src/webapp/sitemap.xmap,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sitemap.xmap 10 Mar 2004 10:05:07 - 1.41 +++ sitemap.xmap 10 Mar 2004 18:00:11 - 1.42 @@ -274,6 +274,9 @@ +-- map:matchers default=wildcard map:matcher logger=sitemap.matcher.wildcard name=wildcard src=org.apache.cocoon.matching.WildcardURIMatcher/ +map:matcher name=mount-table src=org.apache.cocoon.matching.MountTableMatcher + map:parameter name=ignore-missing-tables value=true/ +/map:matcher !-- map:matcher logger=sitemap.matcher.regexp name=regexp src=org.apache.cocoon.matching.RegexpURIMatcher/ map:matcher logger=sitemap.matcher.request-parameter name=request-parameter src=org.apache.cocoon.matching.RequestParameterMatcher/
cvs commit: cocoon-2.1/src/blocks/forms/samples/resources forms-advanced-field-styling.xsl forms-field-styling.xsl forms.css forms-lib.js forms-page-styling.xsl forms-calendar-styling.xsl forms-calendar.css
reinhard2004/03/10 13:52:00
Modified:src/blocks/forms/samples/resources
forms-advanced-field-styling.xsl
forms-field-styling.xsl forms.css forms-lib.js
forms-page-styling.xsl forms-calendar-styling.xsl
forms-calendar.css
Log:
Woody--CocoonForms
Revision ChangesPath
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forms-advanced-field-styling.xsl 9 Mar 2004 10:34:10 - 1.1
+++ forms-advanced-field-styling.xsl 10 Mar 2004 21:52:00 - 1.2
@@ -19,8 +19,8 @@
xmlns:fi=http://apache.org/cocoon/forms/1.0#instance;
exclude-result-prefixes=fi
!--+
- | This stylesheet is designed to be included by
'woody-samples-styling.xsl'.
- | It extends the 'woody-field-styling.xsl' with additional stylings.
+ | This stylesheet is designed to be included by
'forms-samples-styling.xsl'.
+ | It extends the 'forms-field-styling.xsl' with additional stylings.
| The very specific advanced stylings as the calendar or htmlarea (both
| also need additional JS files) are separated out of this file.
+--
@@ -48,7 +48,7 @@
/xsl:template
!--+ This template should not be necessary as this stylesheet inherits
- | all templates from 'woody-field-styling.xsl', but without it, it does
+ | all templates from 'forms-field-styling.xsl', but without it, it does
| not work for me (using Xalan 2.5.1). It's like adding all methods of
| a superclass in a subclass and calling everywhere only the super
| implementation.
@@ -74,7 +74,7 @@
xsl:apply-templates select=node()/
/div
script type=text/javascript
- var helpWinxsl:value-of select=$id/ =
woody_createPopupWindow('helpxsl:value-of select=$id/');
+ var helpWinxsl:value-of select=$id/ =
forms_createPopupWindow('helpxsl:value-of select=$id/');
/script
a id={$id} href=# onclick=helpWin{$id}.showPopup('{$id}');return
false;img border=0 src=resources/help.gif//a
/xsl:template
@@ -154,7 +154,7 @@
/tr
/table
script type=text/javascript
-var optxsl:value-of select=generate-id()/ =
woody_createOptionTransfer('xsl:value-of select=@id/');
+var optxsl:value-of select=generate-id()/ =
forms_createOptionTransfer('xsl:value-of select=@id/');
/script
/span
/xsl:template
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forms-field-styling.xsl 9 Mar 2004 10:34:10 - 1.1
+++ forms-field-styling.xsl 10 Mar 2004 21:52:00 - 1.2
@@ -32,7 +32,7 @@
/xsl:template
xsl:template match=body mode=woody-field
-xsl:attribute name=onloadwoody_onload(); xsl:value-of
select=@onload//xsl:attribute
+xsl:attribute name=onloadforms_onload(); xsl:value-of
select=@onload//xsl:attribute
/xsl:template
!--+
@@ -87,7 +87,7 @@
xsl:template match=fi:styling/@submit-on-change mode=styling
xsl:if test=. = 'true'
- xsl:attribute name=onchangewoody_submitForm(this)/xsl:attribute
+ xsl:attribute name=onchangeforms_submitForm(this)/xsl:attribute
/xsl:if
/xsl:template
@@ -393,9 +393,9 @@
xsl:template match=fi:form-template|fi:form-generated
form
xsl:copy-of select=@*/
- xsl:attribute name=onsubmitwoody_onsubmit(); xsl:value-of
select=@onsubmit//xsl:attribute
+ xsl:attribute name=onsubmitforms_onsubmit(); xsl:value-of
select=@onsubmit//xsl:attribute
!-- hidden field to store the submit id --
- input type=hidden name=woody_submit_id/
+ input type=hidden name=forms_submit_id/
xsl:apply-templates/
!-- TODO: consider putting this in the xml stream from the generator?
--
1.2 +3 -3 cocoon-2.1/src/blocks/forms/samples/resources/forms.css
Index: forms.css
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forms.css 9 Mar 2004 10:34:10 - 1.1
+++
cvs commit: cocoon-2.1/src/blocks/xsp/samples/util view-source.xsp
joerg 2004/03/10 15:36:13
Modified:src/blocks/xsp/samples/util view-source.xsp
Log:
*** keyword substitution change ***
Revision ChangesPath
1.2 +288 -288 cocoon-2.1/src/blocks/xsp/samples/util/view-source.xsp
Index: view-source.xsp
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/xsp/samples/util/view-source.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- view-source.xsp 10 Mar 2004 15:37:54 - 1.1
+++ view-source.xsp 10 Mar 2004 23:36:13 - 1.2
@@ -1,288 +1,288 @@
-?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.
---
-!-- Written by Ricardo Rocha [EMAIL PROTECTED] --
-!-- Fixed for version 2.0 by Davanum Srinivas [EMAIL PROTECTED] --
-
-xsp:page language=java xmlns:xsp=http://apache.org/xsp;
-
- xsp:structure
-xsp:includeorg.w3c.dom.*/xsp:include
-xsp:includeorg.apache.cocoon.components.source.SourceUtil/xsp:include
-xsp:includeorg.apache.cocoon.xml.dom.DOMStreamer/xsp:include
-xsp:includeorg.apache.excalibur.xml.dom.DOMParser/xsp:include
-xsp:includeorg.apache.excalibur.source.Source/xsp:include
- /xsp:structure
-
- xsp:logic