svn commit: r788280 - in /geronimo/server/trunk: plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml

[xu...@apache.org]

Author: xuhaihong
Date: Thu Jun 25 07:33:31 2009
New Revision: 788280

URL: http://svn.apache.org/viewvc?rev=788280&view=rev
Log:
Fix the Tomcat configuration about realm and valve

Modified:
    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/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=788280&r1=788279&r2=788280&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 Thu Jun 25 07:33:31 2009
@@ -19,11 +19,11 @@
 import java.util.Map;
 
 import org.apache.catalina.Container;
-import org.apache.catalina.Engine;
 import org.apache.catalina.Pipeline;
 import org.apache.catalina.Service;
 import org.apache.catalina.Valve;
 import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
@@ -34,6 +34,7 @@
 /**
  * @version $Rev$ $Date$
  */
+@GBean(j2eeType="TomcatValve")
 public class ValveGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
     private static final Logger log = LoggerFactory.getLogger(ValveGBean.class);

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=788280&r1=788279&r2=788280&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 Thu Jun 25 07:33:31 2009
@@ -43,12 +43,12 @@
     <gbean name="NewVirtualHost"
         class="org.apache.geronimo.tomcat.HostGBean">
         <attribute name="className">
-			org.apache.catalina.core.StandardHost
+            org.apache.catalina.core.StandardHost
         </attribute>
         <attribute name="initParams">
-			name=testhost.com
-			appBase=
-			workDir=work
+            name=testhost.com
+            appBase=
+            workDir=work
         </attribute>
         <reference name="Engine">
             <name>TomcatEngine</name>
@@ -57,29 +57,35 @@
     <gbean name="FirstValve"
         class="org.apache.geronimo.tomcat.ValveGBean">
         <attribute name="className">
-			org.apache.catalina.authenticator.SingleSignOn
+            org.apache.catalina.authenticator.SingleSignOn
         </attribute>
         <reference name="NextValve">
-            <name>SecondValve</name>
+            <type>TomcatValve</type>
+            <name>SecondValve</name> 
         </reference>
     </gbean>
     <gbean name="SecondValve"
         class="org.apache.geronimo.tomcat.ValveGBean">
         <attribute name="className">
-			org.apache.catalina.valves.AccessLogValve
+            org.apache.catalina.valves.AccessLogValve
         </attribute>
         <attribute name="initParams">
-			prefix=localhost_access_log. suffix=.txt pattern=common
+            prefix=localhost_access_log. 
+            suffix=.txt 
+            pattern=common
         </attribute>
     </gbean>
     <gbean name="TomcatRealm"
         class="org.apache.geronimo.tomcat.RealmGBean">
         <attribute name="className">
-			org.apache.geronimo.tomcat.realm.TomcatGeronimoRealm
+        org.apache.geronimo.tomcat.realm.TomcatGeronimoRealm
         </attribute>
+        <reference name="ConfigurationFactory">
+            <name>geronimo-admin</name>
+        </reference>
         <attribute name="initParams">
-			userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
-			roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal
+            userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
+            roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal
         </attribute>
     </gbean>
 </web-app>
\ No newline at end of file