You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jh...@locus.apache.org on 2000/05/31 22:29:13 UTC
cvs commit: jakarta-tomcat/src/examples/jsp/num numguess.html numguess.jsp numguess.txt
jhunter 00/05/31 13:29:12
Modified: src/examples/WEB-INF/classes/num NumberGuessBean.java
src/examples/jsp/num numguess.html numguess.jsp numguess.txt
Log:
Made clear the code example I contributed is Apache license. Hope this
doesn't break the build -- I'm having some build problems since it looks like
Tomcat is now dependent on javax.xml.parsers and JDK 1.2. Were some big
decisions made while I was out of the country these last few weeks?
Revision Changes Path
1.2 +60 -3 jakarta-tomcat/src/examples/WEB-INF/classes/num/NumberGuessBean.java
Index: NumberGuessBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/num/NumberGuessBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberGuessBean.java 1999/10/09 00:20:02 1.1
+++ NumberGuessBean.java 2000/05/31 20:29:09 1.2
@@ -1,6 +1,63 @@
-// Number Guess Game
-// Written by Jason Hunter <ja...@kasoftware.com>, CTO, K&A Software
-// Copyright 1999, K&A Software, distributed by Sun with permission
+/*
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 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 acknowlegement:
+ * "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", "Tomcat", and "Apache Software
+ * Foundation" 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"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 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/>.
+ *
+ */
+
+/*
+ * Originally written by Jason Hunter, http://www.servlets.com.
+ */
package num;
1.4 +1 -1 jakarta-tomcat/src/examples/jsp/num/numguess.html
Index: numguess.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/num/numguess.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- numguess.html 1999/11/19 01:30:20 1.3
+++ numguess.html 2000/05/31 20:29:10 1.4
@@ -4,7 +4,7 @@
reserved.
Number Guess Game
- Written by Jason Hunter <ja...@kasoftware.com>, CTO, K&A Software
+ Written by Jason Hunter, CTO, K&A Software
http://www.servlets.com
-->
<head>
1.3 +1 -1 jakarta-tomcat/src/examples/jsp/num/numguess.jsp
Index: numguess.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/num/numguess.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- numguess.jsp 1999/10/20 23:49:48 1.2
+++ numguess.jsp 2000/05/31 20:29:11 1.3
@@ -3,7 +3,7 @@
reserved.
Number Guess Game
- Written by Jason Hunter <ja...@kasoftware.com>, CTO, K&A Software
+ Written by Jason Hunter, CTO, K&A Software
http://www.servlets.com
-->
1.3 +1 -1 jakarta-tomcat/src/examples/jsp/num/numguess.txt
Index: numguess.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/num/numguess.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- numguess.txt 1999/10/20 23:49:48 1.2
+++ numguess.txt 2000/05/31 20:29:11 1.3
@@ -3,7 +3,7 @@
reserved.
Number Guess Game
- Written by Jason Hunter <ja...@kasoftware.com>, CTO, K&A Software
+ Written by Jason Hunter, CTO, K&A Software
http://www.servlets.com
-->
Re: cvs commit: jakarta-tomcat/src/examples/jsp/num numguess.html
numguess.jsp numguess.txt
Posted by co...@costin.dnt.ro.
> Made clear the code example I contributed is Apache license. Hope this
> doesn't break the build -- I'm having some build problems since it looks like
> Tomcat is now dependent on javax.xml.parsers and JDK 1.2. Were some big
> decisions made while I was out of the country these last few weeks?
Regarding javax.xml.parsers - I'm not guilty :-)
About JDK1.2 dependency - tomcat needs to be compiled with 12, but should
work fine with JDK1.1 ( I tested and I keep testing from time to time).
AFAIK the requirement was to run with JDK1.1, and nothing changed in this.
1.2 compiler is required because:
- bugs in 1.1 that affect tag extensions
- tomcat can't work on 1.2 if you use JNDI and ContextClassLoader is not
set. Setting it using reflection is _very_ slow.
- policy based security - it's hard and ugly to use reflection. The code
works with 1.1 ( since ProtectionDomain is not used if no SecurityManager
is set).
It is still possible to move all 1.2-specific files in a different
directory or change build.xml to exclude 1.2 files, but it's a huge pain,
and I don't have the time. You can regard this as a bug if you want, but
it would be better to leave it as it is.
Costin