fix license headers

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310599 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java
index d2a2f48..3f6bace 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/AbstractCacheStatistics.java
@@ -1,20 +1,24 @@
 package org.codehaus.plexus.cache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
+
 /**
  * @version $Id$
  * @author <a href="mailto:Olivier.LAMY@accor.com">Olivier Lamy</a>
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java
index e056141..fc48512 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/Cache.java
@@ -1,23 +1,26 @@
 package org.codehaus.plexus.cache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 /**
- * Cache interface. 
+ * Cache interface.
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
@@ -26,63 +29,63 @@
 {
     /**
      * Tests to see if the provided key exists within the cache.
-     * 
+     * <p/>
      * NOTE: Due to synchronization issues, if this method returns true, a subsequent request
      * to the {@link #get(Object)} method on the same key might return null as the period of time
      * between the 2 request might have been long enough for the underlying Cache implementation
-     * to remove the key. 
-     * 
+     * to remove the key.
+     *
      * @param key the key to test.
      * @return true if the key exists.
      */
-    public boolean hasKey( Object key );
+    boolean hasKey( Object key );
 
     /**
      * Get the value of the specified key, if it exists in the cache.
-     * 
+     *
      * @param key the key to fetch the contents of.
      * @return the value of the key, or null if not found.
      */
-    public Object get( Object key );
+    Object get( Object key );
 
     /**
      * Put the specified value into the cache under the provided key.
-     * 
-     * @param key the key to put the value into
+     *
+     * @param key   the key to put the value into
      * @param value the object to place into the cache.
      * @return the previous value for the key, or null if the key contained no value.
      */
-    public Object put( Object key, Object value );
+    Object put( Object key, Object value );
 
     /**
      * Register the specified value into the cache under the provided key.
-     * 
-     * This {@link #register(Object, Object)} method is just an optimized version of the {@link #put(Object, Object)} 
-     * method, but does not return the previous value contained with the specified key.  
-     * 
-     * @param key the key to put the value into
+     * <p/>
+     * This {@link #register(Object, Object)} method is just an optimized version of the {@link #put(Object, Object)}
+     * method, but does not return the previous value contained with the specified key.
+     *
+     * @param key   the key to put the value into
      * @param value the object to place into the cache.
      */
-    public void register( Object key, Object value );
+    void register( Object key, Object value );
 
     /**
      * Remove the specified key and value from the cache.
-     * 
-     * @param key the key to the value to remove. 
+     *
+     * @param key the key to the value to remove.
      * @return the value of the key that was removed.
      */
-    public Object remove( Object key );
+    Object remove( Object key );
 
     /**
      * Clear the cache of all entries.
      */
-    public void clear();
+    void clear();
 
     /**
      * Obtain a set of Statistics about the performance of the cache.
-     * 
+     *
      * @return the cache statistics.
      */
-    public CacheStatistics getStatistics();
+    CacheStatistics getStatistics();
 
 }
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java
index bb2e176..808a6ec 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheException.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 /**
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java
index 630c03e..a02813f 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheHints.java
@@ -1,9 +1,5 @@
 package org.codehaus.plexus.cache;
 
-import org.apache.commons.lang.CharSet;
-
-import java.io.File;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,6 +19,11 @@
  * under the License.
  */
 
+import org.apache.commons.lang.CharSet;
+
+import java.io.File;
+
+
 /**
  * CacheHints 
  *
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java
index faa1116..d6eb2fb 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheStatistics.java
@@ -1,23 +1,26 @@
 package org.codehaus.plexus.cache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 /**
- * CacheStatistics 
+ * CacheStatistics
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
@@ -26,34 +29,34 @@
 {
     /**
      * Return the number of hits to content present in the cache.
-     * 
+     *
      * @return the number of hits to content present in the cache.
      */
-    public long getCacheHits();
+    long getCacheHits();
 
     /**
      * Return the number of hits to keys that are not (yet) in the cache.
-     * 
+     *
      * @return the number of requests for content missing from the cache.
      */
-    public long getCacheMiss();
+    long getCacheMiss();
 
     /**
      * Compute for the efficiency of this cache.
      *
      * @return the ratio of cache hits to the cache misses to queries for cache objects
      */
-    public double getCacheHitRate();
+    double getCacheHitRate();
 
     /**
      * Return the size of the current cache.
-     * 
+     *
      * @return the size of the current cache.
      */
-    public long getSize();
+    long getSize();
 
     /**
      * Clear the statistics of the cache.
      */
-    public void clear();
+    void clear();
 }
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java
index 821d2b2..d330b6d 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/CacheableWrapper.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache;
 
 /*
- * Copyright 2007 The Codehaus Foundation.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import java.io.Serializable;
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java
index edd53a6..ffb8e3b 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/CacheBuilder.java
@@ -1,26 +1,30 @@
 package org.codehaus.plexus.cache.builder;
 
+/*
+ * 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.
+ */
+
 import org.codehaus.plexus.cache.Cache;
 
-/*
- * Copyright 2001-2007 The Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 /**
  * CacheBuilder Interface, for obtaining caches from plexus using hints or clazz names.
- * 
+ *
  * @author <a href="mailto:Olivier.LAMY@accor.com">Olivier Lamy</a>
  * @version $Id$
  * @since 3 February, 2007
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java
index bdba376..ec499fa 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/builder/DefaultCacheBuilder.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.builder;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.codehaus.plexus.cache.Cache;
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java
index cab3af9..4d5976d 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheCreator.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.factory;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.codehaus.plexus.cache.Cache;
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java
index a61b9c3..e27ab8c 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/factory/CacheFactory.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.factory;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import java.io.IOException;
diff --git a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java
index 5e86e11..d12c41d 100644
--- a/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java
+++ b/spring-cache-api/src/main/java/org/codehaus/plexus/cache/impl/NoCacheCache.java
@@ -1,32 +1,36 @@
 package org.codehaus.plexus.cache.impl;
 
+/*
+ * 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.
+ */
+
 import org.codehaus.plexus.cache.Cache;
 import org.codehaus.plexus.cache.CacheStatistics;
 
-/*
- * Copyright 2001-2007 The Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 /**
  * Simple no-op provider of a Cache.
- * 
+ * <p/>
  * Nothing is stored, nothing is tracked, no statistics even.
- * 
- * @since 5 February, 2007
- * @version $Id$
+ *
  * @author <a href="mailto:Olivier.LAMY@accor.com">Olivier Lamy</a>
+ * @version $Id$
+ * @since 5 February, 2007
  */
 public class NoCacheCache
     implements Cache
diff --git a/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java b/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java
index f62ecfa..d7aa9e5 100644
--- a/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java
+++ b/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCache.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.ehcache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import net.sf.ehcache.Cache;
diff --git a/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java b/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java
index 26f6c49..7282bf8 100644
--- a/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java
+++ b/spring-cache-providers/spring-cache-ehcache/src/main/java/org/codehaus/plexus/cache/ehcache/EhcacheCreator.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.ehcache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.apache.commons.lang.SystemUtils;
diff --git a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
index d0b3647..f36ef8a 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
+++ b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCache.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.hashmap;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.codehaus.plexus.cache.AbstractCacheStatistics;
diff --git a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java
index 58228dd..21453e3 100644
--- a/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java
+++ b/spring-cache-providers/spring-cache-hashmap/src/main/java/org/codehaus/plexus/cache/hashmap/HashMapCacheCreator.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.hashmap;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.codehaus.plexus.cache.Cache;
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java b/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
index bda36a7..71c95c0 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
+++ b/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCache.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.oscache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import com.opensymphony.oscache.base.CacheEntry;
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java b/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java
index 9643dee..988632f 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java
+++ b/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheCreator.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.oscache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.apache.commons.lang.SystemUtils;
diff --git a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java b/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java
index 5780b54..5347e41 100644
--- a/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java
+++ b/spring-cache-providers/spring-cache-oscache/src/main/java/org/codehaus/plexus/cache/oscache/OsCacheStatistics.java
@@ -1,20 +1,24 @@
 package org.codehaus.plexus.cache.oscache;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
+
 import org.codehaus.plexus.cache.CacheStatistics;
 import org.codehaus.plexus.cache.AbstractCacheStatistics;
 
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java
index 651c71c..98ed0ae 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/AbstractCacheTestCase.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.test;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import junit.framework.TestCase;
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/EnglishNumberFormat.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/EnglishNumberFormat.java
index d1e4beb..c3388f4 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/EnglishNumberFormat.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/EnglishNumberFormat.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.test;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.apache.commons.lang.StringUtils;
@@ -21,7 +24,7 @@
 
 /**
  * EnglishNumberFormat - Silly utility to generate text from numbers.
- * Used in the generation of large data sets for the Cache testing. 
+ * Used in the generation of large data sets for the Cache testing.
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
@@ -29,48 +32,18 @@
 public class EnglishNumberFormat
 {
     public static final String[] basic = { // basic numbers from 1 to 19 
-    null, // zero
-        "one",
-        "two",
-        "three",
-        "four",
-        "five",
-        "six",
-        "seven",
-        "eight",
-        "nine",
-        "ten",
-        "eleven",
-        "twelve",
-        "thirteen",
-        "fourteen",
-        "fifteen",
-        "sixteen",
-        "seventeen",
-        "eighteen",
-        "nineteen" };
+        null, // zero
+        "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve", "thirteen",
+        "fourteen", "fifteen", "sixteen", "seventeen", "eighteen", "nineteen" };
 
     public static final String[] tens = { // numbers representing the 2nd digit 
-    null, // zeroty ??
+        null, // zeroty ??
         null, // ten
-        "twenty",
-        "thirty",
-        "fourty",
-        "fifty",
-        "sixty",
-        "seventy",
-        "eighty",
-        "ninety" };
+        "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", "eighty", "ninety" };
 
     public static final String[] dreds = { // number multiples 
-    null, // tendred ??
-        "hundred",
-        "thousand",
-        "million",
-        "billion",
-        "trillion",
-        "quadrillion",
-        "quintillion" };
+        null, // tendred ??
+        "hundred", "thousand", "million", "billion", "trillion", "quadrillion", "quintillion" };
 
     public String toText( long number )
     {
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java
index cb4d99a..655f159 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/AbstractTestWineService.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.test.examples.wine;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import junit.framework.TestCase;
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
index 0889251..011c2c5 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/DefaultWineService.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.test.examples.wine;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.codehaus.plexus.cache.builder.CacheBuilder;
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java
index 83ae9bd..37378f1 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/MockWineDao.java
@@ -1,20 +1,22 @@
 package org.codehaus.plexus.cache.test.examples.wine;
 
-
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.springframework.stereotype.Repository;
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/Wine.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/Wine.java
index 5feb5e6..58b0548 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/Wine.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/Wine.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.test.examples.wine;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import java.io.Serializable;
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineDao.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineDao.java
index eaa1f5f..599c3c8 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineDao.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineDao.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.cache.test.examples.wine;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 /**
diff --git a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineService.java b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineService.java
index 89df9b4..08ed70c 100644
--- a/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineService.java
+++ b/spring-cache-test/src/main/java/org/codehaus/plexus/cache/test/examples/wine/WineService.java
@@ -1,30 +1,32 @@
 package org.codehaus.plexus.cache.test.examples.wine;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 /**
- * 
- * @since 5 February, 2007
- * @version $Id$
  * @author <a href="mailto:Olivier.LAMY@accor.com">Olivier Lamy</a>
+ * @version $Id$
+ * @since 5 February, 2007
  */
 public interface WineService
 {
     String ROLE = WineService.class.getName();
 
-    public Wine getWine( String name );
+    Wine getWine( String name );
 }
diff --git a/spring-cache-test/src/test/java/org/codehaus/plexus/cache/test/EnglishNumberFormatTest.java b/spring-cache-test/src/test/java/org/codehaus/plexus/cache/test/EnglishNumberFormatTest.java
index fa4721f..06eeab6 100644
--- a/spring-cache-test/src/test/java/org/codehaus/plexus/cache/test/EnglishNumberFormatTest.java
+++ b/spring-cache-test/src/test/java/org/codehaus/plexus/cache/test/EnglishNumberFormatTest.java
@@ -1,25 +1,28 @@
 package org.codehaus.plexus.cache.test;
 
 /*
- * Copyright 2001-2007 The Codehaus.
+ * 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
  *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import junit.framework.TestCase;
 
 /**
- * EnglishNumberFormatTest 
+ * EnglishNumberFormatTest
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$