DO NOT REPLY [Bug 32828] - Untidy undeploy - needs a restart to fix
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32828. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32828 --- Additional Comments From [EMAIL PROTECTED] 2005-01-29 08:30 --- I have experienced the same problem, and sometimes it's possibel to undeploy and sometimes a restart is required. Seems to me that there is a race condition occuring where the servlet isn't completely stopped and therefore the file locks aren't released when the undeployment occurs. Time to re-open this bug? -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
tomcat-5.0.27 authentication/authorization
Hi. You can find discusion here: http://groups-beta.google.com/group/comp.lang.java.programmer tomcat-5.0.27 authentication/authorization http://groups-beta.google.com/group/comp.lang.java.programmer/browse_thread/thread/d86b1db12a57638d/1532ba9c63e42da3?q=tomcat-5.0.27+authentication%2Fauthorization_done=%2Fgroup%2Fcomp.lang.java.programmer%2Fsearch%3Fgroup%3Dcomp.lang.java.programmer%26q%3Dtomcat-5.0.27+authentication%2Fauthorization%26qt_g%3D1%26searchnow%3DSearch+this+group%26_doneTitle=Back+to+Searchd#1532ba9c63e42da3 Hi all. Tomcat, and any other servlet server, when we use auth-methodFORM/auth-method with j_security_check, j_username, j_password and security-constraint, check our user name and password against database (or anything else - but this wasn't important now) and then PUT_SOMETHING_FOR_RECOGNITION_SOMEWHERE (I think in servlet session?) for repossess. After that we can access resource specified in web-resource-collection if we have THAT_SOMETHING (role). And THAT_SOMETHING will be passed automatically to EJB if we use EJB, and so on.. Is it possible to put THAT_SOMETHING from my code i.e. servlet? For example, if I want to use in JSP other name for j_security_check, j_username, j_password, or I want to use other presentation for my web app like Swing or simmilar? I could check user name or anything else by myself and then put THAT_SOMETHING and proceed like I was make real j_security_check. Do you know how to do this? P.S. I can't use JAAS. _ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-jk-native has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 69 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-jk-native : Connectors to various web servers Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: Build) Work ended in a state of : Failed Elapsed: Command Line: make [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native] - Making all in common make[1]: Entering directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' /bin/sh /usr/local/gump/public/workspace/apache-httpd/dest-29012005/build/libtool --silent --mode=compile gcc -I/usr/local/gump/public/workspace/apache-httpd/dest-29012005/include -g -O2 -g -O2 -pthread -DHAVE_APR -I/usr/local/gump/public/workspace/apr/dest-29012005/include/apr-1 -g -O2 -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I /opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c /usr/local/gump/public/workspace/apache-httpd/dest-29012005/build/libtool: /usr/local/gump/public/workspace/apache-httpd/dest-29012005/build/libtool: No such file or directory make[1]: *** [jk_ajp12_worker.lo] Error 127 make[1]: Leaving directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' make: *** [all-recursive] Error 1 - To subscribe to this information via syndicated feeds: - RSS: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml - Atom: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 2329012005, brutus:brutus-public:2329012005 Gump E-mail Identifier (unique within run) #15. -- Apache Gump http://gump.apache.org/ [Instance: brutus] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Patch to Tomcat 5.0 top level build.xml
Please find attached a patch for build.xml properties supplied in the TOMCAT_5.0 branch of the jakarta-tomcat-5 project which ensures that the correct versions of supporting projects are checked out when the checkout target is executed. This patch has been made against code check on in the morning of 29th Jan from the public anonymous CVS repository. Regards, Al. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Patch to Tomcat 5.0 default build properties
Please find attached a patch for the default build properties supplied in the TOMCAT_5.0 branch of the jakarta-tomcat-5 project which corrects the URL to obtain struts from. This patch has been made against code check on in the morning of 29th Jan from the public anonymous CVS repository. Regards, Al. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Patch to Tomcat 5.0
Please find attached a patch for default build properties supplied in the TOMCAT_5.0 branch of the jakarta-tomcat-5 project which alters the location of the servlet-api to reflect where the jakarta-servletapi-5 project is placed when the update or checkou targets are used to obtain the source. This patch has been made against code checked out on the morning of 29th Jan from the public anonymous CVS repository. Regards, Al. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Tomcat 5.5.7 Stability
Yoav Shapira wrote: [ ] Alpha: leave it as-is, numerous bugs, etc. [ ] Beta: good quality release, at least one issue preventing stable vote [X] Stable: solid, no major issues (minor issues possible) Finally got a chance to run all the tests. It's snowing after all, and everything runs slower :). Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res LocalStrings.properties
pero2005/01/29 11:29:55
Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java
jk/java/org/apache/jk/common ChannelSocket.java
HandlerRequest.java
util/java/org/apache/tomcat/util/net/res
LocalStrings.properties
Log:
Change some log.isXXXEnable
Revision ChangesPath
1.62 +10 -5
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Http11Protocol.java 6 Dec 2004 13:59:28 - 1.61
+++ Http11Protocol.java 29 Jan 2005 19:29:54 - 1.62
@@ -144,7 +144,8 @@
log.error(sm.getString(http11protocol.endpoint.initerror), ex);
throw ex;
}
-log.info(sm.getString(http11protocol.init, getName()));
+if(log.isInfoEnabled())
+log.info(sm.getString(http11protocol.init, getName()));
}
@@ -183,7 +184,8 @@
log.error(sm.getString(http11protocol.endpoint.starterror),
ex);
throw ex;
}
-log.info(sm.getString(http11protocol.start, getName()));
+if(log.isInfoEnabled())
+log.info(sm.getString(http11protocol.start, getName()));
}
public void pause() throws Exception {
@@ -193,7 +195,8 @@
log.error(sm.getString(http11protocol.endpoint.pauseerror),
ex);
throw ex;
}
-log.info(sm.getString(http11protocol.pause, getName()));
+if(log.isInfoEnabled())
+log.info(sm.getString(http11protocol.pause, getName()));
}
public void resume() throws Exception {
@@ -203,11 +206,13 @@
log.error(sm.getString(http11protocol.endpoint.resumeerror),
ex);
throw ex;
}
-log.info(sm.getString(http11protocol.resume, getName()));
+if(log.isInfoEnabled())
+log.info(sm.getString(http11protocol.resume, getName()));
}
public void destroy() throws Exception {
-log.info(sm.getString(http11protocol.stop, getName()));
+if(log.isInfoEnabled())
+log.info(sm.getString(http11protocol.stop, getName()));
ep.stopEndpoint();
if( tpOname!=null )
Registry.getRegistry(null, null).unregisterComponent(tpOname);
1.52 +6 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChannelSocket.java11 Jan 2005 13:37:46 - 1.51
+++ ChannelSocket.java29 Jan 2005 19:29:55 - 1.52
@@ -335,7 +335,8 @@
// Find a port.
if (startPort == 0) {
port = 0;
-log.info(JK2: ajp13 disabling channelSocket);
+if(log.isInfoEnabled())
+log.info(JK2: ajp13 disabling channelSocket);
running = true;
return;
}
@@ -351,7 +352,8 @@
port=i;
break;
} catch( IOException ex ) {
-log.info(Port busy + i + + ex.toString());
+if(log.isInfoEnabled())
+log.info(Port busy + i + + ex.toString());
continue;
}
}
@@ -360,7 +362,8 @@
log.error(Can't find free port + startPort + + maxPort );
return;
}
-log.info(JK2: ajp13 listening on + getAddress() + : + port );
+if(log.isInfoEnabled())
+log.info(JK2: ajp13 listening on + getAddress() + : + port
);
// If this is not the base port and we are the 'main' channleSocket
and
// SHM didn't already set the localId - we'll set the instance id
1.43 +6 -4
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
Index: HandlerRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- HandlerRequest.java 11 Jan 2005 13:37:46 - 1.42
+++ HandlerRequest.java 29 Jan 2005 19:29:55 - 1.43
@@ -320,8 +320,8 @@
FileOutputStream stopF=new
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
pero2005/01/29 11:30:44
Modified:util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
recreate server Socket after stop!
Revision ChangesPath
1.43 +1 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- PoolTcpEndpoint.java 14 Oct 2004 08:07:48 - 1.42
+++ PoolTcpEndpoint.java 29 Jan 2005 19:30:44 - 1.43
@@ -350,6 +350,7 @@
if (!lf) {
threadStop();
}
+initialized=false ;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkMX.java
pero2005/01/29 11:31:50
Modified:jk/java/org/apache/jk/common JkMX.java
Log:
make log4j mbean configureable with attribute log4jEnabled
Revision ChangesPath
1.26 +31 -14
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java
Index: JkMX.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JkMX.java 3 Sep 2004 04:28:39 - 1.25
+++ JkMX.java 29 Jan 2005 19:31:50 - 1.26
@@ -44,6 +44,7 @@
{
MBeanServer mserver;
private boolean enabled=false;
+private boolean log4jEnabled=true;
private int httpport=-1;
private String httphost=localhost;
private String authmode=none;
@@ -68,6 +69,16 @@
return enabled;
}
+/** Enable the Log4j MBean)
+ */
+public void setLog4jEnabled(boolean b) {
+log4jEnabled=b;
+}
+
+public boolean getLog4jEnabled() {
+return log4jEnabled;
+}
+
/** Enable the MX4J adapters (old way, compatible)
*/
public void setPort(int i) {
@@ -223,8 +234,8 @@
}
// starts the server
mserver.invoke(httpServerName, start, null, null);
-
-log.info( Started MX4J console on host + httphost + at
port + httpport);
+if(log.isInfoEnabled())
+log.info( Started MX4J console on host + httphost +
at port + httpport);
httpAdapterLoaded = true;
@@ -241,7 +252,8 @@
mserver.setAttribute(jrmpServerName, new
Attribute(Port,
new
Integer(jrmpport)));
mserver.invoke(jrmpServerName, start, null, null);
-log.info( Creating + jrmpServerName );
+if(log.isInfoEnabled())
+log.info( Creating + jrmpServerName );
// Create the JRMP adaptor
ObjectName adaptor =
registerObject(mx4j.adaptor.rmi.jrmp.JRMPAdaptor,
@@ -266,7 +278,8 @@
// Registers the JRMP adaptor in JNDI and starts it
mserver.invoke(adaptor, start, null, null);
-log.info( Creating + adaptor + on host + jrmphost +
at port + jrmpport);
+if(log.isInfoEnabled())
+log.info( Creating + adaptor + on host + jrmphost
+ at port + jrmpport);
jrmpAdapterLoaded = true;
@@ -280,7 +293,8 @@
try {
httpServerName=registerObject(com.sun.jdmk.comm.HtmlAdaptorServer,
Adaptor:name=html,port= +
httpport);
-log.info(Registering the JMX_RI html adapter +
httpServerName + at port + httpport);
+if(log.isInfoEnabled())
+log.info(Registering the JMX_RI html adapter +
httpServerName + at port + httpport);
mserver.setAttribute(httpServerName,
new Attribute(Port, new
Integer(httpport)));
@@ -301,7 +315,8 @@
public void destroy() {
try {
-log.info(Stoping JMX );
+if(log.isInfoEnabled())
+log.info(Stoping JMX );
if( httpServerName!=null ) {
mserver.invoke(httpServerName, stop, null, null);
@@ -321,15 +336,17 @@
if( enabled ) {
loadAdapter();
}
-
-try {
-registerObject(org.apache.log4j.jmx.HierarchyDynamicMBean ,
- log4j:hierarchy=default);
-log.info(Registering the JMX hierarchy for Log4J );
-} catch( Throwable t ) {
-log.info(Can't enable log4j mx: + t.toString());
+if( log4jEnabled) {
+try {
+
registerObject(org.apache.log4j.jmx.HierarchyDynamicMBean ,
+ log4j:hierarchy=default);
+if(log.isInfoEnabled())
+ log.info(Registering the JMX hierarchy for Log4J
);
+} catch( Throwable t ) {
+if(log.isInfoEnabled())
+log.info(Can't enable log4j mx: ,t);
+}
}
-
} catch( Throwable t ) {
log.error( Init error, t );
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host SaveHostAction.java DeleteHostsAction.java
pero2005/01/29 11:36:06
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
SaveHostAction.java DeleteHostsAction.java
Log:
Correct create and remove host
Revision ChangesPath
1.13 +4 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java
Index: SaveHostAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SaveHostAction.java 18 Oct 2004 06:37:53 - 1.12
+++ SaveHostAction.java 29 Jan 2005 19:36:06 - 1.13
@@ -68,8 +68,8 @@
java.lang.String, // name
java.lang.String, // appBase
boolean, // autoDeploy
- boolean, // deployXML
boolean, // deployOnStartup
+ boolean, // deployXML
boolean, // unpackWARs
boolean, // xmlNamespaceAware
boolean, // xmlValidation
@@ -156,8 +156,8 @@
values[1] = hform.getHostName();
values[2] = hform.getAppBase();
values[3] = new Boolean(hform.getAutoDeploy());
-values[4] = new Boolean(hform.getDeployXML());
-values[5] = new Boolean(hform.getDeployOnStartup());
+values[4] = new Boolean(hform.getDeployOnStartup());
+values[5] = new Boolean(hform.getDeployXML());
values[6] = new Boolean(hform.getUnpackWARs());
values[7] = new Boolean(hform.getXmlNamespaceAware());
values[8] = new Boolean(hform.getXmlValidation());
1.7 +5 -2
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java
Index: DeleteHostsAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeleteHostsAction.java18 Oct 2004 06:37:53 - 1.6
+++ DeleteHostsAction.java29 Jan 2005 19:36:06 - 1.7
@@ -105,11 +105,13 @@
throw new ServletException
(Cannot acquire MBeanServer reference, t);
}
-
+
// Delete the specified Hosts
String hosts[] = ((HostsForm) form).getHosts();
String values[] = new String[1];
String operation = removeHost;
+
+getServlet().log(enter DeleteHosts + hosts);
try {
@@ -120,6 +122,7 @@
// Remove the specified hosts
for (int i = 0; i hosts.length; i++) {
values[0] = hosts[i];
+getServlet().log(remove host + hosts[i]);
if (control != null) {
control.selectNode(null);
TreeControlNode node = control.findNode(hosts[i]);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
pero2005/01/29 11:37:27
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Fix createStandardHost and removeHost
Revision ChangesPath
1.34 +12 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- MBeanFactory.java 8 Jan 2005 11:24:24 - 1.33
+++ MBeanFactory.java 29 Jan 2005 19:37:27 - 1.34
@@ -736,8 +736,10 @@
* @exception Exception if an MBean cannot be created or registered
*/
public String createStandardHost(String parent, String name,
- String appBase, boolean autoDeploy,
- boolean deployXML, boolean liveDeploy,
+ String appBase,
+ boolean autoDeploy,
+ boolean deployOnStartup,
+ boolean deployXML,
boolean unpackWARs,
boolean xmlNamespaceAware,
boolean xmlValidation)
@@ -748,8 +750,8 @@
host.setName(name);
host.setAppBase(appBase);
host.setAutoDeploy(autoDeploy);
+host.setDeployOnStartup(deployOnStartup);
host.setDeployXML(deployXML);
-host.setLiveDeploy(liveDeploy);
host.setUnpackWARs(unpackWARs);
host.setXmlNamespaceAware(xmlNamespaceAware);
host.setXmlValidation(xmlValidation);
@@ -996,7 +998,12 @@
Host host = (Host) engine.findChild(hostName);
// Remove this component from its parent component
-engine.removeChild(host);
+if(host!=null) {
+if(host instanceof StandardHost)
+((StandardHost)host).destroy();
+else
+engine.removeChild(host);
+}
}
1.28 +20 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mbeans-descriptors.xml1 Dec 2004 11:09:15 - 1.27
+++ mbeans-descriptors.xml29 Jan 2005 19:37:27 - 1.28
@@ -225,14 +225,29 @@
parameter name=name
description=Unique name of this Host
type=java.lang.String/
- parameter name=appBase
- description=Application base directory for this Host
- type=java.lang.String/
+ parameter name=autoDeploy
+ description=The auto deploy flag for this Host
+ type=boolean/
+ parameter name=deployOnStartup
+ description=The deploy on startup flag for this Host
+ type=boolean/
+ parameter name=deployXML
+ description=deploy Context XML config files property
+ type=boolean/
parameter name=unpackWARs
- description=Should we unpack WARs when auto-deploying?
- type=boolean/
+ description=Unpack WARs property
+ type=boolean/
+ parameter name=xmlNamespaceAware
+ description=Attribute value used to turn on/off XML namespace
awareness
+ type=boolean/
+ parameter name=xmlValidation
+ description=Attribute value used to turn on/off XML
validation
+ type=boolean/
/operation
+
+
+
operation name=createStandardManager
description=Create a new StandardManager
impact=ACTION
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardHost.java
pero2005/01/29 11:38:38
Modified:catalina/src/share/org/apache/catalina/core
StandardHost.java
Log:
add destory method that unregister this and all StandardContext MBeans
Revision ChangesPath
1.39 +13 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- StandardHost.java 11 Jan 2005 14:01:45 - 1.38
+++ StandardHost.java 29 Jan 2005 19:38:37 - 1.39
@@ -781,6 +781,7 @@
log.debug( Register host + getName() + with domain
+ domain );
oname=new ObjectName(domain + :type=Host,host= +
this.getName());
+controller = oname;
Registry.getRegistry(null, null)
.registerComponent(this, oname, null);
} catch( Throwable t ) {
@@ -789,6 +790,17 @@
}
}
+public void destroy() throws Exception {
+// destroy our child containers, if any
+Container children[] = findChildren();
+super.destroy();
+for (int i = 0; i children.length; i++) {
+if(children[i] instanceof StandardContext)
+((StandardContext)children[i]).destroy();
+}
+
+}
+
public ObjectName preRegister(MBeanServer server, ObjectName oname )
throws Exception
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardServer.java LocalStrings.properties ContainerBase.java StandardService.java StandardEngine.java
pero2005/01/29 11:41:16
Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java LocalStrings.properties
ContainerBase.java StandardService.java
StandardEngine.java
Log:
add some log.isXXXEnable and replace printStackTrace to log.error
Revision ChangesPath
1.42 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- StandardServer.java 12 Jan 2005 17:45:03 - 1.41
+++ StandardServer.java 29 Jan 2005 19:41:16 - 1.42
@@ -316,7 +316,7 @@
try {
service.initialize();
} catch (LifecycleException e) {
-e.printStackTrace(System.err);
+log.error(e);
}
}
1.18 +3 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LocalStrings.properties 15 Jan 2005 17:04:38 - 1.17
+++ LocalStrings.properties 29 Jan 2005 19:41:16 - 1.18
@@ -98,6 +98,7 @@
standardEngine.notStarted=Engine has not yet been started
standardEngine.unfoundHost=Virtual host {0} not found
standardEngine.unknownHost=No server host specified in this request
+standardEngine.unregister.mbeans.failed=Error in destroy() for mbean file {0}
standardHost.accessBase=Cannot access document base directory {0}
standardHost.alreadyStarted=Host has already been started
standardHost.appBase=Application base directory {0} does not exist
@@ -140,6 +141,8 @@
standardServer.start.started=This server has already been started
standardServer.stop.notStarted=This server has not yet been started
standardService.initialize.initialized=This service has already been
initialized
+standardService.initialize.failed=Service initializing at {0} failed
+standardService.register.failed=Error registering Service at domain {0}
standardService.start.name=Starting service {0}
standardService.start.started=This service has already been started
standardService.stop.name=Stopping service {0}
1.39 +6 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ContainerBase.java3 Dec 2004 15:39:31 - 1.38
+++ ContainerBase.java29 Jan 2005 19:41:16 - 1.39
@@ -980,7 +980,8 @@
// Validate and update our current component state
if (started) {
-log.info(sm.getString(containerBase.alreadyStarted,
logName()));
+if(log.isInfoEnabled())
+log.info(sm.getString(containerBase.alreadyStarted,
logName()));
return;
}
@@ -1037,7 +1038,8 @@
// Validate and update our current component state
if (!started) {
-log.info(sm.getString(containerBase.notStarted, logName()));
+if(log.isInfoEnabled())
+log.info(sm.getString(containerBase.notStarted,
logName()));
return;
}
@@ -1136,7 +1138,8 @@
if( controller == oname ) {
Registry.getRegistry(null, null)
.unregisterComponent(oname);
-log.debug(unregistering + oname);
+if(log.isDebugEnabled())
+log.debug(unregistering + oname);
}
} catch( Throwable t ) {
log.error(Error unregistering , t );
1.17 +4 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
Index: StandardService.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StandardService.java
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector MapperListener.java
pero2005/01/29 11:42:27
Modified:catalina/src/share/org/apache/catalina/connector
MapperListener.java
Log:
Add destory methode to unregister as Notifcation listener
Fix remove host mapping from other domains
Revision ChangesPath
1.2 +34 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/MapperListener.java
Index: MapperListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/MapperListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MapperListener.java 23 Jun 2004 08:24:57 - 1.1
+++ MapperListener.java 29 Jan 2005 19:42:27 - 1.2
@@ -150,6 +150,19 @@
}
+/**
+ * unregister this from JMImplementation:type=MBeanServerDelegate
+ */
+public void destroy() {
+try {
+
+ObjectName objectName = new ObjectName(
+JMImplementation:type=MBeanServerDelegate);
+mBeanServer.removeNotificationListener(objectName, this);
+} catch (Exception e) {
+log.warn(Error unregistering MBeanServerDelegate, e);
+}
+}
// --- NotificationListener
Methods
@@ -183,12 +196,12 @@
(engineName != null) ) ) {
return;
}
-
-log.debug( Handle + objectName );
+if(log.isDebugEnabled())
+log.debug( Handle + objectName + type : +
notification.getType());
if (notification.getType().equals
(MBeanServerNotification.REGISTRATION_NOTIFICATION)) {
String type=objectName.getKeyProperty(type);
-if( Host.equals( type )) {
+if( Host.equals( type )
domain.equals(objectName.getDomain())) {
try {
registerHost(objectName);
} catch (Exception e) {
@@ -214,7 +227,7 @@
} else if (notification.getType().equals
(MBeanServerNotification.UNREGISTRATION_NOTIFICATION)) {
String type=objectName.getKeyProperty(type);
-if( Host.equals( type )) {
+if( Host.equals( type )
domain.equals(objectName.getDomain())) {
try {
unregisterHost(objectName);
} catch (Exception e) {
@@ -276,8 +289,8 @@
}
}
-if (!isRegisteredWithAlias)
-log.warn(Unknown default host: + defaultHost);
+if (!isRegisteredWithAlias log.isWarnEnabled())
+log.warn(sm.getString(mapperListener.unknownDefaultHost,
defaultHost));
}
// This should probablt be called later
if( defaultHost != null ) {
@@ -295,6 +308,10 @@
String[] aliases = (String[])
mBeanServer.invoke(objectName, findAliases, null, null);
mapper.addHost(name, aliases, objectName);
+if(log.isDebugEnabled())
+log.debug(sm.getString
+ (mapperListener.registerHost, name, domain));
+
}
}
@@ -306,6 +323,9 @@
throws Exception {
String name=objectName.getKeyProperty(host);
mapper.removeHost(name);
+if(log.isDebugEnabled())
+log.debug(sm.getString
+ (mapperListener.unregisterHost, name, domain));
}
@@ -350,7 +370,8 @@
contextName = ;
}
-log.debug(sm.getString
+if(log.isDebugEnabled())
+ log.debug(sm.getString
(mapperListener.registerContext, contextName));
Object context =
@@ -408,8 +429,8 @@
if (contextName.equals(/)) {
contextName = ;
}
-
-log.debug(sm.getString
+if(log.isDebugEnabled())
+log.debug(sm.getString
(mapperListener.unregisterContext, contextName));
mapper.removeContext(hostName, contextName);
@@ -458,8 +479,8 @@
if (contextName.equals(/)) {
contextName = ;
}
-
-log.debug(sm.getString
+if(log.isDebugEnabled())
+log.debug(sm.getString
(mapperListener.registerWrapper,
wrapperName, contextName));
@@ -478,4 +499,6 @@
}
+
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector LocalStrings.properties Connector.java
pero2005/01/29 11:44:43
Modified:catalina/src/share/org/apache/catalina/connector
LocalStrings.properties Connector.java
Log:
Change Mbean names from Mapper and ProtocolHandler
Every connector have its unique Mapper and ProtocoHandler at the MBeanserver
Fix a start/stop/start connector szenario
Revision ChangesPath
1.6 +6 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalStrings.properties 1 Nov 2004 23:35:39 - 1.5
+++ LocalStrings.properties 29 Jan 2005 19:44:43 - 1.6
@@ -14,7 +14,8 @@
coyoteConnector.protocolRegistrationFailed=Protocol JMX registration failed
coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
-
+coyoteConnector.MapperRegistration=register Mapper: {0}
+coyoteConnector.protocolUnregistrationFailed=Protocol handler stop failed
#
# CoyoteAdapter
#
@@ -50,8 +51,10 @@
#
# MapperListener
#
-
-mapperListener.registerContext=Register Context {0}
+mapperListener.unknownDefaultHost=Unknown default host: {0}
+mapperListener.registerHost=Register host {0} at domain {1}
+mapperListener.unregisterHost=Unregister host {0} at domain {1}
+mapperListener.registerContext=Register Context {0}
mapperListener.unregisterContext=Unregister Context {0}
mapperListener.registerWrapper=Register Wrapper {0} in Context {1}
1.16 +46 -26
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
Index: Connector.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Connector.java6 Dec 2004 13:59:28 - 1.15
+++ Connector.java29 Jan 2005 19:44:43 - 1.16
@@ -874,6 +874,20 @@
}
+
+protected ObjectName createObjectName(String domain, String type)
+throws MalformedObjectNameException {
+String encodedAddr = null;
+if (getProperty(address) != null) {
+encodedAddr =
URLEncoder.encode(getProperty(address).toString());
+}
+String addSuffix = (getProperty(address) == null) ? :
,address=
++ encodedAddr;
+ObjectName _oname = new ObjectName(domain + :type= + type +
,port=
++ getPort() + addSuffix);
+return _oname;
+}
+
/**
* Initialize this connector (create ServerSocket here!)
*/
@@ -881,7 +895,8 @@
throws LifecycleException
{
if (initialized) {
-log.info(sm.getString(coyoteConnector.alreadyInitialized));
+if(log.isInfoEnabled())
+log.info(sm.getString(coyoteConnector.alreadyInitialized));
return;
}
@@ -891,20 +906,15 @@
try {
// we are loaded directly, via API - and no name was given
to us
StandardEngine cb=(StandardEngine)container;
-String encodedAddr = null;
-if (getProperty(address) != null) {
-encodedAddr =
URLEncoder.encode(getProperty(address).toString());
-}
-String addSuffix=(getProperty(address)==null) ?:
,address= + encodedAddr;
-oname=new ObjectName(cb.getName() + :type=Connector,port=+
-getPort() + addSuffix);
+oname = createObjectName(cb.getName(), Connector);
Registry.getRegistry(null, null)
.registerComponent(this, oname, null);
controller=oname;
} catch (Exception e) {
log.error( Error registering connector , e);
}
-log.debug(Creating name for connector + oname);
+if(log.isDebugEnabled())
+log.debug(Creating name for connector + oname);
}
// Initializa adapter
@@ -962,8 +972,9 @@
initialize();
// Validate and update our current state
-if (started) {
-log.info(sm.getString(coyoteConnector.alreadyStarted));
+if (started ) {
+if(log.isInfoEnabled())
+log.info(sm.getString(coyoteConnector.alreadyStarted));
return;
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java
pero2005/01/29 11:45:55
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
Add some log.isXXXEnabled
Revision ChangesPath
1.54 +5 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- HostConfig.java 26 Jan 2005 14:58:50 - 1.53
+++ HostConfig.java 29 Jan 2005 19:45:55 - 1.54
@@ -553,7 +553,8 @@
return;
// Assume this is a configuration descriptor and deploy it
-log.debug(sm.getString(hostConfig.deployDescriptor, file));
+if(log.isDebugEnabled())
+log.debug(sm.getString(hostConfig.deployDescriptor, file));
Context context = null;
try {
synchronized (digester) {
@@ -781,7 +782,8 @@
DeployedApplication deployedApp = new
DeployedApplication(contextPath);
// Deploy the application in this WAR file
-log.info(sm.getString(hostConfig.deployJar, file));
+if(log.isInfoEnabled())
+log.info(sm.getString(hostConfig.deployJar, file));
try {
Context context = (Context)
Class.forName(contextClass).newInstance();
if (context instanceof Lifecycle) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session SessionIDMessage.java
pero2005/01/29 11:46:34
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
SessionIDMessage.java
Log:
correct my name with UTF-8 encoding
Revision ChangesPath
1.3 +1 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java
Index: SessionIDMessage.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionIDMessage.java 27 Jan 2005 14:42:07 - 1.2
+++ SessionIDMessage.java 29 Jan 2005 19:46:34 - 1.3
@@ -20,7 +20,7 @@
/**
* Session id change cluster message
*
- * @author Peter Roßbach
+ * @author Peter Rossbach
*
*/
public class SessionIDMessage implements ClusterMessage {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/01/29 11:48:25 Modified:webapps/docs changelog.xml Log: Add my current changes :-) Start/Stop Connector Remove and recreate a Host add some log.isXXXEnabled Revision ChangesPath 1.229 +43 -3 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- changelog.xml 27 Jan 2005 16:48:48 - 1.228 +++ changelog.xml 29 Jan 2005 19:48:25 - 1.229 @@ -1,4 +1,4 @@ -?xml version=1.0? +?xml version=1.0 encoding=ISO-8859-1? !DOCTYPE document [ !ENTITY project SYSTEM project.xml ] @@ -30,6 +30,24 @@ subsection name=Catalina changelog fix +Unregister host mbean and all context mbeans at remove a host, s. StandardHost.destroy() and MBeanFactory.createStandardHost/removeHost(,) detected by Thorsten Kamann (pero) + /fix + fix +make it possible to restart connector, now serversocket recreated after stop,start (pero) + /fix + fix +change mbean names from Mapper and ProtocolHandler to connector naming style (pero) + /fix + update +Add some log.isXXXEnabled (pero) + /update + fix +Deregister MapperListener after remove connector (pero) + /fix + fix +Remove host only at own domain with same name at all services, detected by Thorsten Kamann (pero) + /fix + fix bug33187/bug: Remove any logging of the password in the JAAS realm, submitted by Andrew Jaquith (remm) /fix @@ -43,14 +61,28 @@ fix bug26135/bug: Workaround for memory leak when reloading Struts based web applications by clearing the bean instrospector cache of the JVM on -classloader stop, submitted by Tobias Löfstrand (remm) +classloader stop, submitted by Tobias Löfstrand (remm) /fix fix Ensure that if CLASSPATH is declared on startup - it is not used. (funkman) /fix /changelog /subsection - + + subsection name=Coyote +changelog + fix + PoolTcpEndpoint recreate ServerSocket after start,stop,start connector (pero) + /fix + update +Add some log.isXXXEnabled (pero) + /update + add + JkMX: make log4j mbean configureable with attribute log4jEnabled + /add +/changelog + /subsection + subsection name=Jasper changelog fix @@ -59,6 +91,14 @@ /fix /changelog /subsection + + subsection name=Webapps +changelog + fix +Fix create and remove Host for Admin app. (pero) + /fix +/changelog + /subsection /section section name=Tomcat 5.5.7 (remm) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
