pier 2003/03/08 13:18:57
Modified: src/idl main.idl
src/idl/cocoon _module.idl
src/idl/cocoon/flow Cocoon.idl XForm.idl
Added: src/idl/java Exception.idl Iterator.idl JavaObject.idl
OutputStream.idl _module.idl
Log:
Added the "Java" package referencing to "native" Java objects.
Revision Changes Path
1.7 +1 -0 xml-cocoon2/src/idl/main.idl
Index: main.idl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/idl/main.idl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- main.idl 8 Mar 2003 20:16:00 -0000 1.6
+++ main.idl 8 Mar 2003 21:18:57 -0000 1.7
@@ -1 +1,2 @@
+#include "java/_module.idl"
#include "cocoon/_module.idl"
1.4 +0 -8 xml-cocoon2/src/idl/cocoon/_module.idl
Index: _module.idl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/idl/cocoon/_module.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- _module.idl 8 Mar 2003 20:19:15 -0000 1.3
+++ _module.idl 8 Mar 2003 21:18:57 -0000 1.4
@@ -98,12 +98,6 @@
interface ComponentManager {
};
- /**
- * @see java.io.OutputStream
- */
- interface OutputStream {
- };
-
interface Function {
};
@@ -115,8 +109,6 @@
typedef Object RowsByIndex[ROWCOUNT][COLUMNCOUNT];
interface XForm;
typedef sequence<XForm> XForms;
- interface Iterator {
- };
interface Continuation {
};
1.2 +1 -1 xml-cocoon2/src/idl/cocoon/flow/Cocoon.idl
Index: Cocoon.idl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/idl/cocoon/flow/Cocoon.idl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cocoon.idl 8 Mar 2003 19:53:16 -0000 1.1
+++ Cocoon.idl 8 Mar 2003 21:18:57 -0000 1.2
@@ -96,7 +96,7 @@
* @return Whatever the Cocoon processor returns (????).
* @exception Exception If an error occurs.
*/
- boolean process(in string uri, in Object object, in cocoon::OutputStream
stream);
+ boolean process(in string uri, in Object object, in java::OutputStream stream);
/**
* Set the Scope object in the session object of the current
1.2 +1 -1 xml-cocoon2/src/idl/cocoon/flow/XForm.idl
Index: XForm.idl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/idl/cocoon/flow/XForm.idl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XForm.idl 8 Mar 2003 19:53:16 -0000 1.1
+++ XForm.idl 8 Mar 2003 21:18:57 -0000 1.2
@@ -125,7 +125,7 @@
* @param expr xpath expression
* @return java.util.Iterator representing a nodeset
*/
- cocoon::Iterator iterate(in string expr);
+ java::Iterator iterate(in string expr);
/**
* Sends view to presentation pipeline and waits for subsequent submission.
1.1 xml-cocoon2/src/idl/java/Exception.idl
Index: Exception.idl
===================================================================
/**
* <p>
* A Java "native" Exception.
* </p>
* <p>
* Reference to a
* <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Exception.html";
* >java.lang.Exception</a> object.
* </p>
*
* <p>
* <dl>
* <dt><b>Copyright:</b></dt>
* <dd>
* Copyright ©
* <a href="http://java.sun.com/";>Sun Microsystems, Inc.</a>
* All rights reserved.
* </dd>
* </dl>
* </p>
*/
exception Exception {
};
1.1 xml-cocoon2/src/idl/java/Iterator.idl
Index: Iterator.idl
===================================================================
/**
* <p>
* A Java "native" Iterator.
* </p>
* <p>
* Reference to a
* <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/util/Iterator.html";
* >java.util.Iterator</a> object.
* </p>
*
* <p>
* <dl>
* <dt><b>Copyright:</b></dt>
* <dd>
* Copyright ©
* <a href="http://java.sun.com/";>Sun Microsystems, Inc.</a>
* All rights reserved.
* </dd>
* </dl>
* </p>
*/
interface Iterator:JavaObject {
};
1.1 xml-cocoon2/src/idl/java/JavaObject.idl
Index: JavaObject.idl
===================================================================
/**
* <p>
* A Java "native" Object.
* </p>
* <p>
* Reference to a
* <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Object.html";
* >java.lang.Object</a> object.
* </p>
*
* <p>
* <dl>
* <dt><b>Copyright:</b></dt>
* <dd>
* Copyright ©
* <a href="http://java.sun.com/";>Sun Microsystems, Inc.</a>
* All rights reserved.
* </dd>
* </dl>
* </p>
*/
interface JavaObject {
};
1.1 xml-cocoon2/src/idl/java/OutputStream.idl
Index: OutputStream.idl
===================================================================
/**
* <p>
* A Java "native" OutputStream.
* </p>
* <p>
* Reference to a
* <a
href="http://java.sun.com/products/jdk/1.2/docs/api/java/io/OutputStream.html";
* >java.io.OutputStream</a> object.
* </p>
*
* <p>
* <dl>
* <dt><b>Copyright:</b></dt>
* <dd>
* Copyright ©
* <a href="http://java.sun.com/";>Sun Microsystems, Inc.</a>
* All rights reserved.
* </dd>
* </dl>
* </p>
*/
interface OutputStream:JavaObject {
};
1.1 xml-cocoon2/src/idl/java/_module.idl
Index: _module.idl
===================================================================
/* ========================================================================= *
* 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 *
* 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 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 *
* <mailto:[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 DAMAGE *
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVI- *
* CES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER *
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABI- *
* LITY, 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 individua- *
* ls on behalf of the Apache Software Foundation and was originally created *
* by Stefano Mazzocchi <mailto:[EMAIL PROTECTED]>. For more information *
* about the Apache Software Foundation please see <http://www.apache.org/>. *
* *
* ------------------------------------------------------------------------- */
/**
* <p>
* This module contains all "native" objects visible from
* scripting layers available in Cocoon.
* </p>
* <p>
* In languages such as JavaScript there is no need to implement wrapper
* for those object, as commodity ones are usually provided by the scripting
* framework.
* </p>
* <p>
* It is required, though, to provide the definition of all Java
* "native" ojbects accessible from the Apache Cocoon scripting
* layers, because if any of the future scripting environment implemented
* does not support automatic wrapping, developers will have to implement
* those manually.
* </p>
*
* <p>
* <dl>
* <dt><b>Authors:</b></dt>
* <dd>
* <a href="mailto:pier AT apache.org">Pier Fumagalli</a>.
* </dd>
* <dt><b>Copyright:</b></dt>
* <dd>
* Copyright © 2002-2003
* <a href="http://www.apache.org/";>The Apache Software Foundation</a>.
* All rights reserved.
* </dd>
* <dd>
* Copyright ©
* <a href="http://java.sun.com/";>Sun Microsystems, Inc.</a>
* All rights reserved.
* </dd>
* </dl>
* </p>
*/
module java {
/**
* <p>
* A Java "native" Exception.
* </p>
* <p>
* Reference to a
* <a
href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Exception.html";
* >java.lang.Exception</a> object.
* </p>
*/
exception Exception {
};
interface Iterator;
interface JavaObject;
interface OutputStream;
#include "java/JavaObject.idl"
#include "java/OutputStream.idl"
#include "java/Iterator.idl"
};
