Amy Roh wrote:
Hi Remy,
Modified: . build.xml
catalina/src/share/org/apache/catalina/core
StandardContext.java StandardEngine.java
mbeans-descriptors.xml
catalina/src/share/org/apache/catalina/connector
Connector.java
resources/mbeans tomcat5-ant.xml
catalina/src/share/org/apache/catalina/realm RealmBase.java
webapps/docs changelog.xml
Log:
- Fix embed and deployer packaging.
- Fix JMX registration of realm.
- Fix a variety of problems in MBean names.
1.26 +18 -1 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StandardEngine.java 16 Aug 2004 09:31:05 -0000 1.25
+++ StandardEngine.java 3 Oct 2004 08:53:56 -0000 1.26
@@ -404,6 +404,23 @@
if( !initialized ) {
init();
}
+
+ // Look for a realm - that may have been configured earlier.
+ // If the realm is added after context - it'll set itself.
+ if( realm == null ) {
+ ObjectName realmName=null;
+ try {
+ realmName=new ObjectName( domain + ":type=Realm");
+ if( mserver.isRegistered(realmName ) ) {
+ Realm nrealm = (Realm)mserver.getAttribute(realmName,
+ "managedResource");
I don't think Realm has "managedResource" attribute.
Shouldn't we be moving towards getting rid of all non-serializable attributes and return types in order to support remote access to MBeanServer using JSR 160?
It's probably not used. I don't know for sure if it does anything, all I know is that I did cut & paste from the other standard containers while I was investigating why realms weren't working with embed.
Rémy
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
