[maven-scm] copy for tag geronimo-2.1.7
git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-2.1.7@1038473 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
index 55db59d..fe9aa55 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,8 +1,3 @@
-=========================================================================
-== NOTICE file corresponding to section 4(d) of the Apache License, ==
-== Version 2.0, in this case for the Apache Geronimo distribution. ==
-=========================================================================
-
Apache Geronimo
Copyright 2003-2010 The Apache Software Foundation
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLdapLoginModule.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLdapLoginModule.java
index 4a9ae25..48e668e 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLdapLoginModule.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLdapLoginModule.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import java.io.IOException;
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLoginmodule.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLoginmodule.java
index 7df3857..2f747f4 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLoginmodule.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderLoginmodule.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import java.security.Principal;
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderPropertiesFileLoginModule.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderPropertiesFileLoginModule.java
index 92c7e34..10bcf02 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderPropertiesFileLoginModule.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderPropertiesFileLoginModule.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import java.io.IOException;
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderSqlLoginmodule.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderSqlLoginmodule.java
index 5f0c610..b87c5c6 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderSqlLoginmodule.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GenericHttpHeaderSqlLoginmodule.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import java.io.IOException;
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderHandler.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderHandler.java
index 8c3a5b4..d80f5bc 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderHandler.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderHandler.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import java.util.Map;
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderMismatchException.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderMismatchException.java
index 9e10a4c..d0170e8 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderMismatchException.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/HeaderMismatchException.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
public class HeaderMismatchException extends Exception {
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallback.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallback.java
index 8a069f7..2e4c8e9 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallback.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallback.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import javax.security.auth.callback.Callback;
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallbackHandler.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallbackHandler.java
index 58f2948..7c40c49 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallbackHandler.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RequestCallbackHandler.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import javax.security.auth.callback.Callback;
diff --git a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SiteminderHeaderHandler.java b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SiteminderHeaderHandler.java
index 9cf746a..eab56e0 100644
--- a/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SiteminderHeaderHandler.java
+++ b/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SiteminderHeaderHandler.java
@@ -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.
+ */
package org.apache.geronimo.security.realm.providers;
import java.util.Map;
diff --git a/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/EncryptionManagerWrapperGBean.java b/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/EncryptionManagerWrapperGBean.java
index a820f07..2d9edba 100644
--- a/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/EncryptionManagerWrapperGBean.java
+++ b/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/EncryptionManagerWrapperGBean.java
@@ -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.
+ */
package org.apache.geronimo.system.util;
import java.io.Serializable;
diff --git a/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css b/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css
index b830dad..7f4a2ac 100644
--- a/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css
+++ b/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css
@@ -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.
+======================================================================*/
.messagePortlet {
background-color:#F7F7F7;
border:1px solid #88A4D7;
diff --git a/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/GenericHeaderAuthenticator.java b/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/GenericHeaderAuthenticator.java
index 4227164..e485415 100644
--- a/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/GenericHeaderAuthenticator.java
+++ b/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/GenericHeaderAuthenticator.java
@@ -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.
+ */
package org.apache.geronimo.tomcat.authenticator;
import java.io.IOException;
diff --git a/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/SpnegoAuthenticator.java b/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/SpnegoAuthenticator.java
index 8dda78a..fe5aca3 100644
--- a/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/SpnegoAuthenticator.java
+++ b/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/authenticator/SpnegoAuthenticator.java
@@ -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.
+ */
package org.apache.geronimo.tomcat.authenticator;
import java.io.IOException;
diff --git a/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/GeronimoCustomAuthenticator.properties b/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/GeronimoCustomAuthenticator.properties
index c7081a9..bdad4e8 100644
--- a/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/GeronimoCustomAuthenticator.properties
+++ b/plugins/tomcat/geronimo-tomcat6/src/main/resources/org/apache/geronimo/tomcat/GeronimoCustomAuthenticator.properties
@@ -1,2 +1,18 @@
+##
+## 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.
+##
GENERIC=org.apache.geronimo.tomcat.authenticator.GenericHeaderAuthenticator
SPNEGO=org.apache.geronimo.tomcat.authenticator.SpnegoAuthenticator
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c35ccc7..a7c480a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2442,9 +2442,9 @@
<version>[1.5,1.6)</version>
</requireJavaVersion>
- <!-- Require Maven 2.0.9+ -->
+ <!-- Require Maven 2.2.1+ -->
<requireMavenVersion>
- <version>[2.0.9,)</version>
+ <version>[2.2.1,)</version>
</requireMavenVersion>
</rules>
</configuration>
