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/07 01:29:48 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util BaseInitable.java
taylor 01/03/06 16:29:48
Modified: src/java/org/apache/jetspeed/util BaseInitable.java
Log:
update license (ssl test run)
Revision Changes Path
1.2 +40 -37 jakarta-jetspeed/src/java/org/apache/jetspeed/util/BaseInitable.java
Index: BaseInitable.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/BaseInitable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseInitable.java 2000/07/31 00:04:06 1.1
+++ BaseInitable.java 2001/03/07 00:29:47 1.2
@@ -1,6 +1,8 @@
-/*
+/* ====================================================================
+ * The Apache Software License, Version 1.1
*
- * Copyright (c) 1998 The Java Apache Project. All rights reserved.
+ * 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
@@ -14,39 +16,40 @@
* 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/>.
*/
package org.apache.jetspeed.util;
@@ -55,7 +58,7 @@
Provides base functionality for an Initable
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: BaseInitable.java,v 1.1 2000/07/31 00:04:06 burton Exp $
+@version $Id: BaseInitable.java,v 1.2 2001/03/07 00:29:47 taylor Exp $
*/
public class BaseInitable implements Initable {
@@ -68,7 +71,7 @@
@see Initable.isInitialized#
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: BaseInitable.java,v 1.1 2000/07/31 00:04:06 burton Exp $
+ @version $Id: BaseInitable.java,v 1.2 2001/03/07 00:29:47 taylor Exp $
*/
public boolean isInitialized() {
return this.initialized;
@@ -79,7 +82,7 @@
@see Initable.setInitialized#
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: BaseInitable.java,v 1.1 2000/07/31 00:04:06 burton Exp $
+ @version $Id: BaseInitable.java,v 1.2 2001/03/07 00:29:47 taylor Exp $
*/
public void setInitialized( boolean initialized ) {
this.initialized = initialized;
Re: cvs commit:
jakarta-jetspeed/src/java/org/apache/jetspeed/util BaseInitable.java
Posted by Jon Stevens <jo...@latchkey.com>.
on 3/6/01 4:29 PM, "taylor@apache.org" <ta...@apache.org> wrote:
> taylor 01/03/06 16:29:48
>
> Modified: src/java/org/apache/jetspeed/util BaseInitable.java
> Log:
> update license (ssl test run)
>
works for me.
-jon
--
If you come from a Perl or PHP background, JSP is a way to take
your pain to new levels. --Anonymous
<http://jakarta.apache.org/velocity/ymtd/ymtd.html>