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 2011/01/20 09:22:32 UTC
svn commit: r1061154 -
/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Author: xuhaihong
Date: Thu Jan 20 08:22:32 2011
New Revision: 1061154
URL: http://svn.apache.org/viewvc?rev=1061154&view=rev
Log:
GERONIMO-5773 Referenced resource cannot be generated by plan creator (Patch from FangShenhao)
Modified:
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=1061154&r1=1061153&r2=1061154&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Thu Jan 20 08:22:32 2011
@@ -689,28 +689,12 @@ public class TomcatModuleBuilder extends
webModuleData.setReferencePattern("applicationPolicyConfigurationManager", EARContext.JACC_MANAGER_NAME_KEY.get(earContext.getGeneralData()));
}
//not truly metadata complete until MBEs have run
- //if (!webApp.isMetadataComplete()) {
if (INITIAL_WEB_XML_SCHEMA_VERSION.get(earContext.getGeneralData()) >= 2.5f) {
- //Those elements have been processed by Geronimo, Tomcat no need to do it now.
- //Also, currently, it seems that Tomcat could not handle those jndi elements correctly
webApp.setMetadataComplete(true);
-
- //remove naming stuff from webApp so tomcat doesn't process it uselessly
- webApp.getEjbLocalRef().clear();
- webApp.getEjbRef().clear();
- webApp.getEnvEntry().clear();
- webApp.getDataSource().clear();
- webApp.getMessageDestinationRef().clear();
- webApp.getResourceEnvRef().clear();
- webApp.getResourceRef().clear();
- webApp.getServiceRef().clear();
-
String specDeploymentPlan = getSpecDDAsString(webModule);
module.setOriginalSpecDD(specDeploymentPlan);
-
earContext.addFile(new URI("./WEB-INF/web.xml"), specDeploymentPlan);
}
- //}
webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
module.addAsChildConfiguration();
} catch (DeploymentException de) {