geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: rev 47212 - geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment
Date Sat, 25 Sep 2004 18:03:36 GMT
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);

Mime
View raw message