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/08/22 06:04:11 UTC

svn commit: r433495 - in /cocoon/branches/BRANCH_2_1_X: ./ src/java/org/apache/cocoon/util/ src/webapp/WEB-INF/entities/ src/webapp/samples/test/reader-mime-type/ tools/src/

Author: crossley
Date: Mon Aug 21 21:04:11 2006
New Revision: 433495

URL: http://svn.apache.org/viewvc?rev=433495&view=rev
Log:
Update to new Apache License header for some odd files.

Modified:
    cocoon/branches/BRANCH_2_1_X/mount-table.xml.sample
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashUtil.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java
    cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/entities/catalog
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.foo
    cocoon/branches/BRANCH_2_1_X/tools/src/jars.xml.tmpl

Modified: cocoon/branches/BRANCH_2_1_X/mount-table.xml.sample
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/mount-table.xml.sample?rev=433495&r1=433494&r2=433495&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/mount-table.xml.sample (original)
+++ cocoon/branches/BRANCH_2_1_X/mount-table.xml.sample Mon Aug 21 21:04: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/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashUtil.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashUtil.java?rev=433495&r1=433494&r2=433495&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashUtil.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/HashUtil.java Mon Aug 21 21:04: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
  * 
@@ -24,7 +25,7 @@
  *
  * @author <a href="mailto:buz@zis.com">Robert Uzgalis</a>
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: HashUtil.java,v 1.3 2004/03/05 13:03:00 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public final class HashUtil {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java?rev=433495&r1=433494&r2=433495&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/SettingsHelper.java Mon Aug 21 21:04:11 2006
@@ -1,16 +1,16 @@
 /*
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.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.
- *
+ * 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/webapp/WEB-INF/entities/catalog
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/entities/catalog?rev=433495&r1=433494&r2=433495&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/entities/catalog (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/entities/catalog Mon Aug 21 21:04: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/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.foo
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.foo?rev=433495&r1=433494&r2=433495&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.foo (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.foo Mon Aug 21 21:04: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/branches/BRANCH_2_1_X/tools/src/jars.xml.tmpl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/src/jars.xml.tmpl?rev=433495&r1=433494&r2=433495&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/src/jars.xml.tmpl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/jars.xml.tmpl Mon Aug 21 21:04: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