You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/09/25 20:03:36 UTC
svn commit: rev 47212 - geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment
Author: djencks
Date: Sat Sep 25 11:03:35 2004
New Revision: 47212
Modified:
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Log:
Reactivate naming schema rewriting and untyped subelement search
Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Sat Sep 25 11:03:35 2004
@@ -119,11 +119,9 @@
public XmlObject validateVendorDD(XmlObject vendorDD) throws DeploymentException {
try {
- // TODO this is totally wrong but works
-// vendorDD = SchemaConversionUtils.getNestedObjectAsType(vendorDD, "web-app", JettyWebAppType.type);
-// SchemaConversionUtils.validateDD(vendorDD);
- vendorDD = ((JettyWebAppDocument)vendorDD).getWebApp();
+ vendorDD = SchemaConversionUtils.getNestedObjectAsType(vendorDD, "web-app", JettyWebAppType.type);
vendorDD = SchemaConversionUtils.convertToGeronimoNamingSchema(vendorDD);
+ SchemaConversionUtils.validateDD(vendorDD);
return vendorDD;
} catch (Exception e) {
throw new DeploymentException(e);