You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/05/03 04:31:58 UTC
svn commit: r940349 - in
/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src:
main/java/org/apache/geronimo/tomcat/ test/java/org/apache/geronimo/tomcat/
Author: xuhaihong
Date: Mon May 3 02:31:58 2010
New Revision: 940349
URL: http://svn.apache.org/viewvc?rev=940349&view=rev
Log:
Disable annotation scanning for EJB Web Service
Modified:
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java?rev=940349&r1=940348&r2=940349&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java Mon May 3 02:31:58 2010
@@ -24,11 +24,10 @@ import java.security.AccessControlContex
import javax.security.auth.Subject;
+import org.apache.catalina.core.StandardContext;
import org.apache.geronimo.security.jaas.ConfigurationFactory;
import org.apache.geronimo.tomcat.security.Authorizer;
-import org.apache.geronimo.tomcat.security.jacc.JACCAuthorizer;
import org.apache.geronimo.tomcat.security.jacc.JACCEJBWebServiceAuthorizer;
-import org.apache.catalina.core.StandardContext;
/**
* @version $Rev$ $Date$
@@ -64,4 +63,9 @@ public class EjbWsContextConfig extends
protected Authorizer createAuthorizer(AccessControlContext defaultAcc) {
return new JACCEJBWebServiceAuthorizer(defaultAcc);
}
+
+ @Override
+ protected void webConfig() {
+ //For a EJBWsContextConfig, we no need to scan web.xml/annotations
+ }
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java?rev=940349&r1=940348&r2=940349&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java Mon May 3 02:31:58 2010
@@ -59,6 +59,7 @@ public class TomcatEJBWebServiceContext
wrapper.setName(name);
this.addChild(wrapper);
this.addServletMapping("/*", name);
+ setProcessTlds(false);
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=940349&r1=940348&r2=940349&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Mon May 3 02:31:58 2010
@@ -231,4 +231,10 @@ public abstract class AbstractWebModuleT
connector.doStop();
super.tearDown();
}
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ System.setProperty("catalina.useNaming", "false");
+ }
}