pier 2003/03/08 12:14:05
Modified: src/idl main.idl
src/idl/cocoon _cocoon_module.idl
src/idl/cocoon/flow _cocoon_flow_module.idl
Log:
"flow" is now an IDL submodule of "cocoon".
Revision Changes Path
1.5 +0 -1 xml-cocoon2/src/idl/main.idl
Index: main.idl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/idl/main.idl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- main.idl 8 Mar 2003 19:54:50 -0000 1.4
+++ main.idl 8 Mar 2003 20:14:05 -0000 1.5
@@ -1,2 +1 @@
#include "cocoon/_cocoon_module.idl"
-#include "cocoon_flow/_cocoon_flow_module.idl"
1.2 +80 -0 xml-cocoon2/src/idl/cocoon/_cocoon_module.idl
Index: _cocoon_module.idl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/idl/cocoon/_cocoon_module.idl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- _cocoon_module.idl 8 Mar 2003 19:50:10 -0000 1.1
+++ _cocoon_module.idl 8 Mar 2003 20:14:05 -0000 1.2
@@ -1,3 +1,81 @@
+/* ========================================================================= *
+ * 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>
+ * The Apache Cocoon module.
+ * </p>
+ *
+ * <p>
+ * <dl>
+ * <dt><b>Authors:</b></dt>
+ * <dd>
+ * <a href="mailto:coliver AT apache.org">Christopher Oliver</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>
+ * </dl>
+ * </p>
+ */
+
module cocoon {
/**
* @see org.apache.cocoon.environment.Request
@@ -41,4 +119,6 @@
};
interface Continuation {
};
+
+ #include "cocoon/flow/_cocoon_flow_module.idl"
};
1.2 +8 -8 xml-cocoon2/src/idl/cocoon/flow/_cocoon_flow_module.idl
Index: _cocoon_flow_module.idl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/idl/cocoon/flow/_cocoon_flow_module.idl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- _cocoon_flow_module.idl 8 Mar 2003 19:54:50 -0000 1.1
+++ _cocoon_flow_module.idl 8 Mar 2003 20:14:05 -0000 1.2
@@ -294,7 +294,7 @@
* </p>
*/
-module cocoon_flow {
+module flow {
interface Cocoon;
interface Database;
@@ -304,12 +304,12 @@
interface WebContinuation;
interface XForm;
- #include "cocoon_flow/Cocoon.idl"
- #include "cocoon_flow/Database.idl"
- #include "cocoon_flow/Global.idl"
- #include "cocoon_flow/Log.idl"
- #include "cocoon_flow/Result.idl"
- #include "cocoon_flow/WebContinuation.idl"
- #include "cocoon_flow/XForm.idl"
+ #include "cocoon/flow/Cocoon.idl"
+ #include "cocoon/flow/Database.idl"
+ #include "cocoon/flow/Global.idl"
+ #include "cocoon/flow/Log.idl"
+ #include "cocoon/flow/Result.idl"
+ #include "cocoon/flow/WebContinuation.idl"
+ #include "cocoon/flow/XForm.idl"
};
