You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2006/09/21 07:29:18 UTC

svn commit: r448464 [4/5] - in /cocoon/trunk/core: cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/java/org/apache/cocoon/blocks/demo1/ cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/ cocoon-blocks-fw/cocoon-blocks-fw-demo2...

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v11.mod
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v11.mod?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v11.mod (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v11.mod Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 2002-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.dtd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.dtd?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.dtd (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.dtd Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.mod
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.mod?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.mod (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/document-v12.mod Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 2002-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/faq-v10.dtd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/faq-v10.dtd?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/faq-v10.dtd (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/faq-v10.dtd Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/javadoc-v04draft.dtd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/javadoc-v04draft.dtd?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/javadoc-v04draft.dtd (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/javadoc-v04draft.dtd Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/roles-v01.rng
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/roles-v01.rng?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/roles-v01.rng (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/roles-v01.rng Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/sitemap-v06.rng
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/sitemap-v06.rng?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/sitemap-v06.rng (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/sitemap-v06.rng Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/specification-v10.dtd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/specification-v10.dtd?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/specification-v10.dtd (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/specification-v10.dtd Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/todo-v10.dtd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/todo-v10.dtd?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/todo-v10.dtd (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/entities/todo-v10.dtd Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xconf?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xconf (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xconf Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2006 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2006 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/group2samples.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/group2samples.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/group2samples.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/group2samples.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2006 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/not-found.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/not-found.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/not-found.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/not-found.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-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
 
@@ -17,7 +18,7 @@
 <!--+
     | This a simple message page that is shown when a resource is not found.
     |
-    | CVS $Id: not-found.xml,v 1.3 2004/03/06 02:25:58 antonio Exp $
+    | CVS $Id$
     +-->
 <welcome>
  <message>

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/logos/logos.html
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/logos/logos.html?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/logos/logos.html (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/logos/logos.html Wed Sep 20 22:29:11 2006
@@ -1,3 +1,19 @@
+<!--
+  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
+
+  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.
+-->
 <html>
 <body>
 <table border="0" width="100%">

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/main.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/main.js?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/main.js (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/main.js Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
-* Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/prettycontent.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/prettycontent.js?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/prettycontent.js (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/scripts/prettycontent.js Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
-* Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/main.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/main.css?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/main.css (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/main.css Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
-* Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/prettycontent.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/prettycontent.css?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/prettycontent.css (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/resources/styles/prettycontent.css Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
-* Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/directory2xsamples.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/directory2xsamples.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/directory2xsamples.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/directory2xsamples.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/dynamic-page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/dynamic-page2html.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/dynamic-page2html.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/dynamic-page2html.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/filter-blocks.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/filter-blocks.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/filter-blocks.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/filter-blocks.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/samples-pages.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/samples-pages.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/samples-pages.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/samples-pages.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/blocks/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/adding-header.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/adding-header.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/adding-header.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/adding-header.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/complex-page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/complex-page2html.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/complex-page2html.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/complex-page2html.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-header.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-header.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-header.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-header.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-page2html.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-page2html.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-page2html.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-samples2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-samples2html.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-samples2html.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/common/style/xsl/html/simple-samples2html.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xwelcome
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xwelcome?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xwelcome (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/samples.xwelcome Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/flow.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/flow.js?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/flow.js (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/flow.js Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/spring-app.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/spring-app.xsamples?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/spring-app.xsamples (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/spring-app.xsamples Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/test.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/test.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/test.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/dir-links.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/dir-links.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/dir-links.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/dir-links.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-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
 
@@ -17,7 +18,7 @@
 
 <!--
     Add links to subdirectories to index.xml
-    CVS $Id: dir-links.xsl,v 1.2 2004/03/06 02:25:36 antonio Exp $
+    CVS $Id$
  -->
 
 <xsl:stylesheet

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dump.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dump.js?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dump.js (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dump.js Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
-* Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dumper.jx.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dumper.jx.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dumper.jx.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/dom-dumper.jx.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/explain-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/explain-test.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/explain-test.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/explain-test.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/test-transform.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/test-transform.xsl?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/test-transform.xsl (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/flowscript-dom-dump/test-transform.xsl Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/index.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/index.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/index.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/index.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/a.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/a.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/a.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/a.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/explain-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/explain-test.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/explain-test.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/explain-test.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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
 
@@ -15,7 +16,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: explain-test.xml,v 1.2 2004/03/06 02:25:32 antonio Exp $ -->
+<!-- CVS $Id$ -->
 
 <page>
     <title>internal-request test pages</title>

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/c.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/c.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/c.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/c.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/mounted/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/internal-request/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/another-sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/another-sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/another-sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/another-sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+  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
+
+  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.
+-->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:pipelines>

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/hello.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/hello.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/hello.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/hello.xml Wed Sep 20 22:29:11 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/elsewhere/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/explain-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/explain-test.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/explain-test.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/explain-test.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/hellosub.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/hellosub.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/hellosub.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/hellosub.xml Wed Sep 20 22:29:11 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/sub/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/welcome.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/welcome.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/welcome.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/pass-through/welcome.xml Wed Sep 20 22:29:11 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/explain-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/explain-test.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/explain-test.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/explain-test.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/test.html
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/test.html?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/test.html (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/reader-mime-type/test.html Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/explain-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/explain-test.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/explain-test.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/explain-test.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/flow.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/flow.js?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/flow.js (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/flow.js Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
-* Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/explain-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/explain-test.xml?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/explain-test.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/explain-test.xml Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-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
 
@@ -15,7 +16,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: explain-test.xml,v 1.3 2004/06/22 02:41:14 crossley Exp $ -->
+<!-- CVS $Id$ -->
 
 <page>
     <title>sendpage-redirect test</title>

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/flow.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/flow.js?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/flow.js (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/flow.js Wed Sep 20 22:29:11 2006
@@ -1,9 +1,10 @@
 /*
-* Copyright 1999-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: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/sitemap.xmap?view=diff&rev=448464&r1=448463&r2=448464
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage-redirect/sitemap.xmap Wed Sep 20 22:29:11 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-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