You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by Jorg Heymans <jh...@domek.be> on 2005/11/09 12:28:36 UTC
Re: svn commit: r332021 - in /cocoon/branches/BRANCH_2_1_X: ./
src/blocks/batik/test/htmlunit/org/apache/cocoon/ src/blocks/webdav/test/htmlunit/org/apache/cocoon/
src/java/org/apache/cocoon/components/store/impl/ src/java/org/apache/cocoon/components/xslt...
I know for a fact that the xml formatter from eclipse+wtp does exactly
this :
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * http://www.apache.org/licenses/LICENSE-2.0
Why is the reformatting a problem ?
Jorg
crossley@apache.org wrote:
> Author: crossley
> Date: Wed Nov 9 03:22:09 2005
> New Revision: 332021
>
> URL: http://svn.apache.org/viewcvs?rev=332021&view=rev
> Log:
> Fix formatting of some licenses. They foil the license detection tool.
> Someone's text editor must be messing with spaces.
>
> Modified:
> cocoon/branches/BRANCH_2_1_X/gump.xml
> cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java
> cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java
> cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java
> cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java
>
> Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
> +++ cocoon/branches/BRANCH_2_1_X/gump.xml Wed Nov 9 03:22:09 2005
> @@ -2,6 +2,7 @@
> <!--
> Copyright 1999-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
>
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
> @@ -53,7 +52,7 @@
> * @x-avalon.lifestyle type=singleton
> *
> * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
> - * @version CVS $Id: StoreJanitorImpl.java,v 1.4 2004/02/28 11:47:31 cziegeler Exp $
> + * @version CVS $Id$
> */
> public class StoreJanitorImpl extends AbstractLogEnabled
> implements StoreJanitor, Parameterizable, ThreadSafe,
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> -/*
> - * 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
> - *
> - * http://www.apache.org/licenses/LICENSE-2.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
> + *
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
> Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java
> URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> ==============================================================================
> --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java (original)
> +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java Wed Nov 9 03:22:09 2005
> @@ -1,16 +1,15 @@
> /*
> - * 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.
> + * 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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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.
> - *
> + * 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.
> */
>
>
>
Re: whitespace mess (Was: svn commit: r332021 - in /cocoon/branches/BRANCH_2_1_X)
Posted by Vadim Gritsenko <va...@reverycodes.com>.
Antonio Gallardo wrote:
> A lot of people in the community use eclipse. It is time seriously think
> to add eclipse-styling file to avoid this problems.
Throw in one for IDEA as well.
Vadim
Re: whitespace mess (Was: svn commit: r332021 - in /cocoon/branches/BRANCH_2_1_X)
Posted by Antonio Gallardo <ag...@agssa.net>.
David Crossley wrote:
>, Jorg Heymans wrote:
>
>
>>I know for a fact that the xml formatter from eclipse+wtp does exactly
>>this :
>>
>>
>>
>>>- * http://www.apache.org/licenses/LICENSE-2.0
>>>+ * http://www.apache.org/licenses/LICENSE-2.0
>>>
>>>
>
>Oh no! Damn Eclipse!
>
>
A lot of people in the community use eclipse. It is time seriously think
to add eclipse-styling file to avoid this problems.
WDYT?
Best Regards,
Antonio Gallardo.
Re: whitespace mess (Was: svn commit: r332021 - in /cocoon/branches/BRANCH_2_1_X)
Posted by Jorg Heymans <jh...@domek.be>.
David Crossley wrote:
>
>>Why is the reformatting a problem ?
>
>
> The issue below is that it completely stuffs the pattern
> matching of the license detection tool.
> svn:committers/relicense/src/perl/insert_license.pl
then the pattern matching should be made a bit more flexible, or is the
license void when it doesn't have the required amount of whitespace?
Jorg
whitespace mess (Was: svn commit: r332021 - in /cocoon/branches/BRANCH_2_1_X)
Posted by David Crossley <cr...@apache.org>.
, Jorg Heymans wrote:
>
> I know for a fact that the xml formatter from eclipse+wtp does exactly
> this :
>
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * http://www.apache.org/licenses/LICENSE-2.0
Oh no! Damn Eclipse!
> Why is the reformatting a problem ?
The issue below is that it completely stuffs the pattern
matching of the license detection tool.
svn:committers/relicense/src/perl/insert_license.pl
Also whitespace mangling causes unreadable diffs.
One cannot see the real changes among the mess of
whitespace changes. Then other editors mangle it
in a different way. :-(
-David
> crossley@apache.org wrote:
> > Author: crossley
> > Date: Wed Nov 9 03:22:09 2005
> > New Revision: 332021
> >
> > URL: http://svn.apache.org/viewcvs?rev=332021&view=rev
> > Log:
> > Fix formatting of some licenses. They foil the license detection tool.
> > Someone's text editor must be messing with spaces.
> >
> > Modified:
> > cocoon/branches/BRANCH_2_1_X/gump.xml
> > cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java
> > cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java
> > cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
> > +++ cocoon/branches/BRANCH_2_1_X/gump.xml Wed Nov 9 03:22:09 2005
> > @@ -2,6 +2,7 @@
> > <!--
> > Copyright 1999-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
> >
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/blocks/batik/test/htmlunit/org/apache/cocoon/BatikSampleMimeTypesTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavDavmapTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/htmlunit/org/apache/cocoon/WebdavStep3TestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> > @@ -53,7 +52,7 @@
> > * @x-avalon.lifestyle type=singleton
> > *
> > * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
> > - * @version CVS $Id: StoreJanitorImpl.java,v 1.4 2004/02/28 11:47:31 cziegeler Exp $
> > + * @version CVS $Id$
> > */
> > public class StoreJanitorImpl extends AbstractLogEnabled
> > implements StoreJanitor, Parameterizable, ThreadSafe,
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xslt/TraxProcessor.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > -/*
> > - * 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
> > - *
> > - * http://www.apache.org/licenses/LICENSE-2.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
> > + *
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26186InternalRequestMemoryLeakTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug26571SendPageRedirectTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/Bug36872HttpHeaderActionTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/CalcTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptDOMDumpTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptRecursiveTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/FlowscriptReloadTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HtmlUnitTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/HttpClientResponse.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/InternalRequestTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/ReaderMimeTypeTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/RedirectTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapAnnotationsTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> > Modified: cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java
> > URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java?rev=332021&r1=332020&r2=332021&view=diff
> > ==============================================================================
> > --- cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java (original)
> > +++ cocoon/branches/BRANCH_2_1_X/src/test/htmlunit/org/apache/cocoon/SitemapReloadTestCase.java Wed Nov 9 03:22:09 2005
> > @@ -1,16 +1,15 @@
> > /*
> > - * 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.
> > + * 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
> > *
> > - * http://www.apache.org/licenses/LICENSE-2.0
> > + * 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.
> > - *
> > + * 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.
> > */
> >
> >
> >