You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2001/05/04 13:41:44 UTC
cvs commit: jakarta-jetspeed/src/xml psml.xsd
shesmer 01/05/04 04:41:44
Modified: src/xml Tag: portlet_api psml.xsd
Log:
portlet api 2 implementation
Revision Changes Path
No revision
No revision
1.5.2.1 +45 -51 jakarta-jetspeed/src/xml/psml.xsd
Index: psml.xsd
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/xml/psml.xsd,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- psml.xsd 2001/03/23 04:54:23 1.5
+++ psml.xsd 2001/05/04 11:41:38 1.5.2.1
@@ -1,64 +1,57 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
+Copyright (c) 2000 The Java Apache Project. All rights reserved.
- The Apache Software License, Version 1.1
-
- Copyright (c) 2000-2001 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 Jetspeed" 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" or
- "Apache Jetspeed", 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/>.
+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. Every modification must be notified to the Java Apache Project
+ and redistribution of the modified code without prior notification
+ is not permitted in any form.
+
+4. All advertising materials mentioning features or use of this
+ software must display the following acknowledgment:
+ "This product includes software developed by the Java Apache Project
+ (http://java.apache.org/)."
+
+5. The names "Jetspeed", "Apache Jetspeed" and "Apache Jetspeed
+ Project" must not be used to endorse or promote products
+ derived from this software without prior written permission.
+
+6. Redistributions of any form whatsoever must retain the following
+ acknowledgment:
+ "This product includes software developed by the Java Apache Project
+ (http://java.apache.org/)."
+
+THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT 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.
+License version 1.0
-->
<!--
PSML - Jetspeed Portal Site Markup Language
-Version: $Id: psml.xsd,v 1.5 2001/03/23 04:54:23 taylor Exp $
+Version: $Id: psml.xsd,v 1.5.2.1 2001/05/04 11:41:38 shesmer Exp $
Authors: Kevin A. Burton <bu...@apache.org>
Rapha�l Luta <lu...@networks.vivendi.net>
@@ -121,6 +114,7 @@
<element ref="skin" minOccurs="0" maxOccurs="1"/>
</all>
+ <attribute name="piid" type="string" minOccurs="1" maxOccurs="1"/>
<attribute name="type" type="string" minOccurs="1" maxOccurs="1"/>
<attribute name="parent" type="string" minOccurs="1" maxOccurs="1"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org