Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 90132 invoked from network); 4 Dec 2006 20:13:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2006 20:13:44 -0000 Received: (qmail 97215 invoked by uid 500); 4 Dec 2006 20:13:53 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 97104 invoked by uid 500); 4 Dec 2006 20:13:52 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 97093 invoked by uid 99); 4 Dec 2006 20:13:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 12:13:52 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 12:13:40 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 45E251A984E; Mon, 4 Dec 2006 12:12:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r482336 [2/3] - in /geronimo/server/trunk: applications/console/geronimo-console-core/ applications/console/geronimo-console-ear/ applications/console/geronimo-console-framework/ applications/console/geronimo-console-standard/ assemblies/ge... Date: Mon, 04 Dec 2006 20:12:28 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061204201259.45E251A984E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java?view=diff&rev=482336&r1=482335&r2=482336 ============================================================================== --- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java (original) +++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java Mon Dec 4 12:12:19 2006 @@ -1,22 +1,19 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.geronimo.jetty6.deployment; Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/StartupOrderComparatorTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/StartupOrderComparatorTest.java?view=diff&rev=482336&r1=482335&r2=482336 ============================================================================== --- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/StartupOrderComparatorTest.java (original) +++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/StartupOrderComparatorTest.java Mon Dec 4 12:12:19 2006 @@ -1,10 +1,10 @@ /** - * - * Copyright 2005 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/groups.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/groups.properties?view=diff&rev=482336&r1=482335&r2=482336 ============================================================================== --- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/groups.properties (original) +++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/groups.properties Mon Dec 4 12:12:19 2006 @@ -1,10 +1,11 @@ ## ## -## Copyright 2004 The Apache Software Foundation -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at ## ## http://www.apache.org/licenses/LICENSE-2.0 ## Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/users.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/users.properties?view=diff&rev=482336&r1=482335&r2=482336 ============================================================================== --- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/users.properties (original) +++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/data/users.properties Mon Dec 4 12:12:19 2006 @@ -1,10 +1,11 @@ ## ## -## Copyright 2004 The Apache Software Foundation -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at ## ## http://www.apache.org/licenses/LICENSE-2.0 ## Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml?view=diff&rev=482336&r1=482335&r2=482336 ============================================================================== --- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml Mon Dec 4 12:12:19 2006 @@ -1,11 +1,12 @@ - \ No newline at end of file + Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml?view=diff&rev=482336&r1=482335&r2=482336 ============================================================================== --- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml Mon Dec 4 12:12:19 2006 @@ -1,11 +1,12 @@