Fix a bug where an interface could be added twice: once from the mdd, and once from some command line switch. BLD200303070100
authorcliffwd@netbeans.org
Thu, 06 Mar 2003 23:31:33 +0000
changeset 122825a9f7444a66
parent 1227 d5a6f0a02b08
child 1229 64dc9615c656
Fix a bug where an interface could be added twice: once from the mdd, and once from some command line switch.
Added some more tests: test the ability to set a type to boolean (using wrapper-class in the mdd), test the ability to use another bean graph (using wrapper-class in the mdd).
schema2beans/test/unit/src/TestMain.java
schema2beans/test/unit/src/data/TestBeanWrapper.java
schema2beans/test/unit/src/data/TestBeanWrapper.mdd
schema2beans/test/unit/src/data/TestBeanWrapper.xml
schema2beans/test/unit/src/data/TestNamespace.xsd
schema2beans/test/unit/src/data/TestWebApp.java
schema2beans/test/unit/src/data/TestWebApp.mdd
schema2beans/test/unit/src/data/goldenfiles/TestMain/testBeanWrapper.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testNamespace.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebApp.pass
     1.1 --- a/schema2beans/test/unit/src/TestMain.java	Wed Mar 05 16:56:40 2003 +0000
     1.2 +++ b/schema2beans/test/unit/src/TestMain.java	Thu Mar 06 23:31:33 2003 +0000
     1.3 @@ -109,7 +109,12 @@
     1.4      }
     1.5  
     1.6      public void testWebApp() throws IOException, Schema2BeansException, InterruptedException {
     1.7 -        generalTest("TestWebApp", true, true, true);
     1.8 +        GenBeans.Config config = new GenBeans.Config();
     1.9 +        config.setOutputType(GenBeans.Config.OUTPUT_JAVABEANS);
    1.10 +        config.setAttributesAsProperties(true);
    1.11 +        config.setGenerateCommonInterface("CommonBean");
    1.12 +        config.setRemoveUnreferencedNodes(true);
    1.13 +        generalTest("TestWebApp", true, config);
    1.14      }
    1.15  
    1.16      public void testWebAppDelegator() throws IOException, Schema2BeansException, InterruptedException {
    1.17 @@ -137,6 +142,60 @@
    1.18      public void testApplication1_4() throws IOException, Schema2BeansException, InterruptedException {
    1.19          generalTest("TestApplication1_4", true, true, true);
    1.20      }
    1.21 +
    1.22 +    public void testBeanWrapper() throws IOException, Schema2BeansException, InterruptedException {
    1.23 +        GenBeans.Config config = new GenBeans.Config();
    1.24 +        config.setOutputType(GenBeans.Config.OUTPUT_JAVABEANS);
    1.25 +        config.setAttributesAsProperties(true);
    1.26 +        config.setGenerateCommonInterface("CommonBean");
    1.27 +        config.setGenerateInterfaces(true);
    1.28 +        String testName = "TestBeanWrapper";
    1.29 +        try {
    1.30 +            System.out.println("Starting "+testName);
    1.31 +            File workDir = getWorkDir();
    1.32 +            config.setAuto(true);
    1.33 +            config.setStandalone(false);
    1.34 +            System.out.println("workDir="+workDir.toString());
    1.35 +            File schemaFile;
    1.36 +            schemaFile = new File(dataDir, "TestNamespace.xsd");
    1.37 +            InputStream dtdIn = new FileInputStream(schemaFile);
    1.38 +            config.setDTDIn(dtdIn);
    1.39 +            config.setInputURI(schemaFile.toString());
    1.40 +            InputStream mddIn = new FileInputStream(new File(dataDir, "TestBeanWrapper.mdd"));
    1.41 +            config.setMDDIn(mddIn);
    1.42 +            config.setSchemaType(GenBeans.Config.XML_SCHEMA);
    1.43 +            config.setRootDir(workDir.toString());
    1.44 +            File beanTreeFile = File.createTempFile("beanTree", "txt");
    1.45 +            config.setDumpBeanTree(beanTreeFile.getAbsolutePath());
    1.46 +            ref("Calling GenBeans.doIt");
    1.47 +            GenBeans.doIt(config);
    1.48 +
    1.49 +            ref("Bean Tree:");
    1.50 +            ref(beanTreeFile);
    1.51 +            beanTreeFile.delete();
    1.52 +            
    1.53 +            schemaFile = new File(dataDir, "simple.xsd");
    1.54 +            dtdIn = new FileInputStream(schemaFile);
    1.55 +            config.setDTDIn(dtdIn);
    1.56 +            config.setInputURI(schemaFile.toString());
    1.57 +            config.setMDDIn(null);
    1.58 +            ref("Calling GenBeans.doIt");
    1.59 +            GenBeans.doIt(config);
    1.60 +            ref("Compiling");
    1.61 +            String cmd = "javac -classpath "+workDir.toString()+":"+dataDir.toString()+":"+theClassPath+" "+dataDir.toString()+"/"+testName+".java";
    1.62 +            int result = runCommand(cmd);
    1.63 +            ref("Finished compiling: "+result);
    1.64 +
    1.65 +            cmd = "java -classpath "+workDir.toString()+":"+dataDir.toString()+":"+theClassPath+" "+testName+" "+dataDir.toString()+"/";
    1.66 +            result = runCommand(cmd);
    1.67 +            ref("Finished running "+testName+": "+result);
    1.68 +
    1.69 +            System.out.println("Finished.\n");
    1.70 +        } catch (Exception e) {
    1.71 +            ref(e.getMessage());
    1.72 +            e.printStackTrace();
    1.73 +        }
    1.74 +    }
    1.75      
    1.76      public void generalTest(String testName) throws IOException, Schema2BeansException, InterruptedException {
    1.77          generalTest(testName, false, false, false);
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/schema2beans/test/unit/src/data/TestBeanWrapper.java	Thu Mar 06 23:31:33 2003 +0000
     2.3 @@ -0,0 +1,56 @@
     2.4 +/*
     2.5 + *	TestBeanWrapper - test the basic features.
     2.6 + *
     2.7 + *	The following test assumes that we know the content of the
     2.8 + *	graph as we get elements, add and change them. Therefore, the TestBeanWrapper.xml
     2.9 + *	file and this java test should be kept in sync.
    2.10 + *
    2.11 + * 	Test the following:
    2.12 + *
    2.13 + *	single String: get/set/remove/set/get
    2.14 + *	boolean (from true): get/set true/get/set false/get/set true/get
    2.15 + *	boolean (from false): get/set false/get/set true/get/set false/get
    2.16 + *	String[]: get/set (null & !null)/add/remove
    2.17 + *	Bean: remove/set(null)/create bean and graph of beans/set/add
    2.18 + *
    2.19 + */
    2.20 +
    2.21 +import java.io.*;
    2.22 +import java.util.*;
    2.23 +import org.w3c.dom.*;
    2.24 +
    2.25 +import namespacesample.*;
    2.26 +
    2.27 +public class TestBeanWrapper extends BaseTest {
    2.28 +    public static void main(String[] argv) {
    2.29 +        TestBeanWrapper o = new TestBeanWrapper();
    2.30 +        if (argv.length > 0)
    2.31 +            o.setDocumentDir(argv[0]);
    2.32 +        try {
    2.33 +            o.run();
    2.34 +        } catch (Exception e) {
    2.35 +            e.printStackTrace();
    2.36 +            System.exit(1);
    2.37 +        }
    2.38 +        System.exit(0);
    2.39 +    }
    2.40 +    
    2.41 +    public void run() throws Exception {
    2.42 +        NamespaceSample ns;
    2.43 +
    2.44 +        this.readDocument();
    2.45 +
    2.46 +        out("creating the bean graph");
    2.47 +        ns = NamespaceSample.read(doc);
    2.48 +	
    2.49 +        //	Check that we can read the graph an it is complete
    2.50 +        out("bean graph created");
    2.51 +        ns.write(out);
    2.52 +
    2.53 +        out("Creating the simple.ConfigPropertyType");
    2.54 +        simple.ConfigPropertyType scpt = new simple.ConfigPropertyType();
    2.55 +        out("scpt is a "+scpt.getClass());
    2.56 +        ns.setSimpleConfigProperty(scpt);
    2.57 +        ns.write(out);
    2.58 +    }
    2.59 +}
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/schema2beans/test/unit/src/data/TestBeanWrapper.mdd	Thu Mar 06 23:31:33 2003 +0000
     3.3 @@ -0,0 +1,114 @@
     3.4 +<?xml version='1.0' encoding='UTF-8' ?>
     3.5 +<metaDD>
     3.6 +	<meta-element>
     3.7 +		<dtd-name>namespaceSample</dtd-name>
     3.8 +		<namespace>http://anything.org/extension</namespace>
     3.9 +		<bean-name>NamespaceSample</bean-name>
    3.10 +		<meta-property>
    3.11 +			<bean-name>Name</bean-name>
    3.12 +		</meta-property>
    3.13 +		<meta-property>
    3.14 +			<bean-name>ConfigProperty</bean-name>
    3.15 +		</meta-property>
    3.16 +		<meta-property>
    3.17 +			<bean-name>MoreInfo</bean-name>
    3.18 +		</meta-property>
    3.19 +		<implements>namespacesample.NamespaceSampleInterface, namespacesample.CommonBean</implements>
    3.20 +	</meta-element>
    3.21 +	<meta-element>
    3.22 +		<dtd-name>extTopLevelType</dtd-name>
    3.23 +		<namespace>http://anything.org/extension</namespace>
    3.24 +		<bean-name>ExtTopLevelType</bean-name>
    3.25 +		<meta-property>
    3.26 +			<bean-name>Name</bean-name>
    3.27 +		</meta-property>
    3.28 +		<meta-property>
    3.29 +			<bean-name>ConfigProperty</bean-name>
    3.30 +		</meta-property>
    3.31 +		<meta-property>
    3.32 +			<bean-name>MoreInfo</bean-name>
    3.33 +		</meta-property>
    3.34 +		<implements>namespacesample.ExtTopLevelTypeInterface, namespacesample.CommonBean</implements>
    3.35 +	</meta-element>
    3.36 +	<meta-element>
    3.37 +		<dtd-name>string</dtd-name>
    3.38 +		<namespace>http://www.w3.org/2001/XMLSchema</namespace>
    3.39 +		<bean-name>String</bean-name>
    3.40 +		<wrapper-class>java.lang.String</wrapper-class>
    3.41 +	</meta-element>
    3.42 +	<meta-element>
    3.43 +		<dtd-name>config-propertyType</dtd-name>
    3.44 +		<namespace>http://anything.org/extension</namespace>
    3.45 +		<bean-name>ConfigPropertyType</bean-name>
    3.46 +		<meta-property>
    3.47 +			<bean-name>ConfigPropertyName</bean-name>
    3.48 +		</meta-property>
    3.49 +		<meta-property>
    3.50 +			<bean-name>ConfigPropertyType</bean-name>
    3.51 +		</meta-property>
    3.52 +		<meta-property>
    3.53 +			<bean-name>Description</bean-name>
    3.54 +		</meta-property>
    3.55 +		<implements>namespacesample.ConfigPropertyTypeInterface, namespacesample.CommonBean</implements>
    3.56 +	</meta-element>
    3.57 +	<meta-element>
    3.58 +		<dtd-name>more-infoType</dtd-name>
    3.59 +		<namespace>http://anything.org/simple</namespace>
    3.60 +		<bean-name>MoreInfoType</bean-name>
    3.61 +		<meta-property>
    3.62 +			<bean-name>ConfigProperty</bean-name>
    3.63 +		</meta-property>
    3.64 +		<implements>namespacesample.MoreInfoTypeInterface, namespacesample.CommonBean</implements>
    3.65 +	</meta-element>
    3.66 +	<meta-element>
    3.67 +		<dtd-name>expanded-config-propertyType</dtd-name>
    3.68 +		<namespace>http://anything.org/simple</namespace>
    3.69 +		<bean-name>ExpandedConfigPropertyType</bean-name>
    3.70 +		<meta-property>
    3.71 +			<bean-name>ConfigPropertyName</bean-name>
    3.72 +		</meta-property>
    3.73 +		<meta-property>
    3.74 +			<bean-name>ConfigPropertyType</bean-name>
    3.75 +		</meta-property>
    3.76 +		<meta-property>
    3.77 +			<bean-name>ConfigPropertyValue</bean-name>
    3.78 +		</meta-property>
    3.79 +		<implements>namespacesample.ExpandedConfigPropertyTypeInterface, namespacesample.CommonBean</implements>
    3.80 +	</meta-element>
    3.81 +	<meta-element>
    3.82 +		<dtd-name>config-propertyType</dtd-name>
    3.83 +		<namespace>http://anything.org/simple</namespace>
    3.84 +		<bean-name>HttpAnythingOrgSimpleConfigPropertyType</bean-name>
    3.85 +		<wrapper-class>simple.ConfigPropertyType</wrapper-class>
    3.86 +	</meta-element>
    3.87 +	<meta-element>
    3.88 +		<dtd-name>topLevelType</dtd-name>
    3.89 +		<namespace>http://anything.org/simple</namespace>
    3.90 +		<bean-name>TopLevelType</bean-name>
    3.91 +		<meta-property>
    3.92 +			<bean-name>Name</bean-name>
    3.93 +		</meta-property>
    3.94 +		<meta-property>
    3.95 +			<bean-name>ConfigProperty</bean-name>
    3.96 +		</meta-property>
    3.97 +		<meta-property>
    3.98 +			<bean-name>MoreInfo</bean-name>
    3.99 +		</meta-property>
   3.100 +		<implements>namespacesample.TopLevelTypeInterface, namespacesample.CommonBean</implements>
   3.101 +	</meta-element>
   3.102 +	<meta-element>
   3.103 +		<dtd-name>simple</dtd-name>
   3.104 +		<namespace>http://anything.org/simple</namespace>
   3.105 +		<bean-name>Simple</bean-name>
   3.106 +		<meta-property>
   3.107 +			<bean-name>Name</bean-name>
   3.108 +		</meta-property>
   3.109 +		<meta-property>
   3.110 +			<bean-name>ConfigProperty</bean-name>
   3.111 +		</meta-property>
   3.112 +		<meta-property>
   3.113 +			<bean-name>MoreInfo</bean-name>
   3.114 +		</meta-property>
   3.115 +		<implements>namespacesample.SimpleInterface, namespacesample.CommonBean</implements>
   3.116 +	</meta-element>
   3.117 +</metaDD>
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/schema2beans/test/unit/src/data/TestBeanWrapper.xml	Thu Mar 06 23:31:33 2003 +0000
     4.3 @@ -0,0 +1,14 @@
     4.4 +<?xml version='1.0' encoding='UTF-8' ?>
     4.5 +<namespaceSample xmlns='http://anything.org/extension'>
     4.6 +	<name>Bean Wrapper test</name>
     4.7 +	<config-property>
     4.8 +		<config-property-type>int</config-property-type>
     4.9 +	</config-property>
    4.10 +  <more-info>
    4.11 +	<config-property>
    4.12 +	  <config-property-name>head</config-property-name>
    4.13 +	  <config-property-type>body part</config-property-type>
    4.14 +	  <config-property-value>on the door</config-property-value>
    4.15 +	</config-property>
    4.16 +  </more-info>
    4.17 +</namespaceSample>
     5.1 --- a/schema2beans/test/unit/src/data/TestNamespace.xsd	Wed Mar 05 16:56:40 2003 +0000
     5.2 +++ b/schema2beans/test/unit/src/data/TestNamespace.xsd	Thu Mar 06 23:31:33 2003 +0000
     5.3 @@ -30,6 +30,9 @@
     5.4                       maxOccurs="unbounded"/>
     5.5  
     5.6  	    <xsd:element name="more-info" type="sns:more-infoType"/>
     5.7 +
     5.8 +	  <xsd:element name="simple-config-property" type="sns:config-propertyType" minOccurs="0"/>
     5.9 +
    5.10      </xsd:sequence>
    5.11  </xsd:complexType>
    5.12  
     6.1 --- a/schema2beans/test/unit/src/data/TestWebApp.java	Wed Mar 05 16:56:40 2003 +0000
     6.2 +++ b/schema2beans/test/unit/src/data/TestWebApp.java	Thu Mar 06 23:31:33 2003 +0000
     6.3 @@ -47,5 +47,9 @@
     6.4          //	Check that we can read the graph an it is complete
     6.5          out("bean graph created");
     6.6          webApp.write(out);
     6.7 +
     6.8 +        out("Setting distributable to true");
     6.9 +        webApp.setDistributable(true);
    6.10 +        webApp.write(out);
    6.11      }
    6.12  }
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/schema2beans/test/unit/src/data/TestWebApp.mdd	Thu Mar 06 23:31:33 2003 +0000
     7.3 @@ -0,0 +1,936 @@
     7.4 +<?xml version='1.0' encoding='UTF-8' ?>
     7.5 +<metaDD>
     7.6 +	<meta-element>
     7.7 +		<dtd-name>web-app</dtd-name>
     7.8 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
     7.9 +		<bean-name>WebApp</bean-name>
    7.10 +		<meta-property>
    7.11 +			<bean-name>Description</bean-name>
    7.12 +		</meta-property>
    7.13 +		<meta-property>
    7.14 +			<bean-name>DisplayName</bean-name>
    7.15 +		</meta-property>
    7.16 +		<meta-property>
    7.17 +			<bean-name>Icon</bean-name>
    7.18 +		</meta-property>
    7.19 +		<meta-property>
    7.20 +			<bean-name>Distributable</bean-name>
    7.21 +		</meta-property>
    7.22 +		<meta-property>
    7.23 +			<bean-name>ContextParam</bean-name>
    7.24 +		</meta-property>
    7.25 +		<meta-property>
    7.26 +			<bean-name>Filter</bean-name>
    7.27 +		</meta-property>
    7.28 +		<meta-property>
    7.29 +			<bean-name>FilterMapping</bean-name>
    7.30 +		</meta-property>
    7.31 +		<meta-property>
    7.32 +			<bean-name>Listener</bean-name>
    7.33 +		</meta-property>
    7.34 +		<meta-property>
    7.35 +			<bean-name>Servlet</bean-name>
    7.36 +		</meta-property>
    7.37 +		<meta-property>
    7.38 +			<bean-name>ServletMapping</bean-name>
    7.39 +		</meta-property>
    7.40 +		<meta-property>
    7.41 +			<bean-name>SessionConfig</bean-name>
    7.42 +		</meta-property>
    7.43 +		<meta-property>
    7.44 +			<bean-name>MimeMapping</bean-name>
    7.45 +		</meta-property>
    7.46 +		<meta-property>
    7.47 +			<bean-name>WelcomeFileList</bean-name>
    7.48 +		</meta-property>
    7.49 +		<meta-property>
    7.50 +			<bean-name>ErrorPage</bean-name>
    7.51 +		</meta-property>
    7.52 +		<meta-property>
    7.53 +			<bean-name>JspConfig</bean-name>
    7.54 +		</meta-property>
    7.55 +		<meta-property>
    7.56 +			<bean-name>ResourceEnvRef</bean-name>
    7.57 +		</meta-property>
    7.58 +		<meta-property>
    7.59 +			<bean-name>MessageDestinationRef</bean-name>
    7.60 +		</meta-property>
    7.61 +		<meta-property>
    7.62 +			<bean-name>ResourceRef</bean-name>
    7.63 +		</meta-property>
    7.64 +		<meta-property>
    7.65 +			<bean-name>SecurityConstraint</bean-name>
    7.66 +		</meta-property>
    7.67 +		<meta-property>
    7.68 +			<bean-name>LoginConfig</bean-name>
    7.69 +		</meta-property>
    7.70 +		<meta-property>
    7.71 +			<bean-name>SecurityRole</bean-name>
    7.72 +		</meta-property>
    7.73 +		<meta-property>
    7.74 +			<bean-name>EnvEntry</bean-name>
    7.75 +		</meta-property>
    7.76 +		<meta-property>
    7.77 +			<bean-name>EjbRef</bean-name>
    7.78 +		</meta-property>
    7.79 +		<meta-property>
    7.80 +			<bean-name>EjbLocalRef</bean-name>
    7.81 +		</meta-property>
    7.82 +		<meta-property>
    7.83 +			<bean-name>MessageDestination</bean-name>
    7.84 +		</meta-property>
    7.85 +		<meta-property>
    7.86 +			<bean-name>LocaleEncodingMappingList</bean-name>
    7.87 +		</meta-property>
    7.88 +		<meta-property>
    7.89 +			<bean-name>DeploymentExtension</bean-name>
    7.90 +		</meta-property>
    7.91 +		<implements>webapp.CommonBean</implements>
    7.92 +	</meta-element>
    7.93 +	<meta-element>
    7.94 +		<dtd-name>web-appType</dtd-name>
    7.95 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
    7.96 +		<bean-name>WebAppType</bean-name>
    7.97 +		<meta-property>
    7.98 +			<bean-name>Description</bean-name>
    7.99 +		</meta-property>
   7.100 +		<meta-property>
   7.101 +			<bean-name>DisplayName</bean-name>
   7.102 +		</meta-property>
   7.103 +		<meta-property>
   7.104 +			<bean-name>Icon</bean-name>
   7.105 +		</meta-property>
   7.106 +		<meta-property>
   7.107 +			<bean-name>Distributable</bean-name>
   7.108 +		</meta-property>
   7.109 +		<meta-property>
   7.110 +			<bean-name>ContextParam</bean-name>
   7.111 +		</meta-property>
   7.112 +		<meta-property>
   7.113 +			<bean-name>Filter</bean-name>
   7.114 +		</meta-property>
   7.115 +		<meta-property>
   7.116 +			<bean-name>FilterMapping</bean-name>
   7.117 +		</meta-property>
   7.118 +		<meta-property>
   7.119 +			<bean-name>Listener</bean-name>
   7.120 +		</meta-property>
   7.121 +		<meta-property>
   7.122 +			<bean-name>Servlet</bean-name>
   7.123 +		</meta-property>
   7.124 +		<meta-property>
   7.125 +			<bean-name>ServletMapping</bean-name>
   7.126 +		</meta-property>
   7.127 +		<meta-property>
   7.128 +			<bean-name>SessionConfig</bean-name>
   7.129 +		</meta-property>
   7.130 +		<meta-property>
   7.131 +			<bean-name>MimeMapping</bean-name>
   7.132 +		</meta-property>
   7.133 +		<meta-property>
   7.134 +			<bean-name>WelcomeFileList</bean-name>
   7.135 +		</meta-property>
   7.136 +		<meta-property>
   7.137 +			<bean-name>ErrorPage</bean-name>
   7.138 +		</meta-property>
   7.139 +		<meta-property>
   7.140 +			<bean-name>JspConfig</bean-name>
   7.141 +		</meta-property>
   7.142 +		<meta-property>
   7.143 +			<bean-name>ResourceEnvRef</bean-name>
   7.144 +		</meta-property>
   7.145 +		<meta-property>
   7.146 +			<bean-name>MessageDestinationRef</bean-name>
   7.147 +		</meta-property>
   7.148 +		<meta-property>
   7.149 +			<bean-name>ResourceRef</bean-name>
   7.150 +		</meta-property>
   7.151 +		<meta-property>
   7.152 +			<bean-name>SecurityConstraint</bean-name>
   7.153 +		</meta-property>
   7.154 +		<meta-property>
   7.155 +			<bean-name>LoginConfig</bean-name>
   7.156 +		</meta-property>
   7.157 +		<meta-property>
   7.158 +			<bean-name>SecurityRole</bean-name>
   7.159 +		</meta-property>
   7.160 +		<meta-property>
   7.161 +			<bean-name>EnvEntry</bean-name>
   7.162 +		</meta-property>
   7.163 +		<meta-property>
   7.164 +			<bean-name>EjbRef</bean-name>
   7.165 +		</meta-property>
   7.166 +		<meta-property>
   7.167 +			<bean-name>EjbLocalRef</bean-name>
   7.168 +		</meta-property>
   7.169 +		<meta-property>
   7.170 +			<bean-name>MessageDestination</bean-name>
   7.171 +		</meta-property>
   7.172 +		<meta-property>
   7.173 +			<bean-name>LocaleEncodingMappingList</bean-name>
   7.174 +		</meta-property>
   7.175 +		<meta-property>
   7.176 +			<bean-name>DeploymentExtension</bean-name>
   7.177 +		</meta-property>
   7.178 +		<implements>webapp.CommonBean</implements>
   7.179 +	</meta-element>
   7.180 +	<meta-element>
   7.181 +		<dtd-name>descriptionType</dtd-name>
   7.182 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.183 +		<bean-name>DescriptionType</bean-name>
   7.184 +		<wrapper-class>java.lang.String</wrapper-class>
   7.185 +	</meta-element>
   7.186 +	<meta-element>
   7.187 +		<dtd-name>display-nameType</dtd-name>
   7.188 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.189 +		<bean-name>DisplayNameType</bean-name>
   7.190 +		<wrapper-class>java.lang.String</wrapper-class>
   7.191 +	</meta-element>
   7.192 +	<meta-element>
   7.193 +		<dtd-name>iconType</dtd-name>
   7.194 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.195 +		<bean-name>IconType</bean-name>
   7.196 +		<meta-property>
   7.197 +			<bean-name>SmallIcon</bean-name>
   7.198 +		</meta-property>
   7.199 +		<meta-property>
   7.200 +			<bean-name>LargeIcon</bean-name>
   7.201 +		</meta-property>
   7.202 +		<implements>webapp.CommonBean</implements>
   7.203 +	</meta-element>
   7.204 +	<meta-element>
   7.205 +		<dtd-name>emptyType</dtd-name>
   7.206 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.207 +		<bean-name>EmptyType</bean-name>
   7.208 +		<wrapper-class>boolean</wrapper-class>
   7.209 +	</meta-element>
   7.210 +	<meta-element>
   7.211 +		<dtd-name>param-valueType</dtd-name>
   7.212 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.213 +		<bean-name>ParamValueType</bean-name>
   7.214 +		<meta-property>
   7.215 +			<bean-name>Description</bean-name>
   7.216 +		</meta-property>
   7.217 +		<meta-property>
   7.218 +			<bean-name>ParamName</bean-name>
   7.219 +		</meta-property>
   7.220 +		<meta-property>
   7.221 +			<bean-name>ParamValue</bean-name>
   7.222 +		</meta-property>
   7.223 +		<implements>webapp.CommonBean</implements>
   7.224 +	</meta-element>
   7.225 +	<meta-element>
   7.226 +		<dtd-name>filterType</dtd-name>
   7.227 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.228 +		<bean-name>FilterType</bean-name>
   7.229 +		<meta-property>
   7.230 +			<bean-name>Description</bean-name>
   7.231 +		</meta-property>
   7.232 +		<meta-property>
   7.233 +			<bean-name>DisplayName</bean-name>
   7.234 +		</meta-property>
   7.235 +		<meta-property>
   7.236 +			<bean-name>Icon</bean-name>
   7.237 +		</meta-property>
   7.238 +		<meta-property>
   7.239 +			<bean-name>FilterName</bean-name>
   7.240 +		</meta-property>
   7.241 +		<meta-property>
   7.242 +			<bean-name>FilterClass</bean-name>
   7.243 +		</meta-property>
   7.244 +		<meta-property>
   7.245 +			<bean-name>InitParam</bean-name>
   7.246 +		</meta-property>
   7.247 +		<implements>webapp.CommonBean</implements>
   7.248 +	</meta-element>
   7.249 +	<meta-element>
   7.250 +		<dtd-name>filter-mappingType</dtd-name>
   7.251 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.252 +		<bean-name>FilterMappingType</bean-name>
   7.253 +		<meta-property>
   7.254 +			<bean-name>FilterName</bean-name>
   7.255 +		</meta-property>
   7.256 +		<meta-property>
   7.257 +			<bean-name>UrlPattern</bean-name>
   7.258 +		</meta-property>
   7.259 +		<meta-property>
   7.260 +			<bean-name>ServletName</bean-name>
   7.261 +		</meta-property>
   7.262 +		<meta-property>
   7.263 +			<bean-name>Dispatcher</bean-name>
   7.264 +		</meta-property>
   7.265 +		<implements>webapp.CommonBean</implements>
   7.266 +	</meta-element>
   7.267 +	<meta-element>
   7.268 +		<dtd-name>listenerType</dtd-name>
   7.269 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.270 +		<bean-name>ListenerType</bean-name>
   7.271 +		<meta-property>
   7.272 +			<bean-name>Description</bean-name>
   7.273 +		</meta-property>
   7.274 +		<meta-property>
   7.275 +			<bean-name>DisplayName</bean-name>
   7.276 +		</meta-property>
   7.277 +		<meta-property>
   7.278 +			<bean-name>Icon</bean-name>
   7.279 +		</meta-property>
   7.280 +		<meta-property>
   7.281 +			<bean-name>ListenerClass</bean-name>
   7.282 +		</meta-property>
   7.283 +		<implements>webapp.CommonBean</implements>
   7.284 +	</meta-element>
   7.285 +	<meta-element>
   7.286 +		<dtd-name>servletType</dtd-name>
   7.287 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.288 +		<bean-name>ServletType</bean-name>
   7.289 +		<meta-property>
   7.290 +			<bean-name>Description</bean-name>
   7.291 +		</meta-property>
   7.292 +		<meta-property>
   7.293 +			<bean-name>DisplayName</bean-name>
   7.294 +		</meta-property>
   7.295 +		<meta-property>
   7.296 +			<bean-name>Icon</bean-name>
   7.297 +		</meta-property>
   7.298 +		<meta-property>
   7.299 +			<bean-name>ServletName</bean-name>
   7.300 +		</meta-property>
   7.301 +		<meta-property>
   7.302 +			<bean-name>ServletClass</bean-name>
   7.303 +		</meta-property>
   7.304 +		<meta-property>
   7.305 +			<bean-name>JspFile</bean-name>
   7.306 +		</meta-property>
   7.307 +		<meta-property>
   7.308 +			<bean-name>InitParam</bean-name>
   7.309 +		</meta-property>
   7.310 +		<meta-property>
   7.311 +			<bean-name>LoadOnStartup</bean-name>
   7.312 +		</meta-property>
   7.313 +		<meta-property>
   7.314 +			<bean-name>RunAs</bean-name>
   7.315 +		</meta-property>
   7.316 +		<meta-property>
   7.317 +			<bean-name>SecurityRoleRef</bean-name>
   7.318 +		</meta-property>
   7.319 +		<meta-property>
   7.320 +			<bean-name>DeploymentExtension</bean-name>
   7.321 +		</meta-property>
   7.322 +		<implements>webapp.CommonBean</implements>
   7.323 +	</meta-element>
   7.324 +	<meta-element>
   7.325 +		<dtd-name>servlet-mappingType</dtd-name>
   7.326 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.327 +		<bean-name>ServletMappingType</bean-name>
   7.328 +		<meta-property>
   7.329 +			<bean-name>ServletName</bean-name>
   7.330 +		</meta-property>
   7.331 +		<meta-property>
   7.332 +			<bean-name>UrlPattern</bean-name>
   7.333 +		</meta-property>
   7.334 +		<implements>webapp.CommonBean</implements>
   7.335 +	</meta-element>
   7.336 +	<meta-element>
   7.337 +		<dtd-name>session-configType</dtd-name>
   7.338 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.339 +		<bean-name>SessionConfigType</bean-name>
   7.340 +		<meta-property>
   7.341 +			<bean-name>SessionTimeout</bean-name>
   7.342 +		</meta-property>
   7.343 +		<implements>java.lang.Cloneable, webapp.CommonBean</implements>
   7.344 +	</meta-element>
   7.345 +	<meta-element>
   7.346 +		<dtd-name>mime-mappingType</dtd-name>
   7.347 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.348 +		<bean-name>MimeMappingType</bean-name>
   7.349 +		<meta-property>
   7.350 +			<bean-name>Extension</bean-name>
   7.351 +		</meta-property>
   7.352 +		<meta-property>
   7.353 +			<bean-name>MimeType</bean-name>
   7.354 +		</meta-property>
   7.355 +		<implements>webapp.CommonBean</implements>
   7.356 +	</meta-element>
   7.357 +	<meta-element>
   7.358 +		<dtd-name>welcome-file-listType</dtd-name>
   7.359 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.360 +		<bean-name>WelcomeFileListType</bean-name>
   7.361 +		<meta-property>
   7.362 +			<bean-name>WelcomeFile</bean-name>
   7.363 +		</meta-property>
   7.364 +		<implements>webapp.CommonBean</implements>
   7.365 +	</meta-element>
   7.366 +	<meta-element>
   7.367 +		<dtd-name>error-pageType</dtd-name>
   7.368 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.369 +		<bean-name>ErrorPageType</bean-name>
   7.370 +		<meta-property>
   7.371 +			<bean-name>ErrorCode</bean-name>
   7.372 +		</meta-property>
   7.373 +		<meta-property>
   7.374 +			<bean-name>ExceptionType</bean-name>
   7.375 +		</meta-property>
   7.376 +		<meta-property>
   7.377 +			<bean-name>Location</bean-name>
   7.378 +		</meta-property>
   7.379 +		<implements>webapp.CommonBean</implements>
   7.380 +	</meta-element>
   7.381 +	<meta-element>
   7.382 +		<dtd-name>jsp-configType</dtd-name>
   7.383 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.384 +		<bean-name>JspConfigType</bean-name>
   7.385 +		<meta-property>
   7.386 +			<bean-name>Taglib</bean-name>
   7.387 +		</meta-property>
   7.388 +		<meta-property>
   7.389 +			<bean-name>JspPropertyGroup</bean-name>
   7.390 +		</meta-property>
   7.391 +		<implements>webapp.CommonBean</implements>
   7.392 +	</meta-element>
   7.393 +	<meta-element>
   7.394 +		<dtd-name>resource-env-refType</dtd-name>
   7.395 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.396 +		<bean-name>ResourceEnvRefType</bean-name>
   7.397 +		<meta-property>
   7.398 +			<bean-name>Description</bean-name>
   7.399 +		</meta-property>
   7.400 +		<meta-property>
   7.401 +			<bean-name>ResourceEnvRefName</bean-name>
   7.402 +		</meta-property>
   7.403 +		<meta-property>
   7.404 +			<bean-name>ResourceEnvRefType</bean-name>
   7.405 +		</meta-property>
   7.406 +		<implements>webapp.CommonBean</implements>
   7.407 +	</meta-element>
   7.408 +	<meta-element>
   7.409 +		<dtd-name>message-destination-refType</dtd-name>
   7.410 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.411 +		<bean-name>MessageDestinationRefType</bean-name>
   7.412 +		<meta-property>
   7.413 +			<bean-name>Description</bean-name>
   7.414 +		</meta-property>
   7.415 +		<meta-property>
   7.416 +			<bean-name>MessageDestinationRefName</bean-name>
   7.417 +		</meta-property>
   7.418 +		<meta-property>
   7.419 +			<bean-name>MessageDestinationType</bean-name>
   7.420 +		</meta-property>
   7.421 +		<meta-property>
   7.422 +			<bean-name>MessageDestinationUsage</bean-name>
   7.423 +		</meta-property>
   7.424 +		<meta-property>
   7.425 +			<bean-name>MessageDestinationLink</bean-name>
   7.426 +		</meta-property>
   7.427 +		<implements>webapp.CommonBean</implements>
   7.428 +	</meta-element>
   7.429 +	<meta-element>
   7.430 +		<dtd-name>resource-refType</dtd-name>
   7.431 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.432 +		<bean-name>ResourceRefType</bean-name>
   7.433 +		<meta-property>
   7.434 +			<bean-name>Description</bean-name>
   7.435 +		</meta-property>
   7.436 +		<meta-property>
   7.437 +			<bean-name>ResRefName</bean-name>
   7.438 +		</meta-property>
   7.439 +		<meta-property>
   7.440 +			<bean-name>ResType</bean-name>
   7.441 +		</meta-property>
   7.442 +		<meta-property>
   7.443 +			<bean-name>ResAuth</bean-name>
   7.444 +		</meta-property>
   7.445 +		<meta-property>
   7.446 +			<bean-name>ResSharingScope</bean-name>
   7.447 +		</meta-property>
   7.448 +		<implements>webapp.CommonBean</implements>
   7.449 +	</meta-element>
   7.450 +	<meta-element>
   7.451 +		<dtd-name>security-constraintType</dtd-name>
   7.452 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.453 +		<bean-name>SecurityConstraintType</bean-name>
   7.454 +		<meta-property>
   7.455 +			<bean-name>DisplayName</bean-name>
   7.456 +		</meta-property>
   7.457 +		<meta-property>
   7.458 +			<bean-name>WebResourceCollection</bean-name>
   7.459 +		</meta-property>
   7.460 +		<meta-property>
   7.461 +			<bean-name>AuthConstraint</bean-name>
   7.462 +		</meta-property>
   7.463 +		<meta-property>
   7.464 +			<bean-name>UserDataConstraint</bean-name>
   7.465 +		</meta-property>
   7.466 +		<implements>webapp.CommonBean</implements>
   7.467 +	</meta-element>
   7.468 +	<meta-element>
   7.469 +		<dtd-name>login-configType</dtd-name>
   7.470 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.471 +		<bean-name>LoginConfigType</bean-name>
   7.472 +		<meta-property>
   7.473 +			<bean-name>AuthMethod</bean-name>
   7.474 +		</meta-property>
   7.475 +		<meta-property>
   7.476 +			<bean-name>RealmName</bean-name>
   7.477 +		</meta-property>
   7.478 +		<meta-property>
   7.479 +			<bean-name>FormLoginConfig</bean-name>
   7.480 +		</meta-property>
   7.481 +		<implements>webapp.CommonBean</implements>
   7.482 +	</meta-element>
   7.483 +	<meta-element>
   7.484 +		<dtd-name>security-roleType</dtd-name>
   7.485 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.486 +		<bean-name>SecurityRoleType</bean-name>
   7.487 +		<meta-property>
   7.488 +			<bean-name>Description</bean-name>
   7.489 +		</meta-property>
   7.490 +		<meta-property>
   7.491 +			<bean-name>RoleName</bean-name>
   7.492 +		</meta-property>
   7.493 +		<implements>webapp.CommonBean</implements>
   7.494 +	</meta-element>
   7.495 +	<meta-element>
   7.496 +		<dtd-name>env-entryType</dtd-name>
   7.497 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.498 +		<bean-name>EnvEntryType</bean-name>
   7.499 +		<meta-property>
   7.500 +			<bean-name>Description</bean-name>
   7.501 +		</meta-property>
   7.502 +		<meta-property>
   7.503 +			<bean-name>EnvEntryName</bean-name>
   7.504 +		</meta-property>
   7.505 +		<meta-property>
   7.506 +			<bean-name>EnvEntryType</bean-name>
   7.507 +		</meta-property>
   7.508 +		<meta-property>
   7.509 +			<bean-name>EnvEntryValue</bean-name>
   7.510 +		</meta-property>
   7.511 +		<implements>webapp.CommonBean</implements>
   7.512 +	</meta-element>
   7.513 +	<meta-element>
   7.514 +		<dtd-name>ejb-refType</dtd-name>
   7.515 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.516 +		<bean-name>EjbRefType</bean-name>
   7.517 +		<meta-property>
   7.518 +			<bean-name>Description</bean-name>
   7.519 +		</meta-property>
   7.520 +		<meta-property>
   7.521 +			<bean-name>EjbRefName</bean-name>
   7.522 +		</meta-property>
   7.523 +		<meta-property>
   7.524 +			<bean-name>EjbRefType</bean-name>
   7.525 +		</meta-property>
   7.526 +		<meta-property>
   7.527 +			<bean-name>Home</bean-name>
   7.528 +		</meta-property>
   7.529 +		<meta-property>
   7.530 +			<bean-name>Remote</bean-name>
   7.531 +		</meta-property>
   7.532 +		<meta-property>
   7.533 +			<bean-name>EjbLink</bean-name>
   7.534 +		</meta-property>
   7.535 +		<implements>webapp.CommonBean</implements>
   7.536 +	</meta-element>
   7.537 +	<meta-element>
   7.538 +		<dtd-name>ejb-local-refType</dtd-name>
   7.539 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.540 +		<bean-name>EjbLocalRefType</bean-name>
   7.541 +		<meta-property>
   7.542 +			<bean-name>Description</bean-name>
   7.543 +		</meta-property>
   7.544 +		<meta-property>
   7.545 +			<bean-name>EjbRefName</bean-name>
   7.546 +		</meta-property>
   7.547 +		<meta-property>
   7.548 +			<bean-name>EjbRefType</bean-name>
   7.549 +		</meta-property>
   7.550 +		<meta-property>
   7.551 +			<bean-name>LocalHome</bean-name>
   7.552 +		</meta-property>
   7.553 +		<meta-property>
   7.554 +			<bean-name>Local</bean-name>
   7.555 +		</meta-property>
   7.556 +		<meta-property>
   7.557 +			<bean-name>EjbLink</bean-name>
   7.558 +		</meta-property>
   7.559 +		<implements>webapp.CommonBean</implements>
   7.560 +	</meta-element>
   7.561 +	<meta-element>
   7.562 +		<dtd-name>message-destinationType</dtd-name>
   7.563 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.564 +		<bean-name>MessageDestinationType</bean-name>
   7.565 +		<meta-property>
   7.566 +			<bean-name>Description</bean-name>
   7.567 +		</meta-property>
   7.568 +		<meta-property>
   7.569 +			<bean-name>DisplayName</bean-name>
   7.570 +		</meta-property>
   7.571 +		<meta-property>
   7.572 +			<bean-name>Icon</bean-name>
   7.573 +		</meta-property>
   7.574 +		<meta-property>
   7.575 +			<bean-name>MessageDestinationName</bean-name>
   7.576 +		</meta-property>
   7.577 +		<implements>webapp.CommonBean</implements>
   7.578 +	</meta-element>
   7.579 +	<meta-element>
   7.580 +		<dtd-name>locale-encoding-mapping-listType</dtd-name>
   7.581 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.582 +		<bean-name>LocaleEncodingMappingListType</bean-name>
   7.583 +		<meta-property>
   7.584 +			<bean-name>LocaleEncodingMapping</bean-name>
   7.585 +		</meta-property>
   7.586 +		<implements>webapp.CommonBean</implements>
   7.587 +	</meta-element>
   7.588 +	<meta-element>
   7.589 +		<dtd-name>deployment-extensionType</dtd-name>
   7.590 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.591 +		<bean-name>DeploymentExtensionType</bean-name>
   7.592 +		<meta-property>
   7.593 +			<bean-name>ExtensionElement</bean-name>
   7.594 +		</meta-property>
   7.595 +		<implements>webapp.CommonBean</implements>
   7.596 +	</meta-element>
   7.597 +	<meta-element>
   7.598 +		<dtd-name>extensibleType</dtd-name>
   7.599 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.600 +		<bean-name>ExtensibleType</bean-name>
   7.601 +		<implements>webapp.CommonBean</implements>
   7.602 +	</meta-element>
   7.603 +	<meta-element>
   7.604 +		<dtd-name>locale-encoding-mappingType</dtd-name>
   7.605 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.606 +		<bean-name>LocaleEncodingMappingType</bean-name>
   7.607 +		<meta-property>
   7.608 +			<bean-name>Locale</bean-name>
   7.609 +		</meta-property>
   7.610 +		<meta-property>
   7.611 +			<bean-name>Encoding</bean-name>
   7.612 +		</meta-property>
   7.613 +		<implements>webapp.CommonBean</implements>
   7.614 +	</meta-element>
   7.615 +	<meta-element>
   7.616 +		<dtd-name>string</dtd-name>
   7.617 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.618 +		<bean-name>String</bean-name>
   7.619 +		<wrapper-class>java.lang.String</wrapper-class>
   7.620 +	</meta-element>
   7.621 +	<meta-element>
   7.622 +		<dtd-name>ejb-ref-nameType</dtd-name>
   7.623 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.624 +		<bean-name>EjbRefNameType</bean-name>
   7.625 +		<wrapper-class>java.lang.String</wrapper-class>
   7.626 +	</meta-element>
   7.627 +	<meta-element>
   7.628 +		<dtd-name>ejb-ref-typeType</dtd-name>
   7.629 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.630 +		<bean-name>EjbRefTypeType</bean-name>
   7.631 +		<wrapper-class>java.lang.String</wrapper-class>
   7.632 +	</meta-element>
   7.633 +	<meta-element>
   7.634 +		<dtd-name>local-homeType</dtd-name>
   7.635 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.636 +		<bean-name>LocalHomeType</bean-name>
   7.637 +		<wrapper-class>java.lang.String</wrapper-class>
   7.638 +	</meta-element>
   7.639 +	<meta-element>
   7.640 +		<dtd-name>localType</dtd-name>
   7.641 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.642 +		<bean-name>LocalType</bean-name>
   7.643 +		<wrapper-class>java.lang.String</wrapper-class>
   7.644 +	</meta-element>
   7.645 +	<meta-element>
   7.646 +		<dtd-name>ejb-linkType</dtd-name>
   7.647 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.648 +		<bean-name>EjbLinkType</bean-name>
   7.649 +		<wrapper-class>java.lang.String</wrapper-class>
   7.650 +	</meta-element>
   7.651 +	<meta-element>
   7.652 +		<dtd-name>homeType</dtd-name>
   7.653 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.654 +		<bean-name>HomeType</bean-name>
   7.655 +		<wrapper-class>java.lang.String</wrapper-class>
   7.656 +	</meta-element>
   7.657 +	<meta-element>
   7.658 +		<dtd-name>remoteType</dtd-name>
   7.659 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.660 +		<bean-name>RemoteType</bean-name>
   7.661 +		<wrapper-class>java.lang.String</wrapper-class>
   7.662 +	</meta-element>
   7.663 +	<meta-element>
   7.664 +		<dtd-name>jndi-nameType</dtd-name>
   7.665 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.666 +		<bean-name>JndiNameType</bean-name>
   7.667 +		<wrapper-class>java.lang.String</wrapper-class>
   7.668 +	</meta-element>
   7.669 +	<meta-element>
   7.670 +		<dtd-name>env-entry-type-valuesType</dtd-name>
   7.671 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.672 +		<bean-name>EnvEntryTypeValuesType</bean-name>
   7.673 +		<wrapper-class>java.lang.String</wrapper-class>
   7.674 +	</meta-element>
   7.675 +	<meta-element>
   7.676 +		<dtd-name>string</dtd-name>
   7.677 +		<namespace>http://www.w3.org/2001/XMLSchema</namespace>
   7.678 +		<bean-name>String</bean-name>
   7.679 +		<wrapper-class>java.lang.String</wrapper-class>
   7.680 +	</meta-element>
   7.681 +	<meta-element>
   7.682 +		<dtd-name>role-nameType</dtd-name>
   7.683 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.684 +		<bean-name>RoleNameType</bean-name>
   7.685 +		<wrapper-class>java.lang.String</wrapper-class>
   7.686 +	</meta-element>
   7.687 +	<meta-element>
   7.688 +		<dtd-name>auth-methodType</dtd-name>
   7.689 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.690 +		<bean-name>AuthMethodType</bean-name>
   7.691 +		<wrapper-class>java.lang.String</wrapper-class>
   7.692 +	</meta-element>
   7.693 +	<meta-element>
   7.694 +		<dtd-name>form-login-configType</dtd-name>
   7.695 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.696 +		<bean-name>FormLoginConfigType</bean-name>
   7.697 +		<meta-property>
   7.698 +			<bean-name>FormLoginPage</bean-name>
   7.699 +		</meta-property>
   7.700 +		<meta-property>
   7.701 +			<bean-name>FormErrorPage</bean-name>
   7.702 +		</meta-property>
   7.703 +		<implements>webapp.CommonBean</implements>
   7.704 +	</meta-element>
   7.705 +	<meta-element>
   7.706 +		<dtd-name>war-pathType</dtd-name>
   7.707 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.708 +		<bean-name>WarPathType</bean-name>
   7.709 +		<wrapper-class>java.lang.String</wrapper-class>
   7.710 +	</meta-element>
   7.711 +	<meta-element>
   7.712 +		<dtd-name>web-resource-collectionType</dtd-name>
   7.713 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.714 +		<bean-name>WebResourceCollectionType</bean-name>
   7.715 +		<meta-property>
   7.716 +			<bean-name>WebResourceName</bean-name>
   7.717 +		</meta-property>
   7.718 +		<meta-property>
   7.719 +			<bean-name>Description</bean-name>
   7.720 +		</meta-property>
   7.721 +		<meta-property>
   7.722 +			<bean-name>UrlPattern</bean-name>
   7.723 +		</meta-property>
   7.724 +		<meta-property>
   7.725 +			<bean-name>HttpMethod</bean-name>
   7.726 +		</meta-property>
   7.727 +		<implements>webapp.CommonBean</implements>
   7.728 +	</meta-element>
   7.729 +	<meta-element>
   7.730 +		<dtd-name>auth-constraintType</dtd-name>
   7.731 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.732 +		<bean-name>AuthConstraintType</bean-name>
   7.733 +		<meta-property>
   7.734 +			<bean-name>Description</bean-name>
   7.735 +		</meta-property>
   7.736 +		<meta-property>
   7.737 +			<bean-name>RoleName</bean-name>
   7.738 +		</meta-property>
   7.739 +		<implements>webapp.CommonBean</implements>
   7.740 +	</meta-element>
   7.741 +	<meta-element>
   7.742 +		<dtd-name>user-data-constraintType</dtd-name>
   7.743 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.744 +		<bean-name>UserDataConstraintType</bean-name>
   7.745 +		<meta-property>
   7.746 +			<bean-name>Description</bean-name>
   7.747 +		</meta-property>
   7.748 +		<meta-property>
   7.749 +			<bean-name>TransportGuarantee</bean-name>
   7.750 +		</meta-property>
   7.751 +		<implements>webapp.CommonBean</implements>
   7.752 +	</meta-element>
   7.753 +	<meta-element>
   7.754 +		<dtd-name>transport-guaranteeType</dtd-name>
   7.755 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.756 +		<bean-name>TransportGuaranteeType</bean-name>
   7.757 +		<wrapper-class>java.lang.String</wrapper-class>
   7.758 +	</meta-element>
   7.759 +	<meta-element>
   7.760 +		<dtd-name>url-patternType</dtd-name>
   7.761 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.762 +		<bean-name>UrlPatternType</bean-name>
   7.763 +		<wrapper-class>java.lang.String</wrapper-class>
   7.764 +	</meta-element>
   7.765 +	<meta-element>
   7.766 +		<dtd-name>http-methodType</dtd-name>
   7.767 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.768 +		<bean-name>HttpMethodType</bean-name>
   7.769 +		<wrapper-class>java.lang.String</wrapper-class>
   7.770 +	</meta-element>
   7.771 +	<meta-element>
   7.772 +		<dtd-name>fully-qualified-classType</dtd-name>
   7.773 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.774 +		<bean-name>FullyQualifiedClassType</bean-name>
   7.775 +		<wrapper-class>java.lang.String</wrapper-class>
   7.776 +	</meta-element>
   7.777 +	<meta-element>
   7.778 +		<dtd-name>res-authType</dtd-name>
   7.779 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.780 +		<bean-name>ResAuthType</bean-name>
   7.781 +		<wrapper-class>java.lang.String</wrapper-class>
   7.782 +	</meta-element>
   7.783 +	<meta-element>
   7.784 +		<dtd-name>res-sharing-scopeType</dtd-name>
   7.785 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.786 +		<bean-name>ResSharingScopeType</bean-name>
   7.787 +		<wrapper-class>java.lang.String</wrapper-class>
   7.788 +	</meta-element>
   7.789 +	<meta-element>
   7.790 +		<dtd-name>message-destination-typeType</dtd-name>
   7.791 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.792 +		<bean-name>MessageDestinationTypeType</bean-name>
   7.793 +		<wrapper-class>java.lang.String</wrapper-class>
   7.794 +	</meta-element>
   7.795 +	<meta-element>
   7.796 +		<dtd-name>message-destination-usageType</dtd-name>
   7.797 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.798 +		<bean-name>MessageDestinationUsageType</bean-name>
   7.799 +		<wrapper-class>java.lang.String</wrapper-class>
   7.800 +	</meta-element>
   7.801 +	<meta-element>
   7.802 +		<dtd-name>message-destination-linkType</dtd-name>
   7.803 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.804 +		<bean-name>MessageDestinationLinkType</bean-name>
   7.805 +		<wrapper-class>java.lang.String</wrapper-class>
   7.806 +	</meta-element>
   7.807 +	<meta-element>
   7.808 +		<dtd-name>taglibType</dtd-name>
   7.809 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.810 +		<bean-name>TaglibType</bean-name>
   7.811 +		<meta-property>
   7.812 +			<bean-name>TaglibUri</bean-name>
   7.813 +		</meta-property>
   7.814 +		<meta-property>
   7.815 +			<bean-name>TaglibLocation</bean-name>
   7.816 +		</meta-property>
   7.817 +		<implements>webapp.CommonBean</implements>
   7.818 +	</meta-element>
   7.819 +	<meta-element>
   7.820 +		<dtd-name>jsp-property-groupType</dtd-name>
   7.821 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.822 +		<bean-name>JspPropertyGroupType</bean-name>
   7.823 +		<meta-property>
   7.824 +			<bean-name>Description</bean-name>
   7.825 +		</meta-property>
   7.826 +		<meta-property>
   7.827 +			<bean-name>DisplayName</bean-name>
   7.828 +		</meta-property>
   7.829 +		<meta-property>
   7.830 +			<bean-name>UrlPattern</bean-name>
   7.831 +		</meta-property>
   7.832 +		<meta-property>
   7.833 +			<bean-name>ElEnabled</bean-name>
   7.834 +		</meta-property>
   7.835 +		<meta-property>
   7.836 +			<bean-name>PageEncoding</bean-name>
   7.837 +		</meta-property>
   7.838 +		<meta-property>
   7.839 +			<bean-name>ScriptingEnabled</bean-name>
   7.840 +		</meta-property>
   7.841 +		<meta-property>
   7.842 +			<bean-name>IsXml</bean-name>
   7.843 +		</meta-property>
   7.844 +		<meta-property>
   7.845 +			<bean-name>IncludePrelude</bean-name>
   7.846 +		</meta-property>
   7.847 +		<meta-property>
   7.848 +			<bean-name>IncludeCoda</bean-name>
   7.849 +		</meta-property>
   7.850 +		<implements>webapp.CommonBean</implements>
   7.851 +	</meta-element>
   7.852 +	<meta-element>
   7.853 +		<dtd-name>true-falseType</dtd-name>
   7.854 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.855 +		<bean-name>TrueFalseType</bean-name>
   7.856 +		<wrapper-class>boolean</wrapper-class>
   7.857 +	</meta-element>
   7.858 +	<meta-element>
   7.859 +		<dtd-name>pathType</dtd-name>
   7.860 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.861 +		<bean-name>PathType</bean-name>
   7.862 +		<wrapper-class>java.lang.String</wrapper-class>
   7.863 +	</meta-element>
   7.864 +	<meta-element>
   7.865 +		<dtd-name>error-codeType</dtd-name>
   7.866 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.867 +		<bean-name>ErrorCodeType</bean-name>
   7.868 +		<wrapper-class>long</wrapper-class>
   7.869 +	</meta-element>
   7.870 +	<meta-element>
   7.871 +		<dtd-name>mime-typeType</dtd-name>
   7.872 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.873 +		<bean-name>MimeTypeType</bean-name>
   7.874 +		<wrapper-class>java.lang.String</wrapper-class>
   7.875 +	</meta-element>
   7.876 +	<meta-element>
   7.877 +		<dtd-name>nonNegativeInteger</dtd-name>
   7.878 +		<namespace>http://www.w3.org/2001/XMLSchema</namespace>
   7.879 +		<bean-name>NonNegativeInteger</bean-name>
   7.880 +		<wrapper-class>long</wrapper-class>
   7.881 +	</meta-element>
   7.882 +	<meta-element>
   7.883 +		<dtd-name>servlet-nameType</dtd-name>
   7.884 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.885 +		<bean-name>ServletNameType</bean-name>
   7.886 +		<wrapper-class>java.lang.String</wrapper-class>
   7.887 +	</meta-element>
   7.888 +	<meta-element>
   7.889 +		<dtd-name>integer</dtd-name>
   7.890 +		<namespace>http://www.w3.org/2001/XMLSchema</namespace>
   7.891 +		<bean-name>Integer</bean-name>
   7.892 +		<wrapper-class>java.math.BigInteger</wrapper-class>
   7.893 +	</meta-element>
   7.894 +	<meta-element>
   7.895 +		<dtd-name>run-asType</dtd-name>
   7.896 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.897 +		<bean-name>RunAsType</bean-name>
   7.898 +		<meta-property>
   7.899 +			<bean-name>Description</bean-name>
   7.900 +		</meta-property>
   7.901 +		<meta-property>
   7.902 +			<bean-name>RoleName</bean-name>
   7.903 +		</meta-property>
   7.904 +		<implements>webapp.CommonBean</implements>
   7.905 +	</meta-element>
   7.906 +	<meta-element>
   7.907 +		<dtd-name>security-role-refType</dtd-name>
   7.908 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.909 +		<bean-name>SecurityRoleRefType</bean-name>
   7.910 +		<meta-property>
   7.911 +			<bean-name>Description</bean-name>
   7.912 +		</meta-property>
   7.913 +		<meta-property>
   7.914 +			<bean-name>RoleName</bean-name>
   7.915 +		</meta-property>
   7.916 +		<meta-property>
   7.917 +			<bean-name>RoleLink</bean-name>
   7.918 +		</meta-property>
   7.919 +		<implements>webapp.CommonBean</implements>
   7.920 +	</meta-element>
   7.921 +	<meta-element>
   7.922 +		<dtd-name>jsp-fileType</dtd-name>
   7.923 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.924 +		<bean-name>JspFileType</bean-name>
   7.925 +		<wrapper-class>java.lang.String</wrapper-class>
   7.926 +	</meta-element>
   7.927 +	<meta-element>
   7.928 +		<dtd-name>filter-nameType</dtd-name>
   7.929 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.930 +		<bean-name>FilterNameType</bean-name>
   7.931 +		<wrapper-class>java.lang.String</wrapper-class>
   7.932 +	</meta-element>
   7.933 +	<meta-element>
   7.934 +		<dtd-name>dispatcherType</dtd-name>
   7.935 +		<namespace>http://java.sun.com/xml/ns/j2ee</namespace>
   7.936 +		<bean-name>DispatcherType</bean-name>
   7.937 +		<wrapper-class>java.lang.String</wrapper-class>
   7.938 +	</meta-element>
   7.939 +</metaDD>
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBeanWrapper.pass	Thu Mar 06 23:31:33 2003 +0000
     8.3 @@ -0,0 +1,60 @@
     8.4 +Calling GenBeans.doIt
     8.5 +Bean Tree:
     8.6 +namespaceSample : NamespaceSample
     8.7 +	name : java.lang.String
     8.8 +	config-property : ConfigPropertyType[1,n]
     8.9 +		config-property-name : java.lang.String
    8.10 +		config-property-type : java.lang.String
    8.11 +		description : java.lang.String?
    8.12 +	more-info : MoreInfoType
    8.13 +		config-property : ExpandedConfigPropertyType[1,n]
    8.14 +			config-property-name : java.lang.String
    8.15 +			config-property-type : java.lang.String
    8.16 +			config-property-value : java.lang.String
    8.17 +	simple-config-property : simple.ConfigPropertyType?
    8.18 +		config-property-name : java.lang.String
    8.19 +		config-property-type : java.lang.String
    8.20 +
    8.21 +Calling GenBeans.doIt
    8.22 +Compiling
    8.23 +Finished compiling: 0
    8.24 +out: TestBeanWrapper - creating the DOM document
    8.25 +out: TestBeanWrapper - creating the bean graph
    8.26 +out: TestBeanWrapper - bean graph created
    8.27 +out: <?xml version='1.0' encoding='UTF-8' ?>
    8.28 +out: <namespaceSample xmlns='http://anything.org/extension'>
    8.29 +out: 	<name>Bean Wrapper test</name>
    8.30 +out: 	<config-property>
    8.31 +out: 		<config-property-name></config-property-name>
    8.32 +out: 		<config-property-type>int</config-property-type>
    8.33 +out: 	</config-property>
    8.34 +out: 	<more-info>
    8.35 +out: 		<config-property>
    8.36 +out: 			<config-property-name>head</config-property-name>
    8.37 +out: 			<config-property-type>body part</config-property-type>
    8.38 +out: 			<config-property-value>on the door</config-property-value>
    8.39 +out: 		</config-property>
    8.40 +out: 	</more-info>
    8.41 +out: </namespaceSample>
    8.42 +out: TestBeanWrapper - Creating the simple.ConfigPropertyType
    8.43 +out: TestBeanWrapper - scpt is a class simple.ConfigPropertyType
    8.44 +out: <?xml version='1.0' encoding='UTF-8' ?>
    8.45 +out: <namespaceSample xmlns='http://anything.org/extension'>
    8.46 +out: 	<name>Bean Wrapper test</name>
    8.47 +out: 	<config-property>
    8.48 +out: 		<config-property-name></config-property-name>
    8.49 +out: 		<config-property-type>int</config-property-type>
    8.50 +out: 	</config-property>
    8.51 +out: 	<more-info>
    8.52 +out: 		<config-property>
    8.53 +out: 			<config-property-name>head</config-property-name>
    8.54 +out: 			<config-property-type>body part</config-property-type>
    8.55 +out: 			<config-property-value>on the door</config-property-value>
    8.56 +out: 		</config-property>
    8.57 +out: 	</more-info>
    8.58 +out: 	<simple-config-property>
    8.59 +out: 		<config-property-name></config-property-name>
    8.60 +out: 		<config-property-type></config-property-type>
    8.61 +out: 	</simple-config-property>
    8.62 +out: </namespaceSample>
    8.63 +Finished running TestBeanWrapper: 0
     9.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testNamespace.pass	Wed Mar 05 16:56:40 2003 +0000
     9.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testNamespace.pass	Thu Mar 06 23:31:33 2003 +0000
     9.3 @@ -11,6 +11,9 @@
     9.4  			config-property-name : java.lang.String
     9.5  			config-property-type : java.lang.String
     9.6  			config-property-value : java.lang.String
     9.7 +	simple-config-property : HttpAnythingOrgSimpleConfigPropertyType?
     9.8 +		config-property-name : java.lang.String
     9.9 +		config-property-type : java.lang.String
    9.10  
    9.11  Compiling
    9.12  Finished compiling: 0
    10.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebApp.pass	Wed Mar 05 16:56:40 2003 +0000
    10.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebApp.pass	Thu Mar 06 23:31:33 2003 +0000
    10.3 @@ -10,7 +10,7 @@
    10.4  		[attr: xml:lang CDATA #IMPLIED  : java.lang.String]
    10.5  		small-icon : java.lang.String?
    10.6  		large-icon : java.lang.String?
    10.7 -	distributable : EmptyType?
    10.8 +	distributable : boolean?
    10.9  	context-param : ParamValueType[0,n]
   10.10  		description : java.lang.String[0,n]
   10.11  			[attr: xml:lang CDATA #IMPLIED  : java.lang.String]
   10.12 @@ -204,6 +204,18 @@
   10.13  out: <web-app xmlns='http://java.sun.com/xml/ns/j2ee' version='2.4'>
   10.14  out: 	<description>This is my Web App</description>
   10.15  out: 	<display-name>MyWebApp</display-name>
   10.16 +out: 	<distributable>false</distributable>
   10.17 +out: 	<filter>
   10.18 +out: 		<filter-name>Bob</filter-name>
   10.19 +out: 		<filter-class></filter-class>
   10.20 +out: 	</filter>
   10.21 +out: </web-app>
   10.22 +out: TestWebApp - Setting distributable to true
   10.23 +out: <?xml version='1.0' encoding='UTF-8' ?>
   10.24 +out: <web-app xmlns='http://java.sun.com/xml/ns/j2ee' version='2.4'>
   10.25 +out: 	<description>This is my Web App</description>
   10.26 +out: 	<display-name>MyWebApp</display-name>
   10.27 +out: 	<distributable>true</distributable>
   10.28  out: 	<filter>
   10.29  out: 		<filter-name>Bob</filter-name>
   10.30  out: 		<filter-class></filter-class>