geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r817472 - in /geronimo/server/trunk: plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/ plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ testsuite/web-testsuite/test-tomcat/src/main/weba...
Date Tue, 22 Sep 2009 01:47:08 GMT
Author: genspring
Date: Tue Sep 22 01:47:07 2009
New Revision: 817472

URL: http://svn.apache.org/viewvc?rev=817472&view=rev
Log:
GERONIMO-4882 some doc update in G22 might be caused by bugs in code.

Modified:
    geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java?rev=817472&r1=817471&r2=817472&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java
(original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicNodeInfo.java
Tue Sep 22 01:47:07 2009
@@ -20,24 +20,20 @@
 package org.apache.geronimo.farm.config;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
-import javax.management.MBeanServerConnection;
 import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
 
+import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.system.jmx.KernelDelegate;
 
 /**
  *
  * @version $Rev:$ $Date:$
  */
+@GBean(j2eeType="NodeInfo")
 public class BasicNodeInfo implements NodeInfo {
     private final String name;
     private final ExtendedJMXConnectorInfo connectorInfo;

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java?rev=817472&r1=817471&r2=817472&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java
Tue Sep 22 01:47:07 2009
@@ -63,7 +63,7 @@
             //Legacy configuration
             @ParamAttribute(name="className") String className, 
             @ParamAttribute(name = "initParams") Map<String,String> initParams, 
-            @ParamReference(name="NextValve") ValveGBean nextValve, 
+            @ParamReference(name="NextValve",namingType="TomcatValve") ValveGBean nextValve,

             @ParamSpecial(type=SpecialAttributeType.classLoader) ClassLoader classLoader)
throws Exception{
         
         if (server != null) {

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml?rev=817472&r1=817471&r2=817472&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
Tue Sep 22 01:47:07 2009
@@ -60,7 +60,6 @@
             org.apache.catalina.authenticator.SingleSignOn
         </attribute>
         <reference name="NextValve">
-            <type>TomcatValve</type>
             <name>SecondValve</name> 
         </reference>
     </gbean>



Mime
View raw message