cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardEngine.java StandardHost.java StandardService.java
pero2004/12/27 01:43:14
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java StandardHost.java
StandardService.java
Log:
Add some log.isXXXEnabled
Revision ChangesPath
1.28 +5 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StandardEngine.java 23 Dec 2004 06:11:51 - 1.27
+++ StandardEngine.java 27 Dec 2004 09:43:14 - 1.28
@@ -299,7 +299,8 @@
if (domain==null) {
domain=getName();
}
-log.debug( Register + domain );
+if(log.isDebugEnabled())
+log.debug( Register + domain );
oname=new ObjectName(domain + :type=Engine);
controller=oname;
Registry.getRegistry(null, null)
@@ -424,7 +425,8 @@
// Log our server identification information
//System.out.println(ServerInfo.getServerInfo());
-log.info( Starting Servlet Engine: + ServerInfo.getServerInfo());
+if(log.isInfoEnabled())
+log.info( Starting Servlet Engine: +
ServerInfo.getServerInfo());
if( mbeans != null ) {
try {
Registry.getRegistry(null, null)
1.37 +13 -11
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- StandardHost.java 23 Dec 2004 06:11:51 - 1.36
+++ StandardHost.java 27 Dec 2004 09:43:14 - 1.37
@@ -710,12 +710,12 @@
errorReportValveClass));
}
}
-
-if (xmlValidation)
-log.info( sm.getString(standardHost.validationEnabled));
-else
-log.info( sm.getString(standardHost.validationDisabled));
-
+if(log.isInfoEnabled()) {
+if (xmlValidation)
+log.info( sm.getString(standardHost.validationEnabled));
+else
+log.info( sm.getString(standardHost.validationDisabled));
+}
super.start();
}
@@ -762,13 +762,14 @@
HostConfig deployer = new HostConfig();
addLifecycleListener(deployer);
if( mserver.isRegistered( serviceName )) {
-log.debug(Registering with the Engine);
+if(log.isDebugEnabled())
+log.debug(Registering + serviceName + with the
Engine);
mserver.invoke( serviceName, addChild,
new Object[] { this },
new String[] { org.apache.catalina.Container }
);
}
} catch( Exception ex ) {
-ex.printStackTrace();
+log.error(Host registering failed!,ex);
}
}
@@ -777,13 +778,14 @@
try {
StandardEngine engine=(StandardEngine)parent;
domain=engine.getName();
-log.debug( Register + domain );
+if(log.isDebugEnabled())
+log.debug( Register host + getName() + with domain
+ domain );
oname=new ObjectName(domain + :type=Host,host= +
this.getName());
Registry.getRegistry(null, null)
.registerComponent(this, oname, null);
} catch( Throwable t ) {
-log.info(Error registering , t );
+log.error(Host registering failed!, t );
}
}
}
1.16 +8 -7
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StandardService.java 23 Jun 2004 16:59:41 - 1.15
+++ StandardService.java 27 Dec 2004 09:43:14 - 1.16
@@ -429,7 +429,7 @@
public void start() throws
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardEngine.java StandardHost.java
billbarker2004/12/22 22:11:52
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java StandardHost.java
Log:
Fix the locating of orphaned Realms for JMX embedding.
Since Realms don't implement managedResource, this is the only way to get
this unused method to work.
Revision ChangesPath
1.27 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- StandardEngine.java 3 Oct 2004 08:53:56 - 1.26
+++ StandardEngine.java 23 Dec 2004 06:11:51 - 1.27
@@ -412,9 +412,10 @@
try {
realmName=new ObjectName( domain + :type=Realm);
if( mserver.isRegistered(realmName ) ) {
-Realm nrealm = (Realm)mserver.getAttribute(realmName,
- managedResource);
-setRealm(nrealm);
+mserver.invoke(realmName, init,
+new Object[] {},
+new String[] {}
+);
}
} catch( Throwable t ) {
log.debug(No realm for this engine + realmName);
1.36 +5 -4
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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- StandardHost.java 5 Oct 2004 17:12:51 - 1.35
+++ StandardHost.java 23 Dec 2004 06:11:51 - 1.36
@@ -676,9 +676,10 @@
try {
realmName=new ObjectName( domain + :type=Realm,host= +
getName());
if( mserver.isRegistered(realmName ) ) {
-Realm nrealm = (Realm)mserver.getAttribute(realmName,
- managedResource);
-setRealm(nrealm);
+mserver.invoke(realmName, init,
+new Object[] {},
+new String[] {}
+);
}
} catch( Throwable t ) {
log.debug(No realm for this host + realmName);
-
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 StandardEngine.java
jfarcand2003/04/04 14:46:17
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
Set the container before initializing a Service (throws a NPE when embedded).
Revision ChangesPath
1.9 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StandardEngine.java 21 Mar 2003 07:34:39 - 1.8
+++ StandardEngine.java 4 Apr 2003 22:46:17 - 1.9
@@ -413,8 +413,8 @@
// for consistency...: we are probably in embeded mode
try {
service=new StandardService();
-service.initialize();
service.setContainer( this );
+service.initialize();
} catch( Throwable t ) {
t.printStackTrace();
}
-
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 StandardEngine.java
costin 2003/04/04 20:00:32
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
A bit of a hack for now. When the engine is destroyed it should clean up
the data that it loaded in registry - otherwise a start would see the
old data.
The real solution is to stop using the static methods in Registry. The registry
is just a helper associated with the app. This will also be more secure.
In any case - for next release of modeler the static methods will be deprecated
and the method that loads explicitely an mbean-descriptor will also be deprecated.
It is much cleaner to load the descriptors on demand, from the same package.
Revision ChangesPath
1.10 +15 -13
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardEngine.java 4 Apr 2003 22:46:17 - 1.9
+++ StandardEngine.java 5 Apr 2003 04:00:32 - 1.10
@@ -65,23 +65,17 @@
package org.apache.catalina.core;
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.management.ObjectName;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Request;
-import org.apache.catalina.Response;
-import org.apache.catalina.Service;
import org.apache.catalina.Realm;
+import org.apache.catalina.Service;
import org.apache.catalina.realm.JAASRealm;
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.logging.Log;
@@ -385,6 +379,7 @@
domain=getName();
log.info( Register + domain );
oname=new ObjectName(domain + :type=Engine);
+controller=oname;
Registry.getRegistry().registerComponent(this, oname, null);
} catch( Throwable t ) {
log.info(Error registering , t );
@@ -422,10 +417,16 @@
}
-public void destroy() {
+public void destroy() throws LifecycleException {
if( ! initialized ) return;
initialized=false;
+// if we created it, make sure it's also destroyed
+((StandardService)service).destroy();
+// force all metadata to be reloaded.
+// That doesn't affect existing beans. We should make it per
+// registry - and stop using the static.
+Registry.getRegistry().resetMetadata();
}
/**
@@ -505,3 +506,4 @@
}
}
+
\ No newline at end of file
-
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 StandardEngine.java
costin 2003/03/18 23:23:57
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
Register standard engine.
After all the init is done, I'll start testing the destroy and reloading.
Revision ChangesPath
1.7 +9 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardEngine.java 17 Mar 2003 19:16:42 - 1.6
+++ StandardEngine.java 19 Mar 2003 07:23:57 - 1.7
@@ -85,6 +85,7 @@
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.Registry;
/**
* Standard implementation of the bEngine/b interface. Each
@@ -383,6 +384,7 @@
domain=getName();
log.info( Register + domain );
oname=new ObjectName(domain + :type=Engine);
+Registry.getRegistry().registerComponent(this, oname, null);
} catch( Throwable t ) {
log.info(Error registering , t );
}
@@ -415,6 +417,9 @@
public void start() throws LifecycleException {
if( started ) {
return;
+}
+if( !initialized ) {
+init();
}
// Log our server identification information
//System.out.println(ServerInfo.getServerInfo());
-
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 StandardEngine.java
costin 2003/03/17 11:16:42
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
Same.
Revision ChangesPath
1.6 +38 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardEngine.java 17 Mar 2003 07:30:09 - 1.5
+++ StandardEngine.java 17 Mar 2003 19:16:42 - 1.6
@@ -357,7 +357,6 @@
}
-
/**
* Disallow any attempt to set a parent for this Container, since an
* Engine is supposed to be at the top of the Container hierarchy.
@@ -372,15 +371,12 @@
}
-/**
- * Start this Engine component.
- *
- * @exception LifecycleException if a startup error occurs
- */
-public void start() throws LifecycleException {
-if( started ) {
-return;
-}
+private boolean initialized=false;
+
+public void init() {
+if( initialized ) return;
+initialized=true;
+
if( oname==null ) {
// not registered in JMX yet - standalone mode
try {
@@ -392,6 +388,34 @@
}
}
+if( service==null ) {
+// for consistency...
+try {
+service=new StandardService();
+service.initialize();
+service.setContainer( this );
+} catch( Throwable t ) {
+t.printStackTrace();
+}
+}
+
+}
+
+public void destroy() {
+if( ! initialized ) return;
+initialized=false;
+
+}
+
+/**
+ * Start this Engine component.
+ *
+ * @exception LifecycleException if a startup error occurs
+ */
+public void start() throws LifecycleException {
+if( started ) {
+return;
+}
// Log our server identification information
//System.out.println(ServerInfo.getServerInfo());
log.info( Starting Servlet Engine: + ServerInfo.getServerInfo());
-
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 StandardEngine.java
costin 2003/03/16 23:30:10
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
If not registered yet - register ourself. That will replace the
ServerLifecycleListener
for standalone case - in embeded we are already registered by the JMX.
Revision ChangesPath
1.5 +41 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardEngine.java 7 Mar 2003 16:01:35 - 1.4
+++ StandardEngine.java 17 Mar 2003 07:30:09 - 1.5
@@ -80,6 +80,8 @@
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.Service;
+import org.apache.catalina.Realm;
+import org.apache.catalina.realm.JAASRealm;
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -168,6 +170,19 @@
// - Properties
+/** Provide a default in case no explicit configuration is set
+ *
+ * @return configured realm, or a JAAS realm by default
+ */
+public Realm getRealm() {
+Realm configured=super.getRealm();
+if( configured==null ) {
+configured=new JAASRealm();
+this.setRealm( configured );
+}
+return configured;
+}
+
/**
* Return the default host.
@@ -363,6 +378,19 @@
* @exception LifecycleException if a startup error occurs
*/
public void start() throws LifecycleException {
+if( started ) {
+return;
+}
+if( oname==null ) {
+// not registered in JMX yet - standalone mode
+try {
+domain=getName();
+log.info( Register + domain );
+oname=new ObjectName(domain + :type=Engine);
+} catch( Throwable t ) {
+log.info(Error registering , t );
+}
+}
// Log our server identification information
//System.out.println(ServerInfo.getServerInfo());
@@ -426,4 +454,13 @@
return name;
}
+
+public ObjectName createObjectName(String domain, ObjectName parent)
+throws Exception
+{
+if( log.isDebugEnabled())
+log.debug(Create ObjectName + domain + + parent );
+return new ObjectName( domain + :type=Engine);
+}
+
}
-
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 StandardEngine.java
costin 2003/03/07 08:01:35
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
Added a baseDir attribute. In theory you should be able to have more engines
in a JVM - but if all use catalina.base system property it won't work.
Added JMX hooks to self-register in the Service - in JMX components
can be loaded/reloaded in an arbitrary order.
Use log for the start message instead of System.out.
Revision ChangesPath
1.4 +49 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StandardEngine.java 27 Jan 2003 23:36:16 - 1.3
+++ StandardEngine.java 7 Mar 2003 16:01:35 - 1.4
@@ -69,6 +69,8 @@
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.management.ObjectName;
+import javax.management.MBeanServer;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
@@ -79,6 +81,8 @@
import org.apache.catalina.Response;
import org.apache.catalina.Service;
import org.apache.catalina.util.ServerInfo;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Standard implementation of the bEngine/b interface. Each
@@ -93,6 +97,7 @@
extends ContainerBase
implements Engine {
+private static Log log = LogFactory.getLog(StandardEngine.class);
// --- Constructors
@@ -142,6 +147,11 @@
*/
private Service service = null;
+/** Allow the base dir to be specified explicitely for
+ * each engine. In time we should stop using catalina.base property -
+ * otherwise we loose some flexibility.
+ */
+private String baseDir = null;
/**
* DefaultContext config
@@ -278,6 +288,16 @@
}
+public String getBaseDir() {
+if( baseDir==null ) {
+baseDir=System.getProperty(catalina.base);
+}
+return baseDir;
+}
+
+public void setBaseDir(String baseDir) {
+this.baseDir = baseDir;
+}
// - Public Methods
@@ -345,7 +365,8 @@
public void start() throws LifecycleException {
// Log our server identification information
-System.out.println(ServerInfo.getServerInfo());
+//System.out.println(ServerInfo.getServerInfo());
+log.info( Starting Servlet Engine: + ServerInfo.getServerInfo());
// Standard container startup
super.start();
@@ -381,5 +402,28 @@
}
+// JMX registration
+
+public ObjectName preRegister(MBeanServer server,
+ ObjectName name) throws Exception
+{
+super.preRegister(server,name);
+
+// Register with the Service. XXX Do we really need a Service ??
+// BTW - the connector can go directly here.
+ObjectName serviceName=new ObjectName(domain +
+:type=Service,name=Tomcat-Standalone);
+if( server.isRegistered( serviceName )) {
+log.info(Registering with the service );
+try {
+server.invoke( serviceName, setContainer,
+new Object[] { this },
+new String[] { org.apache.catalina.Container } );
+} catch( Exception ex ) {
+ex.printStackTrace();
+}
+}
+return name;
+}
}
-
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 StandardEngine.java
costin 2003/01/27 15:36:16
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
Remove debugging message.
Revision ChangesPath
1.3 +4 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardEngine.java 3 Jan 2003 16:59:08 - 1.2
+++ StandardEngine.java 27 Jan 2003 23:36:16 - 1.3
@@ -195,7 +195,6 @@
* This property should not be changed once it is set.
*/
public void setJvmRoute(String routeId) {
-this.log(setJvmRoute= + routeId);
jvmRouteId = routeId;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardEngine.java
jfclere 2003/01/03 08:59:08
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java
Log:
Allow to use the system property to set the JvmRoute.
Revision ChangesPath
1.2 +9 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardEngine.java 18 Jul 2002 16:48:12 - 1.1
+++ StandardEngine.java 3 Jan 2003 16:59:08 - 1.2
@@ -104,6 +104,11 @@
super();
pipeline.setBasic(new StandardEngineValve());
+/* Set the jmvRoute using the system property jvmRoute */
+try {
+setJvmRoute(System.getProperty(jvmRoute));
+} catch(Exception ex) {
+}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
