You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/11/28 02:23:09 UTC
cvs commit: cocoon-2.1/legal LICENSE.xindice
joerg 2003/11/27 17:23:09
Modified: lib jars.xml
src/blocks/xmldb/conf xmldb.xconf
. status.xml
Added: src/blocks/xmldb/lib xmldb-api-20021118.jar
xindice-1.1b1.jar
src/blocks/xmldb/conf xmldb.xsamples
src/blocks/xmldb/samples sitemap.xmap
legal LICENSE.xindice
Removed: src/blocks/xmldb/lib xmldb-api-20011111.jar
src/blocks/xmldb/conf xmldb.samplesxpipe
xmldb.deprecated.samplesxpipe
Log:
resurrected the XMLDB samples including XIndice
Revision Changes Path
1.128 +10 -2 cocoon-2.1/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- jars.xml 26 Nov 2003 13:15:14 -0000 1.127
+++ jars.xml 28 Nov 2003 01:23:09 -0000 1.128
@@ -567,8 +567,16 @@
<title>XML DB APIs</title>
<description>Database tailored for the storage of XML data.</description>
<used-by>XML:DB source (xmldb block)</used-by>
- <lib>xmldb/lib/xmldb-api-20011111.jar</lib>
+ <lib>xmldb/lib/xmldb-api-20021118.jar</lib>
<homepage>http://www.xmldb.org/</homepage>
+ </file>
+
+ <file>
+ <title>XML XIndice</title>
+ <description>XML database</description>
+ <used-by>xmldb block</used-by>
+ <lib>xmldb/lib/xindice-1.1b1.jar</lib>
+ <homepage>http://xml.apache.org/xindice/</homepage>
</file>
<file>
1.1 cocoon-2.1/src/blocks/xmldb/lib/xmldb-api-20021118.jar
<<Binary file>>
1.1 cocoon-2.1/src/blocks/xmldb/lib/xindice-1.1b1.jar
<<Binary file>>
1.4 +1 -1 cocoon-2.1/src/blocks/xmldb/conf/xmldb.xconf
Index: xmldb.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmldb/conf/xmldb.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmldb.xconf 24 Oct 2003 12:56:28 -0000 1.3
+++ xmldb.xconf 28 Nov 2003 01:23:09 -0000 1.4
@@ -7,7 +7,7 @@
<!-- Xindice driver -->
<driver class="org.apache.xindice.client.xmldb.DatabaseImpl" type="xindice"/>
<!-- Xindice 1.1 Embedded driver -->
- <driver class="org.apache.xindice.client.xmldb.DatabaseImpl" type="xindice-embed"/>
+ <driver class="org.apache.xindice.client.xmldb.embed.DatabaseImpl" type="xindice-embed"/>
<!-- Add here other XML:DB compliant databases drivers -->
</component-instance>
1.1 cocoon-2.1/src/blocks/xmldb/conf/xmldb.xsamples
Index: xmldb.xsamples
===================================================================
<?xml version="1.0"?>
<xsamples xpath="/samples" unless="group[@name='XML:DB']">
<group name="XML:DB">
<sample name="XML:DB" href="xmldb/">
XML database samples.
</sample>
</group>
</xsamples>
1.203 +16 -10 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- status.xml 27 Nov 2003 03:44:20 -0000 1.202
+++ status.xml 28 Nov 2003 01:23:09 -0000 1.203
@@ -182,6 +182,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="JH" type="fix">
+ Resurrected the XMLDB samples including XIndice 1.1b1 in Cocoon.
+ </action>
<action dev="VG" type="remove">
I18n transformer does not support old configuration syntax anymore
(parameters catalogue-name, catalogue-location). Use <catalogues/>
@@ -192,27 +195,30 @@
attributes.
</action>
<action dev="AG" type="update">
- Update libs Xerces to 2.6.0 and xml-apis.jar
+ Update libs Xerces to 2.6.0 and xml-apis.jar.
</action>
<action dev="SW" type="add">
- The "cocoon" object in flowscript has a new setup(object) method that honors the various Avalon lifecycle
- interfaces implemented by an object. This allows Java classes instanciated by a flowscript to access e.g.
- request, response and components without requiring a dependency on the "FOM_Cocoon" class.
+ The "cocoon" object in flowscript has a new setup(object) method that
+ honors the various Avalon lifecycle interfaces implemented by an object.
+ This allows Java classes instanciated by a flowscript to access e.g.
+ request, response and components without requiring a dependency on the
+ "FOM_Cocoon" class.
</action>
<action dev="SW" type="add">
Woody: new double-list styling for MultivalueField.
</action>
<action dev="SW" type="add">
- New MountTableMatcher to define "mount tables" that allow external directories
- to be mounted in a sitemap without requiring to modify the sitemap. It's use has
- been included in the samples sitemap, thus allowing mounts that surivive a "build clean webapp".
+ New MountTableMatcher to define "mount tables" that allow external
+ directories to be mounted in a sitemap without requiring to modify the
+ sitemap. It's use has been included in the samples sitemap, thus allowing
+ mounts that surivive a "build clean webapp".
</action>
<action dev="SW" type="add">
Woody: added rendering of <wd:help> popup panel on a "?" icon.
</action>
<action dev="SW" type="add">
- Woody: new upload widget. This required some modification on multipart.Part objects
- that can now survice the end of processing of the current request.
+ Woody: new upload widget. This required some modification on multipart.Part
+ objects that can now survice the end of processing of the current request.
</action>
<action dev="DC" type="update" context="core">
Updated Entity Resolver from pre-release to official
1.1 cocoon-2.1/src/blocks/xmldb/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<!-- ========================= Components ================================ -->
<map:components>
<map:generators default="file">
<!-- =================== XML:DB Generators ========================= -->
<!-- BEWARE: these are unmaintained XML:DB generators, going to be -->
<!-- removed soon. -->
<!-- You might want to use the XML:DB pseudo protocol instead. -->
<map:generator name="xmldb" src="org.apache.cocoon.generation.XMLDBGenerator" label="content">
<driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
<base>xmldb:xindice-embed:///db/</base>
</map:generator>
<map:generator name="xmldbcollection" src="org.apache.cocoon.generation.XMLDBCollectionGenerator" label="content">
<driver>org.apache.xindice.client.xmldb.DatabaseImpl</driver>
<base>xmldb:xindice-embed:///db/</base>
</map:generator>
</map:generators>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
<map:serializers default="html"/>
<map:matchers default="wildcard"/>
<map:selectors default="browser"/>
</map:components>
<!-- =========================== Views =================================== -->
<map:views>
<map:view name="content" from-label="content">
<map:serialize type="xml"/>
</map:view>
<map:view from-label="content" name="pretty-content">
<map:transform src="context://stylesheets/system/xml2html.xslt"/>
<map:serialize type="html"/>
</map:view>
<map:view name="links" from-position="last">
<map:serialize type="links"/>
</map:view>
</map:views>
<!-- =========================== Pipelines ================================= -->
<map:pipelines>
<map:pipeline>
<!-- =================== XML:DB Generators ========================= -->
<!-- BEWARE: the following examples use the unmaintained XML:DB -->
<!-- generators, going to be deprecated soon. -->
<!-- You might want to use the XML:DB pseudo protocol instead. -->
<map:match pattern="xmldb-generator/db/**/">
<map:generate type="xmldbcollection" src="/{1}"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="xmldb-generator/db/**">
<map:generate type="xmldb" src="/{1}"/>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
<map:pipeline>
<!-- ======================= XML:DB ============================== -->
<map:match pattern="**">
<map:match type="request-parameter" pattern="xpath">
<map:generate src="xmldb:xindice-embed:///db/{../1}#{1}"/>
<map:serialize type="xml"/>
</map:match>
<map:generate src="xmldb:xindice-embed:///db/{1}"/>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
</map:pipelines>
</map:sitemap>
1.1 cocoon-2.1/legal/LICENSE.xindice
Index: LICENSE.xindice
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* 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 "Xindice" 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 apache@apache.org.
*
* 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 (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999-2001, The dbXML
* Group, L.L.C., http://www.dbxmlgroup.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/