You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by dg...@apache.org on 2004/01/10 22:19:57 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/util ServletContextWriter.java TokenProcessor.java
dgraham 2004/01/10 13:19:57
Modified: src/share/org/apache/struts/util ServletContextWriter.java
TokenProcessor.java
Log:
Fixed Apache license.
Revision Changes Path
1.4 +13 -17 jakarta-struts/src/share/org/apache/struts/util/ServletContextWriter.java
Index: ServletContextWriter.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/ServletContextWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServletContextWriter.java 10 Jan 2004 21:03:36 -0000 1.3
+++ ServletContextWriter.java 10 Jan 2004 21:19:57 -0000 1.4
@@ -4,10 +4,10 @@
* $Date$
*
* ====================================================================
- *
+ *
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
* 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
@@ -23,20 +23,20 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
+ * any, must include the following acknowledgement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Struts", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * 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"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * 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
@@ -57,17 +57,14 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- */
-
+ */
package org.apache.struts.util;
-
import java.io.PrintWriter;
import java.io.StringWriter;
import javax.servlet.ServletContext;
-
/**
* A PrintWriter implementation that uses the logging facilities of a
* <code>javax.servlet.ServletContext</code> to output its results. Output
@@ -77,7 +74,6 @@
*
* @version $Revision$ $Date$
*/
-
public class ServletContextWriter extends PrintWriter {
1.5 +7 -7 jakarta-struts/src/share/org/apache/struts/util/TokenProcessor.java
Index: TokenProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/TokenProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TokenProcessor.java 10 Jan 2004 21:03:36 -0000 1.4
+++ TokenProcessor.java 10 Jan 2004 21:19:57 -0000 1.5
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
@@ -35,8 +35,8 @@
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * 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
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org