geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r482336 [1/3] - in /geronimo/server/trunk: applications/console/geronimo-console-core/ applications/console/geronimo-console-ear/ applications/console/geronimo-console-framework/ applications/console/geronimo-console-standard/ assemblies/ge...
Date Mon, 04 Dec 2006 20:12:28 GMT
Author: kevan
Date: Mon Dec  4 12:12:19 2006
New Revision: 482336

URL: http://svn.apache.org/viewvc?view=rev&rev=482336
Log:
GERONIMO-2537 Fix notices and src headers in recent jee5 updates. Update Web Console notice.txt w/ ibm donation information, add copyright to assembly notice files, and remove ASF v 1.1 license from source borrowed from xerces project

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-core/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-ear/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-framework/NOTICE.txt
    geronimo/server/trunk/applications/console/geronimo-console-standard/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty-minimal/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/NOTICE.txt
    geronimo/server/trunk/configs/cxf-deployer/pom.xml
    geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/cxf/pom.xml
    geronimo/server/trunk/configs/cxf/src/plan/plan.xml
    geronimo/server/trunk/configs/dojo-jetty6/pom.xml
    geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/dojo-jetty6/src/plan/plan.xml
    geronimo/server/trunk/configs/dojo-jetty6/src/site/site.xml
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml
    geronimo/server/trunk/configs/jetty6-clustering-wadi/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-deployer/pom.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/site/site.xml
    geronimo/server/trunk/configs/jetty6/pom.xml
    geronimo/server/trunk/configs/jetty6/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty6/src/site/site.xml
    geronimo/server/trunk/configs/transaction-jta11/pom.xml
    geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml
    geronimo/server/trunk/configs/transaction-jta11/src/site/site.xml
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/site/site.xml
    geronimo/server/trunk/modules/geronimo-cxf-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-cxf/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-cxf/pom.xml
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-config-1.0.xsd
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/site/site.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter1.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter2.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet1.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet2.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/StartupOrderComparatorTest.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/groups.properties
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/users.properties
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war1/WEB-INF/web.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/WEB-INF/web.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war5/WEB-INF/geronimo-jetty.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war5/WEB-INF/web.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/geronimo-clustering-wadi-1.2.xsd
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/WADIClusteredPreHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/WADIClusteredPreHandlerFactory.java
    geronimo/server/trunk/modules/geronimo-jetty6/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/AbstractPreHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJettyServletHolder.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JAASJettyPrincipal.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JAASJettyRealm.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainer.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyDefaultServletHolder.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyEJBWebServiceContext.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterHolder.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyFilterMapping.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecureConnector.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServer.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHolder.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletRegistration.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebConnector.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebContainerStats.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandlerFactory.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/SessionHandlerFactory.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredPreHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionHandlerFactory.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/AJP13Connector.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/GeronimoSSLListener.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/HTTPConnector.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/HTTPSConnector.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/AbstractImmutableHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/ComponentContextHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/InstanceContextHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/JettySecurityHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/LifecycleCommand.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/ThreadClassloaderHandler.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManager.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyRequestLog.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/NCSARequestLog.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/site/site.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ClassLoaderTest.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ContainerTest.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/GBeanInfoTest.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/SecurityTest.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/app/MockWebServiceContainer.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/connector/HTTPConnectorTest.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/data/groups.properties
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/data/users.properties
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war1/WEB-INF/web.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/WEB-INF/web.xml
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/EncodingInfo.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Encodings.java
    geronimo/server/trunk/modules/geronimo-transaction-jta11/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
    geronimo/server/trunk/modules/geronimo-transaction-jta11/project.xml
    geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11.java
    geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11GBean.java
    geronimo/server/trunk/modules/geronimo-transaction-jta11/src/site/site.xml
    geronimo/server/trunk/modules/geronimo-transaction-jta11/src/test/java/org/apache/geronimo/transaction/jta11/TransactionSynchronizationRegistryTest.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-core/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/NOTICE.txt (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -4,3 +4,8 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+Portions of the Web Console were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "IBM Console CLA".

Modified: geronimo/server/trunk/applications/console/geronimo-console-ear/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-ear/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-ear/NOTICE.txt (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-ear/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -4,3 +4,8 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+Portions of the Web Console were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "IBM Console CLA".

Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/NOTICE.txt (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -4,3 +4,8 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+Portions of the Web Console were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "IBM Console CLA".

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/NOTICE.txt (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -4,3 +4,8 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+Portions of the Web Console were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "IBM Console CLA".

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
     
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
     
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/NOTICE.txt (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/configs/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004-2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/configs/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/cxf/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/cxf/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/cxf/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004-2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/configs/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/src/main/resources/META-INF/geronimo-plugin.xml Mon Dec  4 12:12:19 2006
@@ -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: geronimo/server/trunk/configs/dojo-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004-2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/configs/dojo-jetty6/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/src/site/site.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty6/src/site/site.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/src/site/site.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Id: site.xml 432950 2006-08-20 07:30:07Z jdillon $ -->

Modified: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/jetty6-clustering-wadi/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-wadi/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-wadi/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-wadi/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004-2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/configs/jetty6-deployer/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/site/site.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/site/site.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/site/site.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Id$ -->

Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004-2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/configs/jetty6/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/site/site.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/jetty6/src/site/site.xml (original)
+++ geronimo/server/trunk/configs/jetty6/src/site/site.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Id$ -->

Modified: geronimo/server/trunk/configs/transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction-jta11/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/transaction-jta11/pom.xml (original)
+++ geronimo/server/trunk/configs/transaction-jta11/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004-2005 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/configs/transaction-jta11/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction-jta11/src/site/site.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/transaction-jta11/src/site/site.xml (original)
+++ geronimo/server/trunk/configs/transaction-jta11/src/site/site.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Id: site.xml 432950 2006-08-20 07:30:07Z jdillon $ -->

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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: geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/main/resources/META-INF/geronimo-plugin.xml Mon Dec  4 12:12:19 2006
@@ -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: geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2004-2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Rev$ $Date$ -->

Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/site/site.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/site/site.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/site/site.xml Mon Dec  4 12:12:19 2006
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
 
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- $Id$ -->

Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-builder/NOTICE.txt (original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    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: geronimo/server/trunk/modules/geronimo-cxf/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/NOTICE.txt (original)
+++ geronimo/server/trunk/modules/geronimo-cxf/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/modules/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    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: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java Mon Dec  4 12:12:19 2006
@@ -1,22 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/**
+ *  Licensed 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
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
-
 
 package org.apache.geronimo.cxf;
 

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/NOTICE.txt?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/NOTICE.txt (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/NOTICE.txt Mon Dec  4 12:12:19 2006
@@ -1,3 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml Mon Dec  4 12:12:19 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    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: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java Mon Dec  4 12:12:19 2006
@@ -1,10 +1,10 @@
 /**
- *
- * Copyright 2003-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: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd Mon Dec  4 12:12:19 2006
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2004-2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-config-1.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-config-1.0.xsd?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-config-1.0.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-config-1.0.xsd Mon Dec  4 12:12:19 2006
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/xmlconfig.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/xmlconfig.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/xmlconfig.xml Mon Dec  4 12:12:19 2006
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/site/site.xml?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/site/site.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/site/site.xml Mon Dec  4 12:12:19 2006
@@ -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: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter1.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter1.java?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter1.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter1.java Mon Dec  4 12:12:19 2006
@@ -1,10 +1,10 @@
 /**
- *
- * Copyright 2003-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: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter2.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter2.java?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter2.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Filter2.java Mon Dec  4 12:12:19 2006
@@ -1,10 +1,10 @@
 /**
- *
- * Copyright 2003-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: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet1.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet1.java?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet1.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet1.java Mon Dec  4 12:12:19 2006
@@ -1,10 +1,10 @@
 /**
- *
- * Copyright 2003-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: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet2.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet2.java?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet2.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/app/Servlet2.java Mon Dec  4 12:12:19 2006
@@ -1,10 +1,10 @@
 /**
- *
- * Copyright 2003-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: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java?view=diff&rev=482336&r1=482335&r2=482336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java Mon Dec  4 12:12:19 2006
@@ -1,10 +1,10 @@
 /**
- *
- * Copyright 2003-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
  *



Mime
View raw message