geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r239292 - in /geronimo/trunk: applications/console-ear/src/plan/ modules/jetty-builder/ modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/ modules/jetty-builder/src/test-resources/plans/ modules/tomcat-builder/ modules/tom...
Date Tue, 23 Aug 2005 02:05:29 GMT
Author: djencks
Date: Mon Aug 22 19:05:21 2005
New Revision: 239292

URL: http://svn.apache.org/viewcvs?rev=239292&view=rev
Log:
GERONIMO-845.  Change web container specific configuration to use any elements with schemas.
 While an improvement over untyped configuration elements, there is controversy over the use
of any elements rather than container specific schemas for the entire plan, so this code should
be considered experimental.

Modified:
    geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
    geronimo/trunk/modules/jetty-builder/maven.xml
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan4.xml
    geronimo/trunk/modules/tomcat-builder/maven.xml
    geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
    geronimo/trunk/modules/web-builder/maven.xml
    geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd

Modified: geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml Mon Aug 22 19:05:21
2005
@@ -3,8 +3,8 @@
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
     configId="org/apache/geronimo/Console"
     parentId="org/apache/geronimo/RuntimeDeployer">
-    
-	<!-- these dependencies must be kept here so that their classes are loaded in the "EARs"
classloader. -->
+
+    <!-- these dependencies must be kept here so that their classes are loaded in the
"EARs" classloader. -->
     <dependency>
         <uri>portlet-api/jars/portlet-api-${portlet_api_version}.jar</uri>
     </dependency>
@@ -21,8 +21,10 @@
         <web-app xmlns="http://geronimo.apache.org/xml/ns/web" configId="console">
             <context-root>/console</context-root>
             <context-priority-classloader>false</context-priority-classloader>
-            <container-config container="Tomcat">
-                <config-param name="CrossContext">true</config-param>
+            <container-config>
+                <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat">
+                    <cross-context/>
+                </tomcat>
             </container-config>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
             <security>
@@ -39,23 +41,27 @@
             </security>
         </web-app>
     </module>
-    
+
     <module>
         <web>geronimo-console-standard-${pom.currentVersion}.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/web" configId="console-standard">
             <context-root>/console-standard</context-root>
             <context-priority-classloader>false</context-priority-classloader>
-            <container-config container="Tomcat">
-                <config-param name="CrossContext">true</config-param>
+            <container-config>
+                <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat">
+                    <cross-context/>
+                </tomcat>
             </container-config>
         </web-app>
     </module>
 
     <!-- Console specific server info -->
     <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
-        <reference name="ServerInfo"><gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name></reference>
+        <reference name="ServerInfo">
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+        </reference>
         <reference name="LoginModule">
-                <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
-	</reference>
-    </gbean>		
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+        </reference>
+    </gbean>
 </application>

Modified: geronimo/trunk/modules/jetty-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/maven.xml?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/maven.xml (original)
+++ geronimo/trunk/modules/jetty-builder/maven.xml Mon Aug 22 19:05:21 2005
@@ -20,6 +20,17 @@
 <!-- $Rev$ $Date$ -->
 
 <project default="default"
+    xmlns:xmlbeans="xmlbeans2:maven"
 >
+
+    <preGoal name="java:compile">
+        <xmlbeans:schema2java
+            maven.xmlbeans2.sourceschema="schema/geronimo-jetty.xsd"/>
+        <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+        <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+        <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+            <fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+        </copy>
+    </preGoal>
 
 </project>

Modified: geronimo/trunk/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/project.xml?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Mon Aug 22 19:05:21 2005
@@ -42,6 +42,13 @@
 
     <dependencies>
 
+        <dependency>
+             <groupId>xmlbeans</groupId>
+             <artifactId>xmlbeans-maven-plugin</artifactId>
+             <version>${xmlbeans_maven_plugin_version}</version>
+             <type>plugin</type>
+         </dependency>
+
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Mon Aug 22 19:05:21 2005
@@ -50,6 +50,7 @@
 import javax.security.jacc.WebUserDataPermission;
 import javax.servlet.Servlet;
 import javax.transaction.UserTransaction;
+import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -88,6 +89,8 @@
 import org.apache.geronimo.transaction.context.OnlineUserTransaction;
 import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
 import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
+import org.apache.geronimo.xbeans.geronimo.web.GerContainerConfigType;
+import org.apache.geronimo.xbeans.geronimo.web.jetty.GerJettyConfigType;
 import org.apache.geronimo.xbeans.j2ee.DispatcherType;
 import org.apache.geronimo.xbeans.j2ee.ErrorPageType;
 import org.apache.geronimo.xbeans.j2ee.FilterMappingType;
@@ -141,6 +144,8 @@
 
     private final Repository repository;
     private final Kernel kernel;
+    private static final String JETTY_CONFIG_NAMESPACE = "http://geronimo.apache.org/xml/ns/web/jetty";
+    private static final QName JETTY_CONFIG_QNAME = new QName(JETTY_CONFIG_NAMESPACE, "jetty");
 
     public JettyModuleBuilder(URI defaultParentId,
                               Integer defaultSessionTimeoutSeconds,
@@ -459,13 +464,23 @@
 
             webModuleData.setAttribute("uri", URI.create(module.getTargetPath() + "/"));
 
-            String[] hosts = jettyWebApp.getVirtualHostArray();
-            for (int i = 0; i < hosts.length; i++) {
-                hosts[i] = hosts[i].trim();
+            if (jettyWebApp.isSetContainerConfig()) {
+                GerContainerConfigType containerConfig = jettyWebApp.getContainerConfig();
+                XmlObject[] anys = containerConfig.selectChildren(JETTY_CONFIG_QNAME);
+                if (anys.length > 1) {
+                    throw new DeploymentException("More than one jetty configuration element:
" + anys);
+                }
+                if (anys.length == 1) {
+                    GerJettyConfigType jettyConfigType = (GerJettyConfigType)anys[0].changeType(GerJettyConfigType.type);
+                    String[] hosts = jettyConfigType.getVirtualHostArray();
+                    for (int i = 0; i < hosts.length; i++) {
+                        hosts[i] = hosts[i].trim();
+                    }
+                    webModuleData.setAttribute("virtualHosts", hosts);
+                }
             }
-            webModuleData.setAttribute("virtualHosts", hosts);
 
-                webModuleData.setAttribute("componentContext", compContext);
+            webModuleData.setAttribute("componentContext", compContext);
             webModuleData.setAttribute("userTransaction", userTransaction);
             //classpath may have been augmented with enhanced classes
             webModuleData.setAttribute("webClassPath", webModule.getWebClasspath());

Modified: geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan4.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan4.xml?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan4.xml (original)
+++ geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan4.xml Mon Aug 22 19:05:21
2005
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://geronimo.apache.org/xml/ns/web/jetty"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/web"
     configId="goodservlet"
     parentId="org/apache/geronimo/DefaultDatabase">
-    <virtual-host>foo</virtual-host>
-    <virtual-host>bar</virtual-host>
 
     <context-priority-classloader>true</context-priority-classloader>
+
+    <container-config>
+        <jetty xmlns="http://geronimo.apache.org/xml/ns/web/jetty">
+            <virtual-host>foo</virtual-host>
+            <virtual-host>bar</virtual-host>
+        </jetty>
+    </container-config>
+
 </web-app>

Modified: geronimo/trunk/modules/tomcat-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/maven.xml?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/maven.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/maven.xml Mon Aug 22 19:05:21 2005
@@ -6,16 +6,16 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  
+
 
 <!-- $Rev: 56771 $ $Date: 2004-11-06 12:58:54 -0700 (Sat, 06 Nov 2004) $ -->
 
@@ -23,12 +23,23 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
+    xmlns:xmlbeans="xmlbeans2:maven"
 >
 
+    <preGoal name="java:compile">
+        <xmlbeans:schema2java
+            maven.xmlbeans2.sourceschema="schema/geronimo-tomcat.xsd"/>
+        <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+        <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+        <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+            <fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+        </copy>
+    </preGoal>
+
     <preGoal name="test:test">
-    
+
         <j:set var="endorsed.dir" value="${maven.build.dir}/endorsed"/>
-        
+
         <mkdir dir="${endorsed.dir}"/>
         <mkdir dir="${maven.build.dir}/var"/>
         <mkdir dir="${maven.build.dir}/var/catalina"/>

Modified: geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Mon Aug 22 19:05:21 2005
@@ -43,6 +43,7 @@
 import javax.security.jacc.WebRoleRefPermission;
 import javax.security.jacc.WebUserDataPermission;
 import javax.transaction.UserTransaction;
+import javax.xml.namespace.QName;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
@@ -76,11 +77,10 @@
 import org.apache.geronimo.tomcat.ValveGBean;
 import org.apache.geronimo.tomcat.util.SecurityHolder;
 import org.apache.geronimo.transaction.context.OnlineUserTransaction;
-import org.apache.geronimo.xbeans.geronimo.web.GerConfigParamType;
 import org.apache.geronimo.xbeans.geronimo.web.GerContainerConfigType;
 import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
 import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebContainerType;
+import org.apache.geronimo.xbeans.geronimo.web.tomcat.GerTomcatConfigType;
 import org.apache.geronimo.xbeans.j2ee.FilterMappingType;
 import org.apache.geronimo.xbeans.j2ee.HttpMethodType;
 import org.apache.geronimo.xbeans.j2ee.RoleNameType;
@@ -109,6 +109,8 @@
     private final WebServiceBuilder webServiceBuilder;
 
     private final Repository repository;
+    private static final String TOMCAT_CONFIG_NAMESPACE = "http://geronimo.apache.org/xml/ns/web/tomcat";
+    private static final QName TOMCAT_CONFIG_QNAME = new QName(TOMCAT_CONFIG_NAMESPACE, "tomcat");
 
     public TomcatModuleBuilder(URI defaultParentId,
                                boolean defaultContextPriorityClassloader,
@@ -391,66 +393,32 @@
             webModuleData.setReferencePattern("TrackedConnectionAssociator", earContext.getConnectionTrackerObjectName());
             webModuleData.setReferencePattern("Container", tomcatContainerObjectName);
 
-            String virtualServer = null;
-            String[] hosts = tomcatWebApp.getVirtualHostArray();
-            if (hosts.length > 0) {
-                virtualServer = hosts[0].trim();
-            }
             // Process the Tomcat container-config elements
-            if (tomcatWebApp != null && tomcatWebApp.sizeOfContainerConfigArray()
> 0) {
-                Map values = new HashMap();
-                GerContainerConfigType[] configs = tomcatWebApp.getContainerConfigArray();
-                for (int i = 0; i < configs.length; i++) {
-                    GerContainerConfigType config = configs[i];
-                    if(config.getContainer().intValue() != GerWebContainerType.INT_TOMCAT)
{
-                        continue;
+            if (tomcatWebApp != null && tomcatWebApp.isSetContainerConfig()) {
+                GerContainerConfigType config = tomcatWebApp.getContainerConfig();
+                XmlObject[] anys = config.selectChildren(TOMCAT_CONFIG_QNAME);
+                if (anys.length > 1) {
+                    throw new DeploymentException("More than one tomcat config: " + anys);
+                }
+                if (anys.length == 1) {
+                    GerTomcatConfigType tomcatConfig = (GerTomcatConfigType)anys[0].changeType(GerTomcatConfigType.type);
+                    if (tomcatConfig.isSetHost()) {
+                        String virtualServer = tomcatConfig.getHost().trim();
+                        webModuleData.setAttribute("virtualServer", virtualServer);
                     }
-                    GerConfigParamType[] params = config.getConfigParamArray();
-                    for (int j = 0; j < params.length; j++) {
-                        GerConfigParamType param = params[j];
-                        values.put(param.getName(), param.getStringValue());
+                    if (tomcatConfig.isSetCrossContext()) {
+                        webModuleData.setAttribute("crossContext", Boolean.TRUE);
                     }
-                }
-                //TODO remove and use only explicit virtual hosts?
-                //Is there a Tomcat virtual server declaration?
-                virtualServer = (String) values.remove("VirtualServer");
-
-                //Is there a Tomcat crossContext declaration?
-                String strCrossContext = (String) values.remove("CrossContext");
-                if (strCrossContext != null){
-                    if (strCrossContext.trim().toLowerCase().equals("true")){
-                        webModuleData.setAttribute("crossContext",new Boolean(true));
+                    if (tomcatConfig.isSetTomcatRealm()) {
+                        String tomcatRealm = tomcatConfig.getTomcatRealm().trim();
+                        ObjectName realmName = NameFactory.getComponentName(null, null, null,
null, tomcatRealm, RealmGBean.GBEAN_INFO.getJ2eeType(), moduleJ2eeContext);
+                        webModuleData.setReferencePattern("TomcatRealm", realmName);
                     }
-                }
-
-                //Is there a Tomcat realm declaration?
-                String tomcatRealm = (String) values.remove("TomcatRealm");
-                if (tomcatRealm != null) {
-                    ObjectName realmName = NameFactory.getComponentName(null, null, null,
null, tomcatRealm.trim(), RealmGBean.GBEAN_INFO.getJ2eeType(), moduleJ2eeContext);
-                    webModuleData.setReferencePattern("TomcatRealm", realmName);
-                }
-                //Is there a Tomcat Valve Chain declaration?
-                String tomcatValveChain = (String) values.remove("TomcatValveChain");
-                if (tomcatValveChain != null) {
-                    ObjectName valveName = NameFactory.getComponentName(null, null, null,
null, tomcatValveChain.trim(), ValveGBean.J2EE_TYPE, moduleJ2eeContext);
-                    //NameFactory.getComponentName(null, null, null, null, tomcatValveChain.trim(),
ValveGbean., moduleJ2eeContext);
-                    webModuleData.setReferencePattern("TomcatValveChain", valveName);
-                }
-
-                // Are there any leftover values?  If so, that's a problem.
-                if(values.size() > 0) {
-                    StringBuffer msg = new StringBuffer();
-                    msg.append("Unexpected container-config/config-params found for Tomcat
in web app deployment plan (");
-                    boolean first = true;
-                    for (Iterator it = values.keySet().iterator(); it.hasNext();) {
-                        String value = (String) it.next();
-                        if(!first) {
-                            msg.append(",");
-                        }
-                        msg.append(value);
+                    if (tomcatConfig.isSetValveChain()) {
+                        String valveChain = tomcatConfig.getValveChain().trim();
+                        ObjectName valveName = NameFactory.getComponentName(null, null, null,
null, valveChain, ValveGBean.J2EE_TYPE, moduleJ2eeContext);
+                        webModuleData.setReferencePattern("TomcatValveChain", valveName);
                     }
-                    msg.append(")");
-                    throw new DeploymentException(msg.toString());
                 }
             }
 
@@ -524,9 +492,6 @@
                 webModuleData.setReferencePattern("RoleDesignateSource", earContext.getJaccManagerName());
             }
 
-            if (virtualServer != null) {
-                webModuleData.setAttribute("virtualServer", virtualServer);
-            }
             earContext.addGBean(webModuleData);
 
         } catch (DeploymentException de) {

Modified: geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
Mon Aug 22 19:05:21 2005
@@ -21,11 +21,13 @@
     configId="org/apache/geronimo/test">
 
     <context-root>/test</context-root>
-    <virtual-host>tomcathost</virtual-host>
     <context-priority-classloader>false</context-priority-classloader>
-    <container-config container="Tomcat">
-        <config-param name="TomcatRealm" >TomcatRealm</config-param>
-        <config-param name="TomcatValveChain">FirstValve</config-param>
+    <container-config>
+        <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat">
+<!--            <host>tomcathost</host>-->
+            <valve-chain>FirstValve</valve-chain>
+            <tomcat-realm>TomcatRealm</tomcat-realm>
+        </tomcat>
     </container-config>
 
     <security-realm-name>test</security-realm-name>
@@ -45,7 +47,10 @@
 
     <gbean name="FirstValve" class="org.apache.geronimo.tomcat.ValveGBean">
         <attribute name="className">org.apache.catalina.authenticator.SingleSignOn</attribute>
-        <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SecondValve</name></reference>
+        <reference name="NextValve">
+            <moduleType>J2EEModule</moduleType>
+            <name>SecondValve</name>
+        </reference>
     </gbean>
 
     <gbean name="SecondValve" class="org.apache.geronimo.tomcat.ValveGBean">

Modified: geronimo/trunk/modules/web-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/maven.xml?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/maven.xml (original)
+++ geronimo/trunk/modules/web-builder/maven.xml Mon Aug 22 19:05:21 2005
@@ -31,7 +31,7 @@
         <mkdir dir="${basedir}/target/xmlbeans-classes"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
         <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
-            <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+            <fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
         </copy>
     </preGoal>
 

Modified: geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd?rev=239292&r1=239291&r2=239292&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd (original)
+++ geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd Mon Aug 22 19:05:21 2005
@@ -33,71 +33,28 @@
 
     <xs:element name="web-app" type="web:web-appType"/>
 
-    <xs:complexType name="config-paramType">
-        <xs:annotation>
-            <xs:documentation>
-                The config-paramType contains a name-value pair for a
-                configuration parameter
-            </xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="name" type="xs:string" use="required"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:complexType name="container-configType">
-        <xs:annotation>
-            <xs:documentation>
-                Holds any configuration settings appropriate to the
-                specific web container this application is targeting.
-                Generally speaking this configuration file reflects
-                the commonalities between web containers, and it's
-                possible for a single container to have additional
-                configuration options.  We recommend these be avoided
-                wherever possible for the sake of portability.
-
-                Known containers are:
-                  Tomcat
-                  Jetty
-
-                Some known parameters are:
-                  Tomcat:  VirtualServer
-                  Tomcat:  TomcatRealm
-                  Tomcat:  TomcatValveChain
-                An authoritative list is left to the individual container
-                documentation.
-            </xs:documentation>
-        </xs:annotation>
-      <xs:sequence>
-        <xs:element name="config-param" type="web:config-paramType" minOccurs="0" maxOccurs="unbounded"
/>
-      </xs:sequence>
-      <xs:attribute name="container" type="web:web-containerType" use="required" />
-    </xs:complexType>
 
     <xs:complexType name="web-appType">
         <xs:sequence>
             <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
 
             <xs:element name="context-root" type="xs:string" minOccurs="0"/>
-            <xs:element name="virtual-host" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>
-            <xs:element name="container-config" type="web:container-configType" minOccurs="0"
maxOccurs="unbounded"/>
+            <xs:element name="container-config" type="web:container-configType" minOccurs="0"/>
 
             <xs:sequence minOccurs="0">
                 <xs:element name="security-realm-name" type="xs:string"/>
                 <xs:element ref="security:security" minOccurs="0"/>
             </xs:sequence>
 
-            <!--xs:group ref="naming:jndiEnvironmentRefsGroup"/-->
+            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
 
-            <xs:element ref="naming:ejb-ref" minOccurs="0" maxOccurs="unbounded"/>
+         <!--   <xs:element ref="naming:ejb-ref" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="naming:ejb-local-ref" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="naming:service-ref" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="naming:resource-ref" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="naming:resource-env-ref" minOccurs="0" maxOccurs="unbounded"/>
-
+-->
             <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
 
         </xs:sequence>
@@ -105,11 +62,10 @@
         <xs:attribute name="parentId" type="xs:string" use="optional"/>
     </xs:complexType>
 
-    <xs:simpleType name="web-containerType">
-        <xs:restriction base="xs:string">
-            <xs:whiteSpace value="collapse"/>
-            <xs:enumeration value="Tomcat"/>
-            <xs:enumeration value="Jetty"/>
-        </xs:restriction>
-    </xs:simpleType>
+    <xs:complexType name="container-configType">
+        <xs:sequence>
+            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
 </xs:schema>



Mime
View raw message