You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/03/09 17:27:41 UTC

svn commit: r516448 [13/42] - in /portals/jetspeed-2/trunk: ./ ant-tasks/ ant-tasks/src/java/org/apache/jetspeed/anttasks/ ant-tasks/xdocs/ app-servers/ app-servers/security/jboss/ app-servers/security/jboss/src/java/META-INF/ app-servers/security/jbos...

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingRequestDispatcher.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingRequestDispatcher.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingRequestDispatcher.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingRequestDispatcher.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/BuildPropertiesHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/BuildPropertiesHelper.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/BuildPropertiesHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/BuildPropertiesHelper.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/DatasourceHelper.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/TestHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/TestHelper.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/TestHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/TestHelper.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/cache/general/TestCachingInterceptors.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/cache/general/TestCachingInterceptors.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/cache/general/TestCachingInterceptors.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/cache/general/TestCachingInterceptors.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockComponent.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockComponent.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockComponent.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockDependentComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockDependentComponent.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockDependentComponent.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/MockDependentComponent.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/SimpleComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/SimpleComponent.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/SimpleComponent.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/components/SimpleComponent.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/cm/test/assembly/TestComponentManager.groovy
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/test/assembly/TestComponentManager.groovy?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/test/assembly/TestComponentManager.groovy (original)
+++ portals/jetspeed-2/trunk/components/cm/test/assembly/TestComponentManager.groovy Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /* ========================================================================
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *

Modified: portals/jetspeed-2/trunk/components/cm/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/xdocs/index.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/xdocs/index.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" ?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/cm/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/xdocs/navigation.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/deploy-tool/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/build.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/build.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/build.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/deploy-tool/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/maven.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/deploy-tool/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/project.properties (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/project.properties Fri Mar  9 08:25:47 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: portals/jetspeed-2/trunk/components/deploy-tool/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/project.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/project.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/deploy-tool/xdocs/deploy-tools.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/xdocs/deploy-tools.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/xdocs/deploy-tools.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/xdocs/deploy-tools.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" ?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/deploy-tool/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/xdocs/index.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/xdocs/index.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" ?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/deploy-tool/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/xdocs/navigation.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/file-cache/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/maven.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/file-cache/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/pom.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/file-cache/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/project.properties (original)
+++ portals/jetspeed-2/trunk/components/file-cache/project.properties Fri Mar  9 08:25:47 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: portals/jetspeed-2/trunk/components/file-cache/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/project.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/project.xml Fri Mar  9 08:25:47 2007
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java (original)
+++ portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/FileCopy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/FileCopy.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/FileCopy.java (original)
+++ portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/FileCopy.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java (original)
+++ portals/jetspeed-2/trunk/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/file-cache/testdata/default.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/testdata/default.psml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/components/file-cache/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/xdocs/navigation.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/header-resource/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/maven.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/header-resource/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/pom.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/header-resource/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/project.properties (original)
+++ portals/jetspeed-2/trunk/components/header-resource/project.properties Fri Mar  9 08:25:47 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: portals/jetspeed-2/trunk/components/header-resource/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/project.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/project.xml Fri Mar  9 08:25:47 2007
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceFactoryImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceFactoryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceFactoryImpl.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java (original)
+++ portals/jetspeed-2/trunk/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/header-resource/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/xdocs/navigation.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/id-generator/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/maven.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/id-generator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/pom.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/id-generator/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/project.properties (original)
+++ portals/jetspeed-2/trunk/components/id-generator/project.properties Fri Mar  9 08:25:47 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: portals/jetspeed-2/trunk/components/id-generator/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/project.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/id-generator/src/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/src/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/src/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java (original)
+++ portals/jetspeed-2/trunk/components/id-generator/src/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/id-generator/src/test/org/apache/jetspeed/idgenerator/TestIdGenerator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/src/test/org/apache/jetspeed/idgenerator/TestIdGenerator.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/src/test/org/apache/jetspeed/idgenerator/TestIdGenerator.java (original)
+++ portals/jetspeed-2/trunk/components/id-generator/src/test/org/apache/jetspeed/idgenerator/TestIdGenerator.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/id-generator/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/xdocs/navigation.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/jetspeed/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/maven.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/pom.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/jetspeed/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/project.properties (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/project.properties Fri Mar  9 08:25:47 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: portals/jetspeed-2/trunk/components/jetspeed/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/project.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/project.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/AbstractScheduler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/AbstractScheduler.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/AbstractScheduler.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/AbstractScheduler.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/BaseJobEntry.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/BaseJobEntry.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/BaseJobEntry.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/BaseJobEntry.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/ScheduledJob.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/ScheduledJob.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/ScheduledJob.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/ScheduledJob.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/Scheduler.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/Scheduler.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/Scheduler.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/WorkerThread.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/WorkerThread.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/WorkerThread.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/scheduler/WorkerThread.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/jetspeed/test/WEB-INF/conf/container.groovy
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/test/WEB-INF/conf/container.groovy?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/test/WEB-INF/conf/container.groovy (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/test/WEB-INF/conf/container.groovy Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /* ========================================================================
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *

Modified: portals/jetspeed-2/trunk/components/jetspeed/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/xdocs/navigation.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/jetspeed/xdocs/tasks.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/xdocs/tasks.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/xdocs/tasks.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/xdocs/tasks.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" ?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/locator/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/maven.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
     
     http://www.apache.org/licenses/LICENSE-2.0
     

Modified: portals/jetspeed-2/trunk/components/locator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/pom.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/locator/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/project.properties (original)
+++ portals/jetspeed-2/trunk/components/locator/project.properties Fri Mar  9 08:25:47 2007
@@ -1,8 +1,9 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #

Modified: portals/jetspeed-2/trunk/components/locator/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/project.xml Fri Mar  9 08:25:47 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 

Modified: portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java (original)
+++ portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-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: portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java (original)
+++ portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java Fri Mar  9 08:25:47 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2000-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 



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