svn commit: r643231 [4/10] - in /jakarta/cactus/trunk: cactus-site/src/changes/ cactus-site/src/site/fml/ cactus-site/src/site/resources/ cactus-site/src/site/stylesheets/ cactus-site/src/site/xdoc/ cactus-site/src/site/xdoc/integration/ cactus-site/sr...

[se...@apache.org]

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/BaseWebRequest.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/BaseWebRequest.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/BaseWebRequest.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/BaseWebRequest.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/CactusTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/CactusTestCase.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/CactusTestCase.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/CactusTestCase.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2003-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/HttpServiceDefinition.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/HttpServiceDefinition.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/HttpServiceDefinition.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/HttpServiceDefinition.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/RequestDirectives.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/RequestDirectives.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/RequestDirectives.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/RequestDirectives.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2003-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/ServiceEnumeration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/ServiceEnumeration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/ServiceEnumeration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/ServiceEnumeration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebRequestImpl.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebRequestImpl.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebRequestImpl.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebRequestImpl.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebTestResult.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebTestResult.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebTestResult.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/WebTestResult.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientException.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientException.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientException.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientException.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ParsingException.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ParsingException.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ParsingException.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ParsingException.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ServletExceptionWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ServletExceptionWrapper.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ServletExceptionWrapper.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/ServletExceptionWrapper.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebTestResultParser.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebTestResultParser.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebTestResultParser.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/WebTestResultParser.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/AutoReadHttpURLConnection.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/AutoReadHttpURLConnection.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/AutoReadHttpURLConnection.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/AutoReadHttpURLConnection.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/ConnectionHelper.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/ConnectionHelper.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/ConnectionHelper.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/DefaultHttpClient.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/DefaultHttpClient.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/DefaultHttpClient.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/DefaultHttpClient.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpClientConnectionHelper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpClientConnectionHelper.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpClientConnectionHelper.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpClientConnectionHelper.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolHandler.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolHandler.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolHandler.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolHandler.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2003-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolState.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolState.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolState.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpProtocolState.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2003-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpUtil.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpUtil.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpUtil.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/client/connector/http/HttpUtil.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/AbstractWebConfiguration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/AbstractWebConfiguration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/AbstractWebConfiguration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/AbstractWebConfiguration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/BaseConfiguration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/BaseConfiguration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/BaseConfiguration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Configuration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Configuration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Configuration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ConfigurationInitializer.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ConfigurationInitializer.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ConfigurationInitializer.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ConfigurationInitializer.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2003-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultJspConfiguration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultJspConfiguration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultJspConfiguration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultJspConfiguration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultServletConfiguration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultServletConfiguration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultServletConfiguration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/DefaultServletConfiguration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/JspConfiguration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/JspConfiguration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/JspConfiguration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/JspConfiguration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ServletConfiguration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ServletConfiguration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ServletConfiguration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/ServletConfiguration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Version.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Version.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Version.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/Version.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/WebConfiguration.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/WebConfiguration.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/WebConfiguration.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/configuration/WebConfiguration.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebImplicitObjects.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebImplicitObjects.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebImplicitObjects.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebImplicitObjects.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestCaller.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestCaller.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestCaller.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestCaller.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestController.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestController.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestController.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/AbstractWebTestController.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspImplicitObjects.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspImplicitObjects.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspImplicitObjects.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspImplicitObjects.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestCaller.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestCaller.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestCaller.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestCaller.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestController.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestController.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestController.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/JspTestController.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServerTestCaseCaller.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServerTestCaseCaller.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServerTestCaseCaller.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServerTestCaseCaller.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletImplicitObjects.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletImplicitObjects.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletImplicitObjects.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletImplicitObjects.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestCaller.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestCaller.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestCaller.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestCaller.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestController.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestController.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestController.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletTestController.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletUtil.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletUtil.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletUtil.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/ServletUtil.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/WebImplicitObjects.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/WebImplicitObjects.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/WebImplicitObjects.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/WebImplicitObjects.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLConstants.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLConstants.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLConstants.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLConstants.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLFormatter.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLFormatter.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLFormatter.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLFormatter.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2005 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLTransformer.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLTransformer.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLTransformer.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/XMLTransformer.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/ClassLoaderUtils.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/ClassLoaderUtils.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/ClassLoaderUtils.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/CookieUtil.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/CookieUtil.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/CookieUtil.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/CookieUtil.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/IoUtil.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/IoUtil.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/IoUtil.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/IoUtil.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/JUnitVersionHelper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/JUnitVersionHelper.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/JUnitVersionHelper.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/JUnitVersionHelper.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/StringUtil.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/StringUtil.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/StringUtil.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/StringUtil.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2005 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementChecker.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementChecker.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementChecker.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementChecker.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementError.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementError.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementError.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/TestCaseImplementError.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UniqueGenerator.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UniqueGenerator.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UniqueGenerator.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UniqueGenerator.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UrlUtil.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UrlUtil.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UrlUtil.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/util/UrlUtil.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-2003 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 

Modified: jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java?rev=643231&r1=643230&r2=643231&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java (original)
+++ jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java Mon Mar 31 17:40:39 2008
@@ -1,11 +1,12 @@
 /* 
  * ========================================================================
  * 
- * Copyright 2001-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org