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 ta...@apache.org on 2001/03/23 05:32:16 UTC
cvs commit: jakarta-jetspeed/webapp/jcm jetspeed-content.xml
taylor 01/03/22 20:32:16
Modified: webapp/jcm jetspeed-content.xml
Log:
replace java.apache.org with jakarta.apache.org
Revision Changes Path
1.5 +42 -38 jakarta-jetspeed/webapp/jcm/jetspeed-content.xml
Index: jetspeed-content.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/jcm/jetspeed-content.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetspeed-content.xml 2001/01/22 14:57:18 1.4
+++ jetspeed-content.xml 2001/03/23 04:32:16 1.5
@@ -1,56 +1,60 @@
<?xml version="1.0"?>
<!--
- * Copyright (c) 1998 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.
+ * 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
+ * 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.
- *
- * License version 1.0
- *
+ * 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/>.
-->
-<content version="1.0.0" xmlns="http://java.apache.org/jetspeed/xml/jetspeed-portal-content">
+<content version="1.0.0" xmlns="http://jakarta.apache.org/jetspeed/xml/jetspeed-portal-content">
<!--
TODO: break the quote portion out into:
@@ -64,7 +68,7 @@
<channel>
<title>Jetspeed</title>
- <link>http://java.apache.org/jetspeed</link>
+ <link>http://jakarta.apache.org/jetspeed</link>
<description>
Jetspeed content
</description>
@@ -75,7 +79,7 @@
<image>
<title>Jetspeed</title>
<url>images/topics/jetspeed.gif</url>
- <link>http://java.apache.org/jetspeed</link>
+ <link>http://jakarta.apache.org/jetspeed</link>
</image>
</entry>
@@ -162,7 +166,7 @@
<item>
<topic>jetspeed</topic>
<title>It works</title>
- <link>http://java.apache.org/jetspeed</link>
+ <link>http://jakarta.apache.org/jetspeed</link>
<description>
If you see this item, you've successfully installed and configured
your Jetspeed portal. Congratulations
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org