You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2007/06/02 00:13:40 UTC
svn commit: r543639 -
/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Author: kevan
Date: Fri Jun 1 15:13:39 2007
New Revision: 543639
URL: http://svn.apache.org/viewvc?view=rev&rev=543639
Log:
Leave out security constraint and security role. Need to look into this a bit more...
Modified:
geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=diff&rev=543639&r1=543638&r2=543639
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Fri Jun 1 15:13:39 2007
@@ -503,8 +503,10 @@
shortWebApp.setResourceEnvRefArray(new ResourceEnvRefType[0]);
shortWebApp.setResourceRefArray(new ResourceRefType[0]);
shortWebApp.setServiceRefArray(new ServiceRefType[0]);
- shortWebApp.setSecurityConstraintArray(new SecurityConstraintType[0]);
- shortWebApp.setSecurityRoleArray(new SecurityRoleType[0]);
+ // TODO Tomcat will fail web services tck tests if the following security settings are set in shortWebApp
+ // need to figure out why...
+// shortWebApp.setSecurityConstraintArray(new SecurityConstraintType[0]);
+// shortWebApp.setSecurityRoleArray(new SecurityRoleType[0]);
File webXml = new File(moduleContext.getBaseDir(), "/WEB-INF/web.xml");
File inPlaceDir = moduleContext.getInPlaceConfigurationDir();
if (inPlaceDir != null) {