[EMAIL PROTECTED] wrote:
geirm 2004/03/17 12:45:15
Modified: test/texen license.txt
test/texen/compare TurbineWeather.java
TurbineWeatherService.java WeatherService.java
test/texen-classpath/compare TurbineWeather.java
TurbineWeatherService.java WeatherService.java
Log:
fixes that broke testbed when license changed. Should make gump happy
Revision Changes Path
1.2 +13 -52 jakarta-velocity/test/texen/license.txt
Index: license.txt
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/texen/license.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- license.txt 19 Mar 2001 06:38:56 -0000 1.1
+++ license.txt 17 Mar 2004 20:45:15 -0000 1.2
@@ -1,55 +1,16 @@
/*
- * Copyright (c) 1997-2000 The Java Apache Project. 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. 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 for use in the Apache JServ servlet engine project
- * <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- * "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- * "Java Apache Project" must not be used to endorse or promote products
- * derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- * nor may "Apache" nor "Apache JServ" appear in their names without
- * prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the Java Apache
- * Project for use in the Apache JServ servlet engine 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
- * 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 Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
+ * Copyright 1997-2004 The Apache Software Foundation.
*
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+
1.5 +2 -0 jakarta-velocity/test/texen/compare/TurbineWeather.java
Index: TurbineWeather.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/texen/compare/TurbineWeather.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineWeather.java 27 Feb 2004 18:43:21 -0000 1.4
+++ TurbineWeather.java 17 Mar 2004 20:45:15 -0000 1.5
@@ -17,11 +17,13 @@
*/
+
import org.apache.turbine.services.TurbineServices;
/**
*
*
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @occupation somnambulist
*/
public class TurbineWeather
1.5 +2 -0 jakarta-velocity/test/texen/compare/TurbineWeatherService.java
Index: TurbineWeatherService.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/texen/compare/TurbineWeatherService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineWeatherService.java 27 Feb 2004 18:43:21 -0000 1.4
+++ TurbineWeatherService.java 17 Mar 2004 20:45:15 -0000 1.5
@@ -17,10 +17,12 @@
*/
+
import org.apache.turbine.services.TurbineBaseService;
/**
*
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @occupation somnambulist
*/
public class TurbineWeatherService extends TurbineBaseService
1.5 +2 -0 jakarta-velocity/test/texen/compare/WeatherService.java
Index: WeatherService.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/texen/compare/WeatherService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WeatherService.java 27 Feb 2004 18:43:21 -0000 1.4
+++ WeatherService.java 17 Mar 2004 20:45:15 -0000 1.5
@@ -17,10 +17,12 @@
*/
+
import org.apache.turbine.services.Service;
/**
*
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @occupation somnambulist
*/
public interface WeatherService extends Service
1.4 +2 -0 jakarta-velocity/test/texen-classpath/compare/TurbineWeather.java
Index: TurbineWeather.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/texen-classpath/compare/TurbineWeather.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineWeather.java 27 Feb 2004 18:43:21 -0000 1.3
+++ TurbineWeather.java 17 Mar 2004 20:45:15 -0000 1.4
@@ -17,11 +17,13 @@
*/
+
import org.apache.turbine.services.TurbineServices;
/**
*
*
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
*/
public class TurbineWeather
{
1.4 +2 -0 jakarta-velocity/test/texen-classpath/compare/TurbineWeatherService.java
Index: TurbineWeatherService.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/texen-classpath/compare/TurbineWeatherService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineWeatherService.java 27 Feb 2004 18:43:21 -0000 1.3
+++ TurbineWeatherService.java 17 Mar 2004 20:45:15 -0000 1.4
@@ -17,10 +17,12 @@
*/
+
import org.apache.turbine.services.TurbineBaseService;
/**
*
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
*/
public class TurbineWeatherService extends TurbineBaseService
implements WeatherService
1.4 +2 -0 jakarta-velocity/test/texen-classpath/compare/WeatherService.java
Index: WeatherService.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/texen-classpath/compare/WeatherService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WeatherService.java 27 Feb 2004 18:43:21 -0000 1.3
+++ WeatherService.java 17 Mar 2004 20:45:15 -0000 1.4
@@ -17,10 +17,12 @@
*/
+
import org.apache.turbine.services.Service;
/**
*
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
*/
public interface WeatherService extends Service
{
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
