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:20:24 UTC
cvs commit: jakarta-jetspeed/xdocs resources.xml license.xml install.xml faq.xml
taylor 01/03/22 20:20:24
Modified: xdocs resources.xml license.xml install.xml faq.xml
Log:
replace java.apache.org with jakarta.apache.org
Revision Changes Path
1.8 +2 -2 jakarta-jetspeed/xdocs/resources.xml
Index: resources.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/resources.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- resources.xml 2001/03/14 09:50:38 1.7
+++ resources.xml 2001/03/23 04:20:23 1.8
@@ -24,7 +24,7 @@
<a href="http://xml.apache.org/xalan/">Xalan</a>
</li>
<li>
- <a href="http://java.apache.org/turbine/">Turbine</a>
+ <a href="http://jakarta.apache.org/turbine/">Turbine</a>
</li>
<li>
<a href="http://xml.apache.org/cocoon/">Cocoon</a>
@@ -91,7 +91,7 @@
<a href="http://www.jcorporate.com/components/internal/projframe.jsp?category=66">Jcorporate ePortal Product</a>
</li>
<li>
- <a href="http://java.apache.org/main/mail.html">Apache Mailing Lists</a>
+ <a href="http://jakarta.apache.org/main/mail.html">Apache Mailing Lists</a>
</li>
1.5 +39 -36 jakarta-jetspeed/xdocs/license.xml
Index: license.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/license.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- license.xml 2001/02/17 17:27:46 1.4
+++ license.xml 2001/03/23 04:20:23 1.5
@@ -12,52 +12,55 @@
<section name="Jetspeed Public License">
<source test=""><![CDATA[
-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:
-
+ 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
+ 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/>.
]]></source>
</section>
1.17 +1 -1 jakarta-jetspeed/xdocs/install.xml
Index: install.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/install.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- install.xml 2001/02/17 17:27:46 1.16
+++ install.xml 2001/03/23 04:20:23 1.17
@@ -118,7 +118,7 @@
The Apaches James Mail Enterprise Server is available from:
<ul>
<li>
- <a href="http://java.apache.org/james/">http://java.apache.org/james/</a></li>
+ <a href="http://jakarta.apache.org/james/">http://jakarta.apache.org/james/</a></li>
<li>The mail host settings will need to be modified:</li>
<p>
<tomcat_home>/webapps/jetspeed/WEB-INF/conf/TurbineResources.properties</p>
1.6 +2 -2 jakarta-jetspeed/xdocs/faq.xml
Index: faq.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/faq.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- faq.xml 2001/02/17 17:27:45 1.5
+++ faq.xml 2001/03/23 04:20:23 1.6
@@ -20,7 +20,7 @@
</tr>
<tr>
<td>How do I join the Jetspeed mailing list?</td>
-<td>The instructions for joining the Jetspeed mailing list can be found at the <a href="http://java.apache.org/main/mail.html">Java Apache Mail Lists Site</a>
+<td>The instructions for joining the Jetspeed mailing list can be found at the <a href="http://jakarta.apache.org/site/mail.html">Java Apache Mail Lists Site</a>
</td>
</tr>
@@ -186,7 +186,7 @@
The Apaches James Mail Enterprise Server is available from:
</p>
<p>
- <a href="http://java.apache.org/james/">http://java.apache.org/james/</a>
+ <a href="http://jakarta.apache.org/james/">http://jakarta.apache.org/james/</a>
</p>
<p>
The mail host settings will need to be modified:
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org