Author: kevan
Date: Sat Dec 9 14:24:56 2006
New Revision: 485074
URL: http://svn.apache.org/viewvc?view=rev&rev=485074
Log:
GERONIMO-2537 Some files still have old license headers. Update with new license headers. Also, some files were still mising headers
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list
geronimo/server/trunk/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/package.html
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/login.config
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/web.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/index.jsp
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logon.html
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logonError.html
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war4/WEB-INF/web.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1A.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1B.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1C.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan2.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan3.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/services/local.xml
geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/xmlconfig.xml
geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/data/login.config
geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logon.html
geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logonError.html
geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/services/local.xml
geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeyNotFoundException.java
geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeystoreException.java
geronimo/server/trunk/modules/geronimo-test-ddbean/src/site/apt/index.apt
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/BaseGBean.java
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ObjectRetriever.java
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
geronimo/server/trunk/modules/geronimo-tomcat/src/test/java/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java
geronimo/server/trunk/modules/geronimo-transaction-jta11/project.properties
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-22.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-24.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-25.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-23.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-24.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-25.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-23.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-24.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-25.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-1-24.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-2-24.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-1-25.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-2-25.xml
geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/webservices_1_1.xml
geronimo/server/trunk/testsuite/src/main/resources/ResultsSummary.html
geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/testsupport/test-deployment-jms/test-war-jms/src/main/webapp/WEB-INF/web.xml
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/artifact_aliases.properties Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+##
+## 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.
+##
org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/2.0-SNAPSHOT/car
org.apache.geronimo.configs/jetty//car=org.apache.geronimo.configs/jetty6/2.0-SNAPSHOT/car
org.apache.geronimo.configs/jetty-deployer//car=org.apache.geronimo.configs/jetty6-deployer/2.0-SNAPSHOT/car
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list Sat Dec 9 14:24:56 2006
@@ -1,4 +1,21 @@
##
+## 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.
+##
+
+##
## List of deployers to be started for offline deployment
##
org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/package.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/package.html?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/package.html (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/package.html Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<html>
<head>
</head>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/login.config
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/login.config?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/login.config (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/login.config Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+ *
+ * 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.
+ */
jaasTest {
org.apache.geronimo.security.jaas.LocalLoginModule required
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app
xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
@@ -15,4 +31,4 @@
<context-root>
test-spaces
</context-root>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/web.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/web.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -6,4 +22,4 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-</web-app>
\ No newline at end of file
+</web-app>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/index.jsp?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/index.jsp (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war-spaces-in-context/index.jsp Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+ 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.
+-->
<html>
<head><title>WAR Test - Spaces in Context Root</title></head>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logon.html?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logon.html (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logon.html Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<HTML>
<H1>FORM Authentication demo</H1>
<form method="POST" action="j_security_check">
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logonError.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logonError.html?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logonError.html (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/auth/logonError.html Sat Dec 9 14:24:56 2006
@@ -1,5 +1,21 @@
+<!--
+ 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.
+-->
<HTML>
<H1>Authentication ERROR</H1>
Username, password or role incorrect.
-</HTML>
\ No newline at end of file
+</HTML>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war4/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war4/WEB-INF/web.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war4/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war4/WEB-INF/web.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>war4</display-name>
<filter>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1A.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1A.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1A.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1A.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
<moduleId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1B.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1B.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1B.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1B.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
<moduleId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1C.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1C.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1C.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan1C.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
<moduleId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan2.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan2.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan2.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<environment>
<moduleId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan3.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan3.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan3.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan3.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<environment>
<moduleId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
<environment>
<moduleId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/services/local.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/services/local.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/services/local.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/services/local.xml Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<gbeans>
<gbean class="org.apache.geronimo.jetty6.JettyContainerImpl" objectName="geronimo.web:type=WebContainer,container=Jetty">
</gbean>
@@ -8,4 +24,4 @@
<pattern><gbean-name>geronimo.web:type=WebContainer,container=Jetty</gbean-name></pattern>
</endpoint>
</gbean>
-</gbeans>
\ No newline at end of file
+</gbeans>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/xmlconfig.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/xmlconfig.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/xmlconfig.xml Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
>
@@ -6,4 +22,4 @@
<xb:prefix>Ger</xb:prefix>
</xb:namespace>
-</xb:config>
\ No newline at end of file
+</xb:config>
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:dependency>
<dep:groupId>org.mortbay.jetty</dep:groupId>
@@ -24,4 +40,4 @@
<dep:groupId>org.apache.tomcat</dep:groupId>
<dep:artifactId>juli</dep:artifactId>
</dep:dependency>
-</dep:service>
\ No newline at end of file
+</dep:service>
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/data/login.config
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/data/login.config?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/data/login.config (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/data/login.config Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+ *
+ * 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.
+ */
jaasTest {
org.apache.geronimo.security.jaas.JaasLoginCoordinator required
realm="demo-properties-realm"
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logon.html?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logon.html (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logon.html Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<HTML>
<H1>FORM Authentication demo</H1>
<form method="POST" action="j_security_check">
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logonError.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logonError.html?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logonError.html (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/deployables/war3/auth/logonError.html Sat Dec 9 14:24:56 2006
@@ -1,5 +1,21 @@
+<!--
+ 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.
+-->
<HTML>
<H1>Authentication ERROR</H1>
Username, password or role incorrect.
-</HTML>
\ No newline at end of file
+</HTML>
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/services/local.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/services/local.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/services/local.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/resources/services/local.xml Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<gbeans>
<gbean class="org.apache.geronimo.jetty6.JettyContainerImpl" objectName="geronimo.web:type=WebContainer,container=Jetty">
</gbean>
@@ -8,4 +24,4 @@
<pattern><gbean-name>geronimo.web:type=WebContainer,container=Jetty</gbean-name></pattern>
</endpoint>
</gbean>
-</gbeans>
\ No newline at end of file
+</gbeans>
Modified: geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeyNotFoundException.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeyNotFoundException.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeyNotFoundException.java (original)
+++ geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeyNotFoundException.java Sat Dec 9 14:24:56 2006
@@ -1,7 +1,10 @@
/**
- * 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-management/src/main/java/org/apache/geronimo/management/geronimo/KeystoreException.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeystoreException.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeystoreException.java (original)
+++ geronimo/server/trunk/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/KeystoreException.java Sat Dec 9 14:24:56 2006
@@ -1,7 +1,10 @@
/**
- * 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-test-ddbean/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-test-ddbean/src/site/apt/index.apt?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-test-ddbean/src/site/apt/index.apt (original)
+++ geronimo/server/trunk/modules/geronimo-test-ddbean/src/site/apt/index.apt Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+##
+## 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.
+##
geronimo-test-ddbean
A jsr-88 client that lets you edit spec deployment descriptors and vendor plans has to
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/BaseGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/BaseGBean.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/BaseGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/BaseGBean.java Sat Dec 9 14:24:56 2006
@@ -1,16 +1,19 @@
/**
-* 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.
-*/
+ * 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.
+ */
package org.apache.geronimo.tomcat;
import java.util.Iterator;
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ObjectRetriever.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ObjectRetriever.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ObjectRetriever.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ObjectRetriever.java Sat Dec 9 14:24:56 2006
@@ -1,16 +1,19 @@
/**
-* 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.
-*/
+ * 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.
+ */
package org.apache.geronimo.tomcat;
public interface ObjectRetriever {
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java Sat Dec 9 14:24:56 2006
@@ -1,16 +1,19 @@
/**
-* 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.
-*/
+ * 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.
+ */
package org.apache.geronimo.tomcat;
import java.util.Map;
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java Sat Dec 9 14:24:56 2006
@@ -1,16 +1,19 @@
/**
-* 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.
-*/
+ * 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.
+ */
package org.apache.geronimo.tomcat;
import java.io.IOException;
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java Sat Dec 9 14:24:56 2006
@@ -1,16 +1,19 @@
/**
-* 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.
-*/
+ * 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.
+ */
package org.apache.geronimo.tomcat;
import org.apache.catalina.Engine;
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/test/java/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/test/java/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/test/java/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/test/java/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java Sat Dec 9 14:24:56 2006
@@ -1,16 +1,19 @@
/**
-* 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.
-*/
+ * 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.
+ */
package org.apache.geronimo.tomcat.app;
import org.apache.geronimo.webservices.WebServiceContainer;
Modified: geronimo/server/trunk/modules/geronimo-transaction-jta11/project.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction-jta11/project.properties?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction-jta11/project.properties (original)
+++ geronimo/server/trunk/modules/geronimo-transaction-jta11/project.properties Sat Dec 9 14:24:56 2006
@@ -1,4 +1,21 @@
##
+## 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.
+##
+
+##
## $Rev$ $Date$
##
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-22.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-22.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-22.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-22.xml Sat Dec 9 14:24:56 2006
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN' 'http://java.sun.com/j2ee/dtds/web-app_2_2.dtd'>
+<!--
+ 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.
+-->
<web-app>
<display-name>display name</display-name>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-24.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-24.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-24.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-24.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/j2eehttp://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
<description>no description</description>
<display-name>display name</display-name>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-25.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-25.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-25.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-25.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
<description>no description</description>
<display-name>display name</display-name>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-23.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-23.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-23.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-23.xml Sat Dec 9 14:24:56 2006
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+ 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.
+-->
<web-app>
<servlet>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-24.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-24.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-24.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-24.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
<servlet>
<description>MVC Servlet for Jetspeed Portlet Applications</description>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-25.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-25.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-25.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-25.xml Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
<servlet>
<description>MVC Servlet for Jetspeed Portlet Applications</description>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-23.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-23.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-23.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-23.xml Sat Dec 9 14:24:56 2006
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+ 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.
+-->
<web-app>
<icon>
@@ -128,4 +144,4 @@
<description>Users</description>
<role-name>Users</role-name>
</security-role>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-24.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-24.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-24.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-24.xml Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
<description>WebAppDescription</description>
<display-name>WebAppDisplayName</display-name>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-25.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-25.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-25.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-25.xml Sat Dec 9 14:24:56 2006
@@ -1,3 +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
+
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
<description>WebAppDescription</description>
<display-name>WebAppDisplayName</display-name>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-1-24.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-1-24.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-1-24.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-1-24.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
<servlet>
<display-name>Jetspeed Container</display-name>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-2-24.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-2-24.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-2-24.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/j2ee_1_4schema/web-2-24.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>naming itest</display-name>
<servlet>
@@ -17,4 +33,4 @@
<jaxrpc-mapping-file>WEB-INF/wsdl/interop-jaxrpcmapping.xml</jaxrpc-mapping-file>
<service-qname xmlns:interop="http://tempuri.org/4s4c/1/3/wsdl/def/interopLab">interop:interopLab</service-qname>
</service-ref>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-1-25.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-1-25.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-1-25.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-1-25.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
<servlet>
<display-name>Jetspeed Container</display-name>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-2-25.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-2-25.xml?view=diff&rev=485074&r1=485073&r2=485074
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-2-25.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/javaee_5schema/web-2-25.xml Sat Dec 9 14:24:56 2006
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>naming itest</display-name>
<servlet>
|