You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jl...@apache.org on 2005/07/18 01:06:59 UTC
svn commit: r219422 - in /geronimo/trunk/modules/tomcat: ./
src/etc/META-INF/ src/java/org/apache/geronimo/tomcat/
src/java/org/apache/geronimo/tomcat/connector/
src/java/org/apache/geronimo/tomcat/realm/
src/java/org/apache/geronimo/tomcat/util/ src/j...
Author: jlaskowski
Date: Sun Jul 17 16:06:53 2005
New Revision: 219422
URL: http://svn.apache.org/viewcvs?rev=219422&view=rev
Log:
Several administrative changes:
* propset svn:keywords 'Rev, Date'
* license header added
* typos
Modified:
geronimo/trunk/modules/tomcat/LICENSE.txt (props changed)
geronimo/trunk/modules/tomcat/NOTICE.txt (props changed)
geronimo/trunk/modules/tomcat/maven.xml (contents, props changed)
geronimo/trunk/modules/tomcat/project.properties (contents, props changed)
geronimo/trunk/modules/tomcat/project.xml (contents, props changed)
geronimo/trunk/modules/tomcat/src/etc/META-INF/geronimo-service.xml (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/BaseGBean.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/JAASTomcatPrincipal.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ObjectRetriever.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/RealmGBean.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatClassLoader.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEngine.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/util/SecurityHolder.java (props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/ComponentContextValve.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/InstanceContextValve.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/PolicyContextValve.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/TransactionContextValve.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml (contents, props changed)
geronimo/trunk/modules/tomcat/src/test-resources/data/groups.properties (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/data/login.config (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/data/users.properties (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/web.xml (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war1/hello.txt (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/web.xml (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/auth/logon.html (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/auth/logonError.html (props changed)
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/protected/hello.txt (props changed)
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java (props changed)
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java (props changed)
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java (contents, props changed)
geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml (contents, props changed)
geronimo/trunk/modules/tomcat/src/var/ROOT/geronimo-logo.png (props changed)
geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp (props changed)
geronimo/trunk/modules/tomcat/src/var/ROOT/tomcat-power.gif (props changed)
geronimo/trunk/modules/tomcat/src/var/ROOT/tomcat.gif (props changed)
geronimo/trunk/modules/tomcat/src/var/web.xml (props changed)
Propchange: geronimo/trunk/modules/tomcat/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/maven.xml?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/maven.xml (original)
+++ geronimo/trunk/modules/tomcat/maven.xml Sun Jul 17 16:06:53 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!-- $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $ -->
+<!-- $Rev: 46019 $ $Date$ -->
<project default="default"
xmlns:j="jelly:core"
Propchange: geronimo/trunk/modules/tomcat/maven.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.properties?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.properties (original)
+++ geronimo/trunk/modules/tomcat/project.properties Sun Jul 17 16:06:53 2005
@@ -1,5 +1,5 @@
##
-## $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $
+## $Rev: 46019 $ $Date$
##
maven.junit.jvmargs=-Djava.endorsed.dirs=${maven.build.dir}/endorsed -ea
Propchange: geronimo/trunk/modules/tomcat/project.properties
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Sun Jul 17 16:06:53 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!-- $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $ -->
+<!-- $Rev: 46019 $ $Date$ -->
<project>
<pomVersion>3</pomVersion>
Propchange: geronimo/trunk/modules/tomcat/project.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/etc/META-INF/geronimo-service.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/BaseGBean.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java Sun Jul 17 16:06:53 2005
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2003-2004 The Apache Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* 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.
-*/
+ *
+ * Copyright 2003-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
+ *
+ * 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.net.InetAddress;
@@ -30,6 +30,9 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
+/**
+ * @version $Rev$ $Date$
+ */
public class ConnectorGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
private static final Log log = LogFactory.getLog(ConnectorGBean.class);
@@ -48,7 +51,7 @@
}
if (serverInfo == null){
- throw new IllegalArgumentException("classLoader cannot be null.");
+ throw new IllegalArgumentException("serverInfo cannot be null.");
}
this.name = name;
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java Sun Jul 17 16:06:53 2005
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2003-2004 The Apache Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* 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.
-*/
+ *
+ * Copyright 2003-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
+ *
+ * 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.Collection;
@@ -33,6 +33,9 @@
import org.apache.geronimo.gbean.ReferenceCollection;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+/**
+ * @version $Rev$ $Date$
+ */
public class EngineGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
private static final Log log = LogFactory.getLog(EngineGBean.class);
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java Sun Jul 17 16:06:53 2005
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2003-2004 The Apache Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* 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.
-*/
+ *
+ * Copyright 2003-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
+ *
+ * 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;
@@ -29,6 +29,9 @@
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+/**
+ * @version $Rev$ $Date$
+ */
public class HostGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
private static final Log log = LogFactory.getLog(HostGBean.class);
@@ -75,7 +78,7 @@
}
public void doFail() {
- log.info("Falied");
+ log.info("Failed");
}
public void doStart() throws Exception {
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/JAASTomcatPrincipal.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/JAASTomcatPrincipal.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/JAASTomcatPrincipal.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/JAASTomcatPrincipal.java Sun Jul 17 16:06:53 2005
@@ -22,7 +22,7 @@
/**
- * @version $Rev: 122776 $ $Date: 2004-12-19 12:11:07 -0700 (Sun, 19 Dec 2004) $
+ * @version $Rev: 122776 $ $Date$
*/
public class JAASTomcatPrincipal implements Principal {
private final String name;
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/JAASTomcatPrincipal.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ObjectRetriever.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/RealmGBean.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatClassLoader.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java Sun Jul 17 16:06:53 2005
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-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.
@@ -44,7 +44,7 @@
* @see http://wiki.apache.org/geronimo/Tomcat
* @see http://nagoya.apache.org/jira/browse/GERONIMO-215
*
- * @version $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $
+ * @version $Rev: 46019 $ $Date$
*/
public class TomcatContainer implements SoapHandler, GBeanLifecycle {
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java Sun Jul 17 16:06:53 2005
@@ -28,7 +28,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
/**
- * @version $Rev: 106522 $ $Date: 2004-11-25 01:28:57 +0100 (Thu, 25 Nov 2004) $
+ * @version $Rev: 106522 $ $Date$
*/
public interface TomcatContext {
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEngine.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java Sun Jul 17 16:06:53 2005
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2003-2004 The Apache Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* 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.
-*/
+ *
+ * Copyright 2003-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
+ *
+ * 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.Context;
@@ -24,6 +24,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.webservices.WebServiceContainer;
+/**
+ * @version $Rev$ $Date$
+ */
public class TomcatGeronimoEmbedded extends Embedded{
private static final Log log = LogFactory.getLog(TomcatGeronimoEmbedded.class);
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Sun Jul 17 16:06:53 2005
@@ -50,7 +50,7 @@
/**
* Wrapper for a WebApplicationContext that sets up its J2EE environment.
*
- * @version $Rev: 56022 $ $Date: 2004-10-30 07:16:18 +0200 (Sat, 30 Oct 2004) $
+ * @version $Rev: 56022 $ $Date$
*/
public class TomcatWebAppContext implements GBeanLifecycle, TomcatContext {
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java Sun Jul 17 16:06:53 2005
@@ -1,20 +1,19 @@
/**
-*
-* Copyright 2003-2004 The Apache Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* 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.
-*/
-
+ *
+ * Copyright 2003-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
+ *
+ * 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;
@@ -29,6 +28,9 @@
import sun.tools.tree.ThisExpression;
+/**
+ * @version $Rev$ $Date$
+ */
public class ValveGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
private static final Log log = LogFactory.getLog(ValveGBean.class);
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java Sun Jul 17 16:06:53 2005
@@ -28,7 +28,7 @@
/**
* Apache Tomcat HTTP 1.1 connector
*
- * @version $Rev: 56022 $ $Date: 2004-10-30 07:16:18 +0200 (Sat, 30 Oct 2004) $
+ * @version $Rev: 56022 $ $Date$
*/
public class HTTPConnector extends Connector implements GBeanLifecycle {
private final TomcatContainer container;
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java Sun Jul 17 16:06:53 2005
@@ -33,7 +33,7 @@
/**
- * @version $Rev: 106522 $ $Date: 2004-11-25 01:28:57 +0100 (Thu, 25 Nov 2004) $
+ * @version $Rev: 106522 $ $Date$
*/
public class TomcatJAASRealm extends JAASRealm implements Cloneable {
private static final Log log = LogFactory.getLog(TomcatJAASRealm.class);
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/util/SecurityHolder.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/ComponentContextValve.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/ComponentContextValve.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/ComponentContextValve.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/ComponentContextValve.java Sun Jul 17 16:06:53 2005
@@ -26,7 +26,7 @@
import java.io.IOException;
/**
- * @version $Rev: $ $Date: $
+ * @version $Rev: $ $Date$
*/
public class ComponentContextValve extends ValveBase {
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/ComponentContextValve.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/InstanceContextValve.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/InstanceContextValve.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/InstanceContextValve.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/InstanceContextValve.java Sun Jul 17 16:06:53 2005
@@ -30,7 +30,7 @@
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
/**
- * @version $Rev: $ $Date: $
+ * @version $Rev: $ $Date$
*/
public class InstanceContextValve extends ValveBase {
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/InstanceContextValve.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/PolicyContextValve.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/PolicyContextValve.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/PolicyContextValve.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/PolicyContextValve.java Sun Jul 17 16:06:53 2005
@@ -25,7 +25,7 @@
import java.io.IOException;
/**
- * @version $Rev: $ $Date: $
+ * @version $Rev: $ $Date$
*/
public class PolicyContextValve extends ValveBase{
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/PolicyContextValve.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/TransactionContextValve.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/TransactionContextValve.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/TransactionContextValve.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/TransactionContextValve.java Sun Jul 17 16:06:53 2005
@@ -30,7 +30,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
/**
- * @version $Rev: $ $Date: $
+ * @version $Rev: $ $Date$
*/
public class TransactionContextValve extends ValveBase {
Propchange: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/valve/TransactionContextValve.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml (original)
+++ geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml Sun Jul 17 16:06:53 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!-- $Rev: 111453 $ $Date: 2004-12-10 01:46:37 +0100 (Fri, 10 Dec 2004) $ -->
+<!-- $Rev: 111453 $ $Date$ -->
<!--
Configuration for the Apache Tomcat web container
Propchange: geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/data/groups.properties
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/data/login.config
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/data/users.properties
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war1/hello.txt
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/auth/logon.html
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/auth/logonError.html
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/protected/hello.txt
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Sun Jul 17 16:06:53 2005
@@ -57,7 +57,7 @@
/**
- * @version $Rev: 111239 $ $Date: 2004-12-08 02:29:11 -0700 (Wed, 08 Dec 2004) $
+ * @version $Rev: 111239 $ $Date$
*/
public class AbstractWebModuleTest extends TestCase {
Propchange: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java Sun Jul 17 16:06:53 2005
@@ -23,7 +23,7 @@
/**
- * @version $Rev: 111239 $ $Date: 2004-12-08 02:29:11 -0700 (Wed, 08 Dec 2004) $
+ * @version $Rev: 111239 $ $Date$
*/
public class ApplicationTest extends AbstractWebModuleTest {
Propchange: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java Sun Jul 17 16:06:53 2005
@@ -54,7 +54,7 @@
import sun.misc.BASE64Encoder;
/**
-* @version $Rev: 170494 $ $Date: 2005-05-16 18:28:28 -0600 (Mon, 16 May 2005) $
+* @version $Rev: 170494 $ $Date$
*/
public class ContainerTest extends TestCase {
private ClassLoader cl = this.getClass().getClassLoader();
Propchange: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java Sun Jul 17 16:06:53 2005
@@ -19,7 +19,7 @@
import org.apache.geronimo.webservices.WebServiceContainer;
/**
-* @version $Rev: $ $Date: $
+* @version $Rev: $ $Date$
*/
public class MockWebServiceContainer implements WebServiceContainer {
public void invoke(Request request, Response response) throws Exception {
Propchange: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/app/MockWebServiceContainer.java
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Modified: geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml?rev=219422&r1=219421&r2=219422&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml (original)
+++ geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml Sun Jul 17 16:06:53 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ 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.
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+<!-- $Rev: 54661 $ $Date$ -->
<web-app 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"
Propchange: geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/var/ROOT/geronimo-logo.png
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/var/ROOT/tomcat-power.gif
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/var/ROOT/tomcat.gif
------------------------------------------------------------------------------
svn:keywords = Rev, Date
Propchange: geronimo/trunk/modules/tomcat/src/var/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev, Date