portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r516448 [28/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...
Date Fri, 09 Mar 2007 16:27:41 GMT
Modified: portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java Fri Mar  9 08:25:47 2007
@@ -1,8 +1,10 @@
-/* Copyright 2004 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/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java Fri Mar  9 08:25:47 2007
@@ -1,8 +1,10 @@
-/* Copyright 2004 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/sso/src/java/org/apache/jetspeed/sso/impl/SSOSiteImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOSiteImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOSiteImpl.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOSiteImpl.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/sso/src/test/org/apache/jetspeed/sso/TestBasicSSO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestBasicSSO.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestBasicSSO.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestBasicSSO.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/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java Fri Mar  9 08:25:47 2007
@@ -1,8 +1,10 @@
-/* Copyright 2004 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/sso/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/xdocs/index.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/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/sso/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/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/statistics/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/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/statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/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/statistics/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/project.properties (original)
+++ portals/jetspeed-2/trunk/components/statistics/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/statistics/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/project.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/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/statistics/src/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java Fri Mar  9 08:25:47 2007
@@ -1,8 +1,10 @@
-/* Copyright 2005 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/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPageStatistics.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/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedPortletStatistics.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/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.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/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedUserStatistics.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/statistics/src/java/org/apache/jetspeed/statistics/impl/LogRecord.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/LogRecord.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/LogRecord.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/LogRecord.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/statistics/src/java/org/apache/jetspeed/statistics/impl/PageLogRecord.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PageLogRecord.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PageLogRecord.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PageLogRecord.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/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.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/statistics/src/java/org/apache/jetspeed/statistics/impl/PortletLogRecord.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortletLogRecord.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortletLogRecord.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortletLogRecord.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/statistics/src/java/org/apache/jetspeed/statistics/impl/UserLogRecord.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserLogRecord.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserLogRecord.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserLogRecord.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/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java Fri Mar  9 08:25:47 2007
@@ -1,8 +1,10 @@
-/* Copyright 2005 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/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.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/statistics/xdocs/aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/xdocs/aggregation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/xdocs/aggregation.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/xdocs/aggregation.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/statistics/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/xdocs/index.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/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/statistics/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/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/statistics/xdocs/stats.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/xdocs/stats.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/xdocs/stats.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/xdocs/stats.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/web-content/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/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/web-content/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/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/web-content/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/project.properties (original)
+++ portals/jetspeed-2/trunk/components/web-content/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/web-content/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/project.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/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/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFrameGenericPortlet.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/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/IFramePortlet.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/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.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/web-content/src/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.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/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java Fri Mar  9 08:25:47 2007
@@ -1,8 +1,10 @@
-/* Copyright 2004 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/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java Fri Mar  9 08:25:47 2007
@@ -1,8 +1,10 @@
-/* Copyright 2004 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/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryList.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryList.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryList.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/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.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/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.java (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.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/web-content/src/test/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/test/log4j.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/test/log4j.properties (original)
+++ portals/jetspeed-2/trunk/components/web-content/src/test/log4j.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/web-content/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/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/webapp-logging/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/pom.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/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/webapp-logging/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/project.properties (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/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/webapp-logging/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/project.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/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/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.java (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.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/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.java (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.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/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/velocity/CommonsLoggingLog4JLogSystem.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/velocity/CommonsLoggingLog4JLogSystem.java?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/velocity/CommonsLoggingLog4JLogSystem.java (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/velocity/CommonsLoggingLog4JLogSystem.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/webapp-logging/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/xdocs/index.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/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/webapp-logging/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/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/core-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/core-build.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/core-build.xml (original)
+++ portals/jetspeed-2/trunk/core-build.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/design-docs/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/maven.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/maven.xml (original)
+++ portals/jetspeed-2/trunk/design-docs/maven.xml 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/design-docs/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/project.properties?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/project.properties (original)
+++ portals/jetspeed-2/trunk/design-docs/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/design-docs/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/project.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/project.xml (original)
+++ portals/jetspeed-2/trunk/design-docs/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/design-docs/src/aggregation/PageAggregationDesign.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/aggregation/PageAggregationDesign.txt?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/aggregation/PageAggregationDesign.txt (original)
+++ portals/jetspeed-2/trunk/design-docs/src/aggregation/PageAggregationDesign.txt 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/design-docs/src/docbook/Jetspeed-2-Architecture.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/docbook/Jetspeed-2-Architecture.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/docbook/Jetspeed-2-Architecture.xml (original)
+++ portals/jetspeed-2/trunk/design-docs/src/docbook/Jetspeed-2-Architecture.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/design-docs/src/entities/EntityPreferences.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/entities/EntityPreferences.txt?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/entities/EntityPreferences.txt (original)
+++ portals/jetspeed-2/trunk/design-docs/src/entities/EntityPreferences.txt 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/design-docs/src/navigations/NavigationalStateProposal.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/navigations/NavigationalStateProposal.txt?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/navigations/NavigationalStateProposal.txt (original)
+++ portals/jetspeed-2/trunk/design-docs/src/navigations/NavigationalStateProposal.txt 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/design-docs/src/objectmodel/ObjectModelOpenIssues.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/objectmodel/ObjectModelOpenIssues.txt?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/objectmodel/ObjectModelOpenIssues.txt (original)
+++ portals/jetspeed-2/trunk/design-docs/src/objectmodel/ObjectModelOpenIssues.txt 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/design-docs/src/pipeline/request_lifcycle.htm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/pipeline/request_lifcycle.htm?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/pipeline/request_lifcycle.htm (original)
+++ portals/jetspeed-2/trunk/design-docs/src/pipeline/request_lifcycle.htm 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/design-docs/src/prefs/PreferencesDesignNotes.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/prefs/PreferencesDesignNotes.txt?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/prefs/PreferencesDesignNotes.txt (original)
+++ portals/jetspeed-2/trunk/design-docs/src/prefs/PreferencesDesignNotes.txt 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/design-docs/src/security/SecurityDesignNotes.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/src/security/SecurityDesignNotes.txt?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/src/security/SecurityDesignNotes.txt (original)
+++ portals/jetspeed-2/trunk/design-docs/src/security/SecurityDesignNotes.txt 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/design-docs/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/xdocs/navigation.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/design-docs/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/design-docs/xdocs/tasks.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/design-docs/xdocs/tasks.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/xdocs/tasks.xml (original)
+++ portals/jetspeed-2/trunk/design-docs/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/docs/charter/PlutoCharter.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/docs/charter/PlutoCharter.html?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/docs/charter/PlutoCharter.html (original)
+++ portals/jetspeed-2/trunk/docs/charter/PlutoCharter.html 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/docs/charter/PortalsCharter.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/docs/charter/PortalsCharter.html?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/docs/charter/PortalsCharter.html (original)
+++ portals/jetspeed-2/trunk/docs/charter/PortalsCharter.html 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/docs/charter/portals-resolution.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/docs/charter/portals-resolution.txt?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/docs/charter/portals-resolution.txt (original)
+++ portals/jetspeed-2/trunk/docs/charter/portals-resolution.txt 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/eclipseASF20Template.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/eclipseASF20Template.xml?view=diff&rev=516448&r1=516447&r2=516448
==============================================================================
--- portals/jetspeed-2/trunk/eclipseASF20Template.xml (original)
+++ portals/jetspeed-2/trunk/eclipseASF20Template.xml Fri Mar  9 08:25:47 2007
@@ -1,26 +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
-
-    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.
--->
-
 <templates><template name="ASF-lic-2.0" description="ASF Liscence 2.0" context="java" enabled="true">/*&#13;
- * Copyright 2000-2001,2004 The Apache Software Foundation.&#13;
- * &#13;
- * Licensed under the Apache License, Version 2.0 (the "License");&#13;
- * you may not use this file except in compliance with the License.&#13;
- * You may obtain a copy of the License at&#13;
+ * Licensed to the Apache Software Foundation (ASF) under one or more&#13;
+ * contributor license agreements.  See the NOTICE file distributed with&#13;
+ * this work for additional information regarding copyright ownership.&#13;
+ * The ASF licenses this file to You under the Apache License, Version 2.0&#13;
+ * (the "License"); you may not use this file except in compliance with&#13;
+ * the License.  You may obtain a copy of the License at&#13;
  * &#13;
  *      http://www.apache.org/licenses/LICENSE-2.0&#13;
  * &#13;
@@ -29,4 +14,5 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#13;
  * See the License for the specific language governing permissions and&#13;
  * limitations under the License.&#13;
- */</template></templates>
\ No newline at end of file
+ */
+ </template></templates>
\ No newline at end of file



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


Mime
View raw message