svn commit: r947395 - in /tomcat/trunk/webapps/manager: 403.jsp WEB-INF/web.xml
Author: markt
Date: Sun May 23 10:41:25 2010
New Revision: 947395
URL: http://svn.apache.org/viewvc?rev=947395&view=rev
Log:
Add a 403 page. If the user tries to use the old manager role, they'll get a
403.
Added:
tomcat/trunk/webapps/manager/403.jsp (with props)
Modified:
tomcat/trunk/webapps/manager/WEB-INF/web.xml
Added: tomcat/trunk/webapps/manager/403.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/403.jsp?rev=947395&view=auto
==
--- tomcat/trunk/webapps/manager/403.jsp (added)
+++ tomcat/trunk/webapps/manager/403.jsp Sun May 23 10:41:25 2010
@@ -0,0 +1,71 @@
+<%--
+ 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.
+--%>
+<%
+ response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Manager
Application\"");
+%>
+http://www.w3.org/TR/html4/strict.dtd";>
+
+
+ 403 Access Denied
+
+
+
+
+
+ 403 Access Denied
+
+You are not authorized to view this page. If you have not changed
+any configuration files, please examine the file
+conf/tomcat-users.xml in your installation. That
+file must contain the credentials to let you use this webapp.
+
+
+For example, to add the manager-gui role to a user named
+tomcat with a password of s3cret, add the following to
the
+config file listed above.
+
+
+
svn commit: r947396 - in /tomcat/trunk/webapps/host-manager: 401.jsp 403.jsp WEB-INF/web.xml
Author: markt Date: Sun May 23 10:46:40 2010 New Revision: 947396 URL: http://svn.apache.org/viewvc?rev=947396&view=rev Log: Align host-manager role names with manager role names. Add a 403 page to inform users of changed role name. Added: tomcat/trunk/webapps/host-manager/403.jsp (with props) Modified: tomcat/trunk/webapps/host-manager/401.jsp tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Modified: tomcat/trunk/webapps/host-manager/401.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/401.jsp?rev=947396&r1=947395&r2=947396&view=diff == --- tomcat/trunk/webapps/host-manager/401.jsp (original) +++ tomcat/trunk/webapps/host-manager/401.jsp Sun May 23 10:46:40 2010 @@ -39,13 +39,13 @@ file must contain the credentials to let you use this webapp. -For example, to add the admin role to a user named +For example, to add the admin-gui role to a user named tomcat with a password of s3cret, add the following to the config file listed above. -- + + Note that for Tomcat 7 onwards, the roles required to use the host manager Added: tomcat/trunk/webapps/host-manager/403.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/403.jsp?rev=947396&view=auto == --- tomcat/trunk/webapps/host-manager/403.jsp (added) +++ tomcat/trunk/webapps/host-manager/403.jsp Sun May 23 10:46:40 2010 @@ -0,0 +1,62 @@ +<%-- + 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. +--%> +<% + response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Host Manager Application\""); +%> +http://www.w3.org/TR/html4/strict.dtd";> + + + 403 Access Denied + + + + + + 403 Access Denied + +You are not authorized to view this page. If you have not changed +any configuration files, please examine the file +conf/tomcat-users.xml in your installation. That +file must contain the credentials to let you use this webapp. + + +For example, to add the admin-gui role to a user named +tomcat with a password of s3cret, add the following to the +config file listed above. + + + + + + +Note that for Tomcat 7 onwards, the roles required to use the host manager +application were changed from the single admin role to the +following two roles. You will need to assign the role(s) required for +the functionality you wish to access. + + + admin-gui - allows access to the HTML GUI + admin-script - allows access to the text interface + + + + Propchange: tomcat/trunk/webapps/host-manager/403.jsp -- svn:eol-style = native Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/web.xml?rev=947396&r1=947395&r2=947396&view=diff == --- tomcat/trunk/webapps/host-manager/WEB-INF/web.xml (original) +++ tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Sun May 23 10:46:40 2010 @@ -80,7 +80,7 @@ - admin + admin-gui @@ -96,7 +96,7 @@ The role that is required to log in to the Host Manager Application HTML interface -admin +admin-gui @@ -111,6 +111,10 @@ /401.jsp +403 +/403.jsp + + 404 /404.jsp - To unsubscribe, e-mail: dev-unsu
svn commit: r947397 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java test/org/apache/catalina/mbeans/TestRegistration.java
Author: markt
Date: Sun May 23 11:32:12 2010
New Revision: 947397
URL: http://svn.apache.org/viewvc?rev=947397&view=rev
Log:
Don't add HostConfig as a listener twice. It breaks the Manager app and
probably other stuff too.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=947397&r1=947396&r2=947397&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Sun May 23
11:32:12 2010
@@ -33,7 +33,6 @@ import org.apache.catalina.LifecycleList
import org.apache.catalina.Valve;
import org.apache.catalina.loader.WebappClassLoader;
import org.apache.catalina.mbeans.MBeanUtils;
-import org.apache.catalina.startup.HostConfig;
import org.apache.catalina.util.LifecycleBase;
import org.apache.catalina.valves.ValveBase;
@@ -802,16 +801,6 @@ public class StandardHost extends Contai
}
@Override
-protected void initInternal() throws LifecycleException {
-
-super.initInternal();
-
-HostConfig deployer = new HostConfig();
-addLifecycleListener(deployer);
-}
-
-
-@Override
protected String getObjectNameKeyProperties() {
StringBuilder keyProperties = new StringBuilder("type=Host");
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=947397&r1=947396&r2=947397&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Sun May
23 11:32:12 2010
@@ -56,7 +56,7 @@ public class TestRegistration extends To
// Verify there are some Tomcat MBeans
onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
-assertTrue("Not enough Tomcat MBeans", onames.size() >= 21);
+assertTrue("Not enough Tomcat MBeans", onames.size() >= 20);
tomcat.stop();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r947493 - /tomcat/trunk/build.properties.default
Author: markt Date: Sun May 23 21:01:36 2010 New Revision: 947493 URL: http://svn.apache.org/viewvc?rev=947493&view=rev Log: Prep for RC3 Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=947493&r1=947492&r2=947493&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Sun May 23 21:01:36 2010 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC3 # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r947494 - /tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3/
Author: markt Date: Sun May 23 21:03:09 2010 New Revision: 947494 URL: http://svn.apache.org/viewvc?rev=947494&view=rev Log: Tagging 7.0.0-RC3 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3/ (props changed) - copied from r947493, tomcat/trunk/ Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3/ -- --- svn:ignore (added) +++ svn:ignore Sun May 23 21:03:09 2010 @@ -0,0 +1,5 @@ +.settings +.classpath +.project +output +build.properties Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r947495 - /tomcat/trunk/build.properties.default
Author: markt Date: Sun May 23 21:04:08 2010 New Revision: 947495 URL: http://svn.apache.org/viewvc?rev=947495&view=rev Log: Restore -dev suffix post tag Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=947495&r1=947494&r2=947495&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Sun May 23 21:04:08 2010 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=0 version.patch=0 -version.suffix=-RC3 +version.suffix=-dev # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Tomcat 7.0.0 based on Tomcat 7.0.0 RC3
All, The next Tomcat 7.0.0 release candiate is ready for testing. 7.0.0-RC3 can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.0-RC3/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3/ Please test this release candidate and provide feedback. The 7.0.0-RC3 tag is [ ] Broken - do not release [ ] Alpha - go ahead and release 7.0.0 Alpha based on 7.0.0-RC3 [ ] Beta - go ahead and release 7.0.0 Beta based on 7.0.0-RC3 [ ] Stable - go ahead and release 7.0.0 Stable based on 7.0.0-RC3 The following issues were noted: - Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r947495 - /tomcat/trunk/build.properties.default
On 23/05/2010, ma...@apache.org wrote: > Author: markt > Date: Sun May 23 21:04:08 2010 > New Revision: 947495 > > URL: http://svn.apache.org/viewvc?rev=947495&view=rev > Log: > Restore -dev suffix post tag By the way, it's possible to create the tag without having to change trunk versions. Checkout trunk as a fresh working copy Update the working copy to fix the versions Checkin the working copy as the new tag. [SVN knows that most of the files are the same as trunk, so only the diffs are uploaded]. Just a thought. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JSP 2.2 & EL 2.2 implementation complete
I tried to download the el-api2.2 jar from GlassFish. and it doesn't work. see my thread here: http://old.nabble.com/using-new-el-api-2.2-with-myfaces2.0-and-tomcat6-ts28649111.html could you please help? Mark Thomas wrote: > > The subject says it all really. Still no sign of the TCK so there are > probably some bugs in my understanding/interpretation of the spec. > > Mark > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > -- View this message in context: http://old.nabble.com/JSP-2.2---EL-2.2-implementation-complete-tp27169437p28653777.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49330] New: my Bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=49330 Summary: my Bug Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: trivial Priority: P2 Component: Servlet & JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: tang.f...@agree.com.cn servlet 最新版本功能说明 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49330] my Bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=49330 --- Comment #1 from 唐枫 2010-05-24 01:56:58 EDT --- (In reply to comment #0) > servlet 最新版本功能说明 什么东东 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
