DO NOT REPLY [Bug 47880] Lack of +x permissions on script files results cryptic and confusing error messages
https://issues.apache.org/bugzilla/show_bug.cgi?id=47880 --- Comment #3 from Pid 2009-09-21 02:09:55 PDT --- Is it possible for the +x bit to be set, or retained, on these files during the build process for the zip? -- 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 47880] Lack of +x permissions on script files results cryptic and confusing error messages
https://issues.apache.org/bugzilla/show_bug.cgi?id=47880 --- Comment #4 from Mark Thomas 2009-09-21 10:19:29 BST --- Nope. That's why we have .tar.gz distros with unix line endings and appropriate execute bit settings and .zip distros with Windows line endings. -- 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
svn commit: r817201 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Author: markt
Date: Mon Sep 21 10:54:36 2009
New Revision: 817201
URL: http://svn.apache.org/viewvc?rev=817201&view=rev
Log:
Add a test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=47866
Fix a couple of places where expected and actual were the wrong way around
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=817201&r1=817200&r2=817201&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Mon Sep 21
10:54:36 2009
@@ -52,7 +52,7 @@
}
/**
- * Simple servlet to test iJNDI
+ * Simple servlet to test JNDI
*/
public static class HelloWorldJndi extends HttpServlet {
@@ -77,6 +77,26 @@
}
}
+/**
+ * Servlet that tries to obtain a URL for WEB-INF/web.xml
+ */
+public static class GetResource extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+public void doGet(HttpServletRequest req, HttpServletResponse res)
+throws IOException {
+URL url = req.getServletContext().getResource("/WEB-INF/web.xml");
+
+res.getWriter().write("The URL obtained for /WEB-INF/web.xml was
");
+if (url == null) {
+res.getWriter().write("null");
+} else {
+res.getWriter().write(url.toString());
+}
+}
+}
+
/**
* Start tomcat with a single context and one
* servlet - all programmatic, no server.xml or
@@ -99,13 +119,12 @@
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
-assertEquals(res.toString(), "Hello world");
+assertEquals("Hello world", res.toString());
}
public void testSingleWebapp() throws Exception {
Tomcat tomcat = getTomcatInstance();
-// Currently in sandbox/tomcat-lite
File appDir =
new File("output/build/webapps/examples");
// app dir is relative to server home
@@ -155,11 +174,33 @@
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
-assertEquals(res.toString(), "Hello, Tomcat User");
+assertEquals("Hello, Tomcat User", res.toString());
}
/**
+ * Test for https://issues.apache.org/bugzilla/show_bug.cgi?id=47866
+ */
+public void testGetResource() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+StandardContext ctx =
+tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+// You can customize the context by calling
+// its API
+
+Tomcat.addServlet(ctx, "myServlet", new GetResource());
+ctx.addServletMapping("/", "myServlet");
+
+tomcat.start();
+
+int rc =getUrl("http://localhost:"; + getPort() + "/", new ByteChunk(),
+null);
+assertEquals(HttpServletResponse.SC_OK, rc);
+}
+
+/**
* Wrapper for getting the response.
*/
public static ByteChunk getUrl(String path) throws IOException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r817204 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Mon Sep 21 11:02:27 2009
New Revision: 817204
URL: http://svn.apache.org/viewvc?rev=817204&view=rev
Log:
Fix possible NPE when embedded
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=817204&r1=817203&r2=817204&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Sep 21
11:02:27 2009
@@ -1191,9 +1191,14 @@
protected InputSource getHostWebXmlSource() {
String resourceName = getHostConfigPath(Constants.HostWebXml);
+// In an embedded environment, configBase might not be set
+File configBase = getConfigBase();
+if (configBase == null)
+return null;
+
String basePath = null;
try {
-basePath = getConfigBase().getCanonicalPath();
+basePath = configBase.getCanonicalPath();
} catch (IOException e) {
log.error(sm.getString("contectConfig.baseError"), e);
return null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r817207 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Author: markt
Date: Mon Sep 21 11:06:52 2009
New Revision: 817207
URL: http://svn.apache.org/viewvc?rev=817207&view=rev
Log:
Update test to use a resource that does exist.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=817207&r1=817206&r2=817207&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Mon Sep 21
11:06:52 2009
@@ -184,19 +184,20 @@
public void testGetResource() throws Exception {
Tomcat tomcat = getTomcatInstance();
-// Must have a real docBase - just use temp
-StandardContext ctx =
-tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
-// You can customize the context by calling
-// its API
+String contextPath = "/examples";
-Tomcat.addServlet(ctx, "myServlet", new GetResource());
-ctx.addServletMapping("/", "myServlet");
+File appDir = new File("output/build/webapps" + contextPath);
+// app dir is relative to server home
+StandardContext ctx =
+tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+
+Tomcat.addServlet(ctx, "testGetResource", new GetResource());
+ctx.addServletMapping("/testGetResource", "testGetResource");
tomcat.start();
-int rc =getUrl("http://localhost:"; + getPort() + "/", new ByteChunk(),
-null);
+int rc =getUrl("http://localhost:"; + getPort() + contextPath +
+"/testGetResource", new ByteChunk(), null);
assertEquals(HttpServletResponse.SC_OK, rc);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47866] NullPointerException in embedded tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=47866 --- Comment #1 from Mark Thomas 2009-09-21 12:07:31 BST --- I can't reproduce this with a simple test case (r817201 & r817204). If you can provide a patch to that test case that demonstrates the issue that would be great. -- 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 47866] NullPointerException in embedded tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=47866 --- Comment #2 from Mark Thomas 2009-09-21 12:08:45 BST --- Sorry for the noise. Should be r817201 and r817207 -- 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 47866] NullPointerException in embedded tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=47866
--- Comment #3 from Dave Syer 2009-09-21 04:58:38 PDT
---
The problem is that if there is an exception in a ServletContextListener, then
Tomcat.start() fails to actually start the server and actually actively tries
to stop it, destroying the class loader in the process. Any background threads
started by the listener before it failed can then fail in weird ways, for
instance throwing the exception reported above.
Two things you could do to make it more friendly if you feel like it: 1) throw
a more informative exception in the WebappClassLoader, 2) throw an exception
when Tomcat.start() encounters this kind of problem, and has already called
stop().
I see this in the log:
{noformat}
2009-09-21 12:56:19,658 ERROR main [org.apache.catalina.core.StandardContext] -
2009-09-21 12:56:19,658 ERROR main [org.apache.catalina.core.StandardContext] -
{noformat}
But the exception that caused this is not propagated. This is probably more
important than the original NPE. DO you want to change the bug summary?
--
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
svn commit: r817226 - /tomcat/tc6.0.x/trunk/NOTICE
Author: markt Date: Mon Sep 21 12:27:01 2009 New Revision: 817226 URL: http://svn.apache.org/viewvc?rev=817226&view=rev Log: Fix typo in NOTICE Modified: tomcat/tc6.0.x/trunk/NOTICE Modified: tomcat/tc6.0.x/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=817226&r1=817225&r2=817226&view=diff == --- tomcat/tc6.0.x/trunk/NOTICE (original) +++ tomcat/tc6.0.x/trunk/NOTICE Mon Sep 21 12:27:01 2009 @@ -12,5 +12,5 @@ Java compilation software for JSP pages is provided by Eclipse, which is open source software. The orginal software and -related infomation is available at +related information is available at http://www.eclipse.org. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r817260 - in /tomcat/tc6.0.x/trunk: ./ res/ res/META-INF/ webapps/docs/
Author: markt
Date: Mon Sep 21 14:00:31 2009
New Revision: 817260
URL: http://svn.apache.org/viewvc?rev=817260&view=rev
Log:
Per jar LICENSE, NOTICE and manifest files
Added:
tomcat/tc6.0.x/trunk/res/META-INF/bootstrap.jar.manifest
- copied unchanged from r817195,
tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest
tomcat/tc6.0.x/trunk/res/META-INF/default.license
- copied unchanged from r817195, tomcat/tc6.0.x/trunk/res/META-INF/LICENSE
tomcat/tc6.0.x/trunk/res/META-INF/default.manifest (with props)
tomcat/tc6.0.x/trunk/res/META-INF/default.notice
- copied unchanged from r817195, tomcat/tc6.0.x/trunk/res/META-INF/NOTICE
tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.license (with props)
tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.notice (with props)
tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest
- copied unchanged from r817195,
tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest
tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest
- copied unchanged from r817195,
tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest
Removed:
tomcat/tc6.0.x/trunk/res/META-INF/LICENSE
tomcat/tc6.0.x/trunk/res/META-INF/NOTICE
tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest
tomcat/tc6.0.x/trunk/res/jsp-api.jar.manifest
tomcat/tc6.0.x/trunk/res/servlet-api.jar.manifest
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/res/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=817260&r1=817259&r2=817260&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 21 14:00:31 2009
@@ -260,11 +260,6 @@
+1: markt, rjung
-1:
-* Update packaging to use per JAR LICENSE, NOTICE and manifest files
- http://svn.apache.org/viewvc?rev=813936&view=rev
- +1: markt, rjung, jim
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47796
Fix OpenEJB integration. Reset annotation processor on context stop.
https://issues.apache.org/bugzilla/attachment.cgi?id=24222
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=817260&r1=817259&r2=817260&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Mon Sep 21 14:00:31 2009
@@ -51,9 +51,11 @@
+
+
@@ -96,6 +98,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -243,121 +258,149 @@
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
-
+
+
+
-
+
+
+
@@ -606,6 +649,7 @@
+
@@ -653,7 +697,8 @@
+ description="Download (and build as necessary) dependent components"
+ depends="build-manifests">
@@ -756,22 +801,32 @@
+ index="true"
+ manifest="${tomcat.tmp}/default.manifest">
+
+
-
+
+
+
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=817260&r1=817259&r2=817260&view=diff
==
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Mon Sep 21 14:00:31 2009
@@ -55,6 +55,7 @@
+
@@ -143,7 +144,8 @@
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
target="compile" />
-
+
@@ -151,
svn commit: r817292 - /tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml
Author: bayard Date: Mon Sep 21 15:35:40 2009 New Revision: 817292 URL: http://svn.apache.org/viewvc?rev=817292&view=rev Log: Improving boilerplate to not imply we only have the one version Modified: tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml Modified: tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml?rev=817292&r1=817291&r2=817292&view=diff == --- tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml (original) +++ tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml Mon Sep 21 15:35:40 2009 @@ -26,7 +26,7 @@ JSP(tm) Standard Tag Library implementation -Apache hosts the Standard Taglib 1.1, an implementation of +Apache hosts the Apache Standard Taglib, an implementation of the http://java.sun.com/products/jsp/jstl";>JSP Standard Tag Library (JSTL) specification. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Move Tomcat, MySQL and jre1.6.0 from Windows XP to Linux/W2008
We want to move a web site to a Dell PowerEdge T610 Server from a workstation running Windows XP Pro Sp3 with Tomcat 5.5.20, MySQL 5.4.20, and jre1.6.0. I have installed four(4) x86_64 evaluation edition operating systems on the Dell PE T610 to test the website: Windows 2008 Server Std Ed with Hyper-V, Red Hat Enterprise Server 5.4 (may need to use 5.2), SUSE Linux Enterprise Server 11, and openSUSE 11.1. I have installed XEN on Red Hat and may do the same with the SUSE's. In a clutch, we will install XP Pro Sp3 as a guest virtual machine. Also, it may be easier to test the other OS's as guests to avoid reinstallation of the host OS during botched testing. I am not sure if I can install more than one Linux Enterprise Server evaluation, so I may be limited to openSUSE for this. Obviously, there are a lot of variables to contend with that I may think of, and many more I wouldn't think of. I am hoping someone may have had experience with such a migration and be able to advise which solution is practical and or impractical. If this had already been discussed in this forum, please point me to those posts. Also, if this is not the best place for me to post this question, where would it be more appropriate? Thanks, Homerun -- View this message in context: http://www.nabble.com/Move-Tomcat%2C-MySQL-and-jre1.6.0-from-Windows-XP-to-Linux-W2008-tp25530451p25530451.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
Re: Move Tomcat, MySQL and jre1.6.0 from Windows XP to Linux/W2008
homerun wrote: > Also, if this is not the best place > for me to post this question, where would it be more appropriate? This is a question for the users list. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r817434 - /tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
Author: markt
Date: Mon Sep 21 22:03:27 2009
New Revision: 817434
URL: http://svn.apache.org/viewvc?rev=817434&view=rev
Log:
Don't mark every servlet as the JSP Servlet
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=817434&r1=817433&r2=817434&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Mon Sep 21
22:03:27 2009
@@ -494,7 +494,12 @@
// Description is ignored
// Display name is ignored
// Icons are ignored
-wrapper.setJspFile(servlet.getJspFile());
+// Only set this if it is non-null else every servlet will get
+// marked as the JSP servlet
+String jspFile = servlet.getJspFile();
+if (jspFile != null) {
+wrapper.setJspFile(jspFile);
+}
if (servlet.getLoadOnStartup() != null) {
wrapper.setLoadOnStartup(servlet.getLoadOnStartup().intValue());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r817442 - /tomcat/trunk/java/org/apache/catalina/manager/Constants.java
Author: markt Date: Mon Sep 21 22:20:00 2009 New Revision: 817442 URL: http://svn.apache.org/viewvc?rev=817442&view=rev Log: Fix copyright Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=817442&r1=817441&r2=817442&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Mon Sep 21 22:20:00 2009 @@ -182,7 +182,7 @@ public static final String HTML_TAIL_SECTION = "\n" + "\n" + -" Copyright © 1999-2005, Apache Software Foundation" + +" Copyright © 1999-2009, Apache Software Foundation" + "\n" + "\n" + "\n" + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r817444 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Sep 21 22:21:42 2009 New Revision: 817444 URL: http://svn.apache.org/viewvc?rev=817444&view=rev Log: Proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=817444&r1=817443&r2=817444&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Sep 21 22:21:42 2009 @@ -176,3 +176,9 @@ http://svn.apache.org/viewvc?view=rev&revision=439565 +1: markt -1: + +* Fix copyright year on manager app + http://svn.apache.org/viewvc?rev=817442&view=rev + +1: markt + -1: + \ No newline at end of file Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=817444&r1=817443&r2=817444&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 21 22:21:42 2009 @@ -311,3 +311,8 @@ http://svn.apache.org/viewvc?rev=815972&view=rev +1: markt, jim -1: + +* Fix copyright year on manager app + http://svn.apache.org/viewvc?rev=817442&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r817446 - in /tomcat/trunk/webapps: docs/changelog.xml docs/manager-howto.xml manager/401.jsp manager/404.jsp manager/WEB-INF/web.xml
Author: markt Date: Mon Sep 21 22:31:47 2009 New Revision: 817446 URL: http://svn.apache.org/viewvc?rev=817446&view=rev Log: Separate out Manager app roles Move /manager to /manager/text to simplify permissions Allows the future addition of extra security measures to one interface that might not make sense for another (usually these will be added to the HTML interface but that might not always be the case). Added: tomcat/trunk/webapps/manager/404.jsp (with props) Modified: tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/manager-howto.xml tomcat/trunk/webapps/manager/401.jsp tomcat/trunk/webapps/manager/WEB-INF/web.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=817446&r1=817445&r2=817446&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 21 22:31:47 2009 @@ -182,12 +182,17 @@ - + -631321 Update changelog to support theelement. -(fhanik) +631321 Update changelog to support the element +in the documentation. (fhanik) + +A number of additional roles were added to the Manager application to +separate out permissions for the HTML interface, the text interface and +the JMX proxy. (markt) + Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=817446&r1=817445&r2=817446&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Mon Sep 21 22:31:47 2009 @@ -211,7 +211,7 @@ All commands that the Manager application knows how to process are specified in a single request URI like this: -http://{host}:{port}/manager/{command}?{parameters} +http://{host}:{port}/manager/text/{command}?{parameters} where {host} and {port} represent the hostname and port number on which Tomcat is running, {command} @@ -270,7 +270,7 @@ -http://localhost:8080/manager/deploy?path=/foo +http://localhost:8080/manager/text/deploy?path=/foo Upload the web application archive (WAR) file that is specified as the @@ -343,7 +343,7 @@ directory for the manager webapp will contain the previously deployed WARs; removing it would make the deployment fail. -http://localhost:8080/manager/deploy?path=/footoo&tag=footag +http://localhost:8080/manager/text/deploy?path=/footoo&tag=footag @@ -362,7 +362,7 @@ /path/to/foo on the Tomcat server is deployed as the web application context named /footoo. -http://localhost:8080/manager/deploy?path=/footoo&war=file:/path/to/foo +http://localhost:8080/manager/text/deploy?path=/footoo&war=file:/path/to/foo @@ -372,7 +372,7 @@ so the context path defaults to the name of the web application archive file without the ".war" extension. -http://localhost:8080/manager/deploy?war=jar:file:/path/to/bar.war!/ +http://localhost:8080/manager/text/deploy?war=jar:file:/path/to/bar.war!/ @@ -387,7 +387,7 @@ deployed as the web application context named /foo. Notice that the context path used is the name of the web application directory. -http://localhost:8080/manager/deploy?war=foo +http://localhost:8080/manager/text/deploy?war=foo @@ -395,7 +395,7 @@ Host appBase directory on the Tomcat server is deployed as the web application context named /bar. -http://localhost:8080/manager/deploy?war=bar.war +http://localhost:8080/manager/text/deploy?war=bar.war @@ -430,7 +430,7 @@ Here is an example of deploying an application using a Context configuration ".xml" file. -http://localhost:8080/manager/deploy?config=file:/path/context.xml +http://localhost:8080/manager/text/deploy?config=file:/path/context.xml @@ -438,7 +438,7 @@ configuration ".xml" file and a web application ".war" file located on the server. -http://localhost:8080/manager/deploy?config=file:/path/context.xml&war=jar:file:/path/bar.war!/ +http://localhost:8080/manager/text/deploy?config=file:/path/context.xml&war=jar:file:/path/bar.war!/ @@ -529,7 +529,7 @@ -http://localhost:8080/manager/list +http://localhost:8080/manager/text/list List the context paths, current status (running or @@ -549,7 +549,7 @@ -http://localhost:8080/manager/reload?path=/examples +http://localhost:8080/manager/text/reload?path=/examples Signal an existing application to shut itself down and reload. This can @@ -608,7 +608,7 @@ -http://localhost:8080/manager/serverinfo +http://localhost:8080/manager/text/serverinfo Lists information about the Tomcat version, OS, and JVM properties. @@ -628,7 +628,7 @@ -http://localhost:8080/manager/resources[?type=x]
svn commit: r817447 - /tomcat/trunk/bin/Tomcat6.launch
Author: markt Date: Mon Sep 21 22:32:21 2009 New Revision: 817447 URL: http://svn.apache.org/viewvc?rev=817447&view=rev Log: Remove old Tomcat 6 file Removed: tomcat/trunk/bin/Tomcat6.launch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
