unico 2004/01/16 08:50:53
Modified: src/blocks/slide README
lib jars.xml
Added: legal LICENSE.geronimo-spec-jta
src/blocks/slide/lib geronimo-spec-jta-DEV-20040116.jar
Log:
add apache licensed JTA jar from Geronimo project in order
to eliminate the need for users supply their own from sun
Revision Changes Path
1.1 cocoon-2.1/legal/LICENSE.geronimo-spec-jta
Index: LICENSE.geronimo-spec-jta
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 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 "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" 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",
* "Apache Geronimo", 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. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
//
// This source code implements specifications defined by the Java
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
1.6 +6 -10 cocoon-2.1/src/blocks/slide/README
Index: README
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README 14 Jan 2004 12:51:03 -0000 1.5
+++ README 16 Jan 2004 16:50:53 -0000 1.6
@@ -3,25 +3,21 @@
Using Jakarta Slide with Cocoon
====================================
-1. Copy the Java Transaction API (JTA) jar into
- lib/local before building or to ./build/webapp/WEB-INF/lib
- after building.
+1. Set the init parameter 'enable-uploads' under the Cocoon servlet
definition
+ in src/webapp/WEB-INF/web.xml to value 'true'.
-2. Enable the option 'enable-uploads' within
- src/webapp/WEB-INF/web.xml
+2. Startup Cocoon
-3. Startup cocoon
-
-4. Access the slide repository via Cocoon
+3. Access the Slide repository via Cocoon
http://localhost:8888/samples/slide/
[OPTIONAL]
-5. If you want an access via WebDAV uncomment the webdav servlet-mapping
+4. If you want an access via WebDAV uncomment the webdav servlet-mapping
declaration in web.xml
-6. Access WebDAV via MS WebFolders, Cadaver or whatever
+5. Access WebDAV via MS WebFolders, Cadaver or whatever
http://localhost:8888/webdav/
1.1
cocoon-2.1/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040116.jar
<<Binary file>>
1.148 +12 -1 cocoon-2.1/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- jars.xml 13 Jan 2004 21:12:53 -0000 1.147
+++ jars.xml 16 Jan 2004 16:50:53 -0000 1.148
@@ -725,6 +725,17 @@
</file>
<file>
+ <title>JTA spec</title>
+ <description>
+ J2EE Java Transaction API.
+ Implementation taken from the Apache Geronimo project for license
compatibility.
+ </description>
+ <used-by>Slide block</used-by>
+ <lib>slide/lib/geronimo-spec-jta-DEV-20040116.jar</lib>
+ <homepage>http://java.sun.com/products/jta/</homepage>
+ </file>
+
+ <file>
<title>WSDL</title>
<description>
The Web Services Description Language for Java Toolkit (WSDL4J) allows
