[jboss-cvs] JBossAS SVN: r76711 - in projects/metadata/tags: 1.0.0.Beta35 and 15 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Aug 6 10:00:24 EDT 2008


Author: alex.loubyansky at jboss.com
Date: 2008-08-06 10:00:22 -0400 (Wed, 06 Aug 2008)
New Revision: 76711

Added:
   projects/metadata/tags/1.0.0.Beta35/
   projects/metadata/tags/1.0.0.Beta35/.classpath
   projects/metadata/tags/1.0.0.Beta35/pom.xml
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
Removed:
   projects/metadata/tags/1.0.0.Beta35/.classpath
   projects/metadata/tags/1.0.0.Beta35/pom.xml
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml
   projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
Log:
[maven-release-plugin]  copy for tag 1.0.0.Beta35

Copied: projects/metadata/tags/1.0.0.Beta35 (from rev 76699, projects/metadata/trunk)

Deleted: projects/metadata/tags/1.0.0.Beta35/.classpath
===================================================================
--- projects/metadata/trunk/.classpath	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/.classpath	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/0.3/jboss-ejb3-ext-api-0.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-jaxws/2.0.1.GA/jboss-jaxws-2.0.1.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta15/jboss-mdr-2.0.0.Beta15.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta15/jboss-mdr-2.0.0.Beta15-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-persistence-api/3.0.0.CR1/jboss-persistence-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-persistence-api/3.0.0.CR1/jboss-persistence-api-3.0.0.CR1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta11/jboss-vfs-2.0.0.Beta11.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta11/jboss-vfs-2.0.0.Beta11-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.2.GA/jbossws-spi-1.0.2.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR9/jbossxb-2.0.0.CR9.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR9/jbossxb-2.0.0.CR9-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
-	<classpathentry kind="output" path="target/eclipse-classes"/>
-</classpath>

Copied: projects/metadata/tags/1.0.0.Beta35/.classpath (from rev 76700, projects/metadata/trunk/.classpath)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/.classpath	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/.classpath	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry excluding="**/*.java" kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.CR1/jboss-ejb-api-3.0.0.CR1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/0.3/jboss-ejb3-ext-api-0.3-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-jaxws/2.0.1.GA/jboss-jaxws-2.0.1.GA.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.CR1/jboss-jms-api-1.1.0.CR1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta15/jboss-mdr-2.0.0.Beta15.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta15/jboss-mdr-2.0.0.Beta15-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-persistence-api/3.0.0.CR1/jboss-persistence-api-3.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-persistence-api/3.0.0.CR1/jboss-persistence-api-3.0.0.CR1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta11/jboss-vfs-2.0.0.Beta11.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta11/jboss-vfs-2.0.0.Beta11-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.2.GA/jbossws-spi-1.0.2.GA.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR12/jbossxb-2.0.0.CR12.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR12/jbossxb-2.0.0.CR12-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+	<classpathentry kind="output" path="target/eclipse-classes"/>
+</classpath>

Deleted: projects/metadata/tags/1.0.0.Beta35/pom.xml
===================================================================
--- projects/metadata/trunk/pom.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/pom.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,167 +0,0 @@
-<!--
-  vi:ts=2:sw=2:expandtab
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jboss</groupId>
-    <artifactId>jboss-parent</artifactId>
-    <version>4.0.CR1</version>
-  </parent>
-  <groupId>org.jboss.metadata</groupId>
-  <artifactId>jboss-metadata</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>JBoss Metadata</name>
-  <url>http://www.jboss.org</url>
-  <description>The common JavaEE metadata classes</description>
-  <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/trunk/</developerConnection>
-  </scm>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <printSummary>true</printSummary>
-          <disableXmlReport>false</disableXmlReport>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <includes>
-            <include>**/*TestCase.java</include>
-          </includes>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-
-  <!-- 
-    Eclipse settings have been removed from parent. This needs to be
-    done via an eclipse profile.
-    http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896 
-    -->
-  <profiles>
-    <profile>
-      <id>eclipse</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-eclipse-plugin</artifactId>
-            <configuration>
-              <downloadSources>true</downloadSources>
-              <buildOutputDirectory>target/eclipse-classes</buildOutputDirectory>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!-- Compile Dependencies -->
-  <dependencies>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-spi</artifactId>
-      <version>2.0.5.GA</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
-      <version>2.2.7.GA</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-ext-api</artifactId>
-      <version>0.4</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-ejb-api</artifactId>
-      <version>3.0.0.CR1</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-jms-api</artifactId>
-      <version>1.1.0.CR1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-persistence-api</artifactId>
-      <version>3.0.0.CR1</version>
-    </dependency>
-      
-    <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-transaction-api</artifactId>
-      <version>1.0.1.CR1</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-spi</artifactId>
-      <version>1.0.2.GA</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-jaxws</artifactId>
-      <version>2.0.1.GA</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jbossxb</artifactId>
-      <version>2.0.0.CR9</version>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>        
-      </exclusions>       
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-vfs</artifactId>
-      <version>2.0.0.Beta18</version>    
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-mdr</artifactId>
-      <version>2.0.0.Beta15</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.1</version>    
-    </dependency>
-    
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.test</groupId>
-      <artifactId>jboss-test</artifactId>
-      <version>1.1.0.GA</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

Copied: projects/metadata/tags/1.0.0.Beta35/pom.xml (from rev 76710, projects/metadata/trunk/pom.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/pom.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/pom.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,167 @@
+<!--
+  vi:ts=2:sw=2:expandtab
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jboss</groupId>
+    <artifactId>jboss-parent</artifactId>
+    <version>4.0.CR1</version>
+  </parent>
+  <groupId>org.jboss.metadata</groupId>
+  <artifactId>jboss-metadata</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0.0.Beta35</version>
+  <name>JBoss Metadata</name>
+  <url>http://www.jboss.org</url>
+  <description>The common JavaEE metadata classes</description>
+  <scm>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.0.Beta35</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.0.Beta35</developerConnection>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4.3</version>
+        <configuration>
+          <printSummary>true</printSummary>
+          <disableXmlReport>false</disableXmlReport>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <includes>
+            <include>**/*TestCase.java</include>
+          </includes>
+        </configuration>
+      </plugin>      
+    </plugins>
+  </build>
+
+  <!-- 
+    Eclipse settings have been removed from parent. This needs to be
+    done via an eclipse profile.
+    http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896 
+    -->
+  <profiles>
+    <profile>
+      <id>eclipse</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-eclipse-plugin</artifactId>
+            <configuration>
+              <downloadSources>true</downloadSources>
+              <buildOutputDirectory>target/eclipse-classes</buildOutputDirectory>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <!-- Compile Dependencies -->
+  <dependencies>
+
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+      <version>2.0.5.GA</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+      <version>2.2.7.GA</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-ext-api</artifactId>
+      <version>0.4</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-ejb-api</artifactId>
+      <version>3.0.0.CR1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-jms-api</artifactId>
+      <version>1.1.0.CR1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-persistence-api</artifactId>
+      <version>3.0.0.CR1</version>
+    </dependency>
+      
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-transaction-api</artifactId>
+      <version>1.0.1.CR1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.ws</groupId>
+      <artifactId>jbossws-spi</artifactId>
+      <version>1.0.2.GA</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-jaxws</artifactId>
+      <version>2.0.1.GA</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jbossxb</artifactId>
+      <version>2.0.0.CR12</version>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>        
+      </exclusions>       
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-vfs</artifactId>
+      <version>2.0.0.Beta18</version>    
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-mdr</artifactId>
+      <version>2.0.0.Beta15</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.1</version>    
+    </dependency>
+    
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.test</groupId>
+      <artifactId>jboss-test</artifactId>
+      <version>1.1.0.GA</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.client.jboss;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * JBoss specific meta data for JavaEE 5 clients that does not
- * use a namespace.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
- at XmlRootElement(name="jboss-client", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.UNSET)
- at XmlType(name="jboss-clientType", namespace="")
-public class JBossClient5DTDMetaData extends JBossClientMetaData
-{
-   private static final long serialVersionUID = 1L;
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JBoss specific meta data for JavaEE 5 clients that does not
+ * use a namespace.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss-client", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNSET,
+      normalizeSpace=true)
+ at XmlType(name="jboss-clientType", namespace="")
+public class JBossClient5DTDMetaData extends JBossClientMetaData
+{
+   private static final long serialVersionUID = 1L;
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.client.jboss;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * JBoss specific meta data for JavaEE 5 clients.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision$
- */
- at XmlRootElement(name="jboss-client", namespace=JavaEEMetaDataConstants.JBOSS_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JBOSS_NS, prefix = "jboss"),
-            @XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee"),
-            @XmlNs(namespaceURI = JavaEEMetaDataConstants.XSD_NS, prefix = "xsd")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.JBOSS_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
-public class JBossClient5MetaData extends JBossClientMetaData
-{
-   private static final long serialVersionUID = 1;
-}
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/jboss/JBossClient5MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JBoss specific meta data for JavaEE 5 clients.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss-client", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JBOSS_NS, prefix = "jboss"),
+            @XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee"),
+            @XmlNs(namespaceURI = JavaEEMetaDataConstants.XSD_NS, prefix = "xsd")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JBOSS_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+public class JBossClient5MetaData extends JBossClientMetaData
+{
+   private static final long serialVersionUID = 1;
+}
\ No newline at end of file

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.client.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * The application client meta data for J2EE 1.4 clients that
- * does not use a namespace.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
- at XmlRootElement(name="application-client", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.UNSET)
- at XmlType(name="application-clientType",
-        namespace=JavaEEMetaDataConstants.J2EE_NS)
-public class ApplicationClient14DTDMetaData extends ApplicationClientMetaData
-{
-   private static final long serialVersionUID = 1L;
-
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * The application client meta data for J2EE 1.4 clients that
+ * does not use a namespace.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application-client", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNSET,
+      normalizeSpace=true)
+ at XmlType(name="application-clientType",
+        namespace=JavaEEMetaDataConstants.J2EE_NS)
+public class ApplicationClient14DTDMetaData extends ApplicationClientMetaData
+{
+   private static final long serialVersionUID = 1L;
+
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.client.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * The application client meta data for J2EE 1.4 clients.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
- at XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.J2EE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.J2EE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="application-clientType",
-        namespace=JavaEEMetaDataConstants.J2EE_NS)
-public class ApplicationClient14MetaData extends ApplicationClientMetaData
-{
-   private static final long serialVersionUID = 1L;
-
-   @Override
-   @XmlAttribute(name="version")
-   public void setVersion(String version)
-   {
-      super.setVersion(version);
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * The application client meta data for J2EE 1.4 clients.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.J2EE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="application-clientType",
+        namespace=JavaEEMetaDataConstants.J2EE_NS)
+public class ApplicationClient14MetaData extends ApplicationClientMetaData
+{
+   private static final long serialVersionUID = 1L;
+
+   @Override
+   @XmlAttribute(name="version")
+   public void setVersion(String version)
+   {
+      super.setVersion(version);
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.client.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Application client meta data for Java EE 5 clients. See JavaEE 5 chapter 9.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
- at XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="application-clientType",
-        namespace=JavaEEMetaDataConstants.JAVAEE_NS)
-public class ApplicationClient5MetaData extends ApplicationClientMetaData
-{
-   private static final long serialVersionUID = 1L;
-
-   @Override
-   @XmlAttribute(name="version")
-   public void setVersion(String version)
-   {
-      super.setVersion(version);
-   }
-   
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Application client meta data for Java EE 5 clients. See JavaEE 5 chapter 9.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="application-clientType",
+        namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+public class ApplicationClient5MetaData extends ApplicationClientMetaData
+{
+   private static final long serialVersionUID = 1L;
+
+   @Override
+   @XmlAttribute(name="version")
+   public void setVersion(String version)
+   {
+      super.setVersion(version);
+   }
+   
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,99 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DescriptionsImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.DisplayNamesImpl;
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * j2ee 1.3 and earlier ear metadata with no namespace
- * 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at XmlRootElement(name="application", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.UNSET)
- at XmlType(name="applicationType",
-      namespace="")
-public class Ear13DTDMetaData extends EarMetaData
-{
-   private static final long serialVersionUID = 1;
-
-   public String getDisplayName()
-   {
-      String name = null;
-      DescriptionGroupMetaData group = getDescriptionGroup();
-      if (group != null)
-      {
-         name = group.getDisplayName();
-      }
-      return name;
-   }
-   public void setDisplayName(String name)
-   {
-      DescriptionGroupMetaData group = getDescriptionGroup();
-      if(group == null)
-         group = new DescriptionGroupMetaData();
-      DisplayNameImpl dn = new DisplayNameImpl();
-      dn.setDisplayName(name);
-      DisplayNamesImpl names = new DisplayNamesImpl();
-      names.add(dn);
-      group.setDisplayNames(names);
-      setDescriptionGroup(group);
-   }
-
-   public String getDescription()
-   {
-      String desc = null;
-      DescriptionGroupMetaData group = getDescriptionGroup();
-      if (group != null)
-      {
-         desc = group.getDescription();
-      }
-      return desc;      
-   }
-   public void setDescription(String desc)
-   {
-      DescriptionGroupMetaData group = getDescriptionGroup();
-      if(group == null)
-         group = new DescriptionGroupMetaData();
-      DescriptionsImpl descriptions = new DescriptionsImpl();
-      DescriptionImpl di = new DescriptionImpl();
-      di.setDescription(desc);
-      descriptions.add(di);
-      group.setDescriptions(descriptions);
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DescriptionsImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.DisplayNamesImpl;
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * j2ee 1.3 and earlier ear metadata with no namespace
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNSET,
+      normalizeSpace=true)
+ at XmlType(name="applicationType",
+      namespace="")
+public class Ear13DTDMetaData extends EarMetaData
+{
+   private static final long serialVersionUID = 1;
+
+   public String getDisplayName()
+   {
+      String name = null;
+      DescriptionGroupMetaData group = getDescriptionGroup();
+      if (group != null)
+      {
+         name = group.getDisplayName();
+      }
+      return name;
+   }
+   public void setDisplayName(String name)
+   {
+      DescriptionGroupMetaData group = getDescriptionGroup();
+      if(group == null)
+         group = new DescriptionGroupMetaData();
+      DisplayNameImpl dn = new DisplayNameImpl();
+      dn.setDisplayName(name);
+      DisplayNamesImpl names = new DisplayNamesImpl();
+      names.add(dn);
+      group.setDisplayNames(names);
+      setDescriptionGroup(group);
+   }
+
+   public String getDescription()
+   {
+      String desc = null;
+      DescriptionGroupMetaData group = getDescriptionGroup();
+      if (group != null)
+      {
+         desc = group.getDescription();
+      }
+      return desc;      
+   }
+   public void setDescription(String desc)
+   {
+      DescriptionGroupMetaData group = getDescriptionGroup();
+      if(group == null)
+         group = new DescriptionGroupMetaData();
+      DescriptionsImpl descriptions = new DescriptionsImpl();
+      DescriptionImpl di = new DescriptionImpl();
+      di.setDescription(desc);
+      descriptions.add(di);
+      group.setDescriptions(descriptions);
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * j2ee 1.4 ear metadata
- * 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.J2EE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.J2EE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="applicationType",
-      namespace=JavaEEMetaDataConstants.J2EE_NS)
-public class Ear14MetaData extends EarMetaData
-{
-   private static final long serialVersionUID = 1;
-
-   @Override
-   public boolean isEE14()
-   {
-      return true;
-   }
-
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * j2ee 1.4 ear metadata
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.J2EE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="applicationType",
+      namespace=JavaEEMetaDataConstants.J2EE_NS)
+public class Ear14MetaData extends EarMetaData
+{
+   private static final long serialVersionUID = 1;
+
+   @Override
+   public boolean isEE14()
+   {
+      return true;
+   }
+
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="applicationType",
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-      propOrder={"descriptionGroup", "modules", "securityRoles", "libraryDirectory"})
-public class Ear50MetaData extends Ear5xMetaData
-{
-   private static final long serialVersionUID = 1;
-
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="applicationType",
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      propOrder={"descriptionGroup", "modules", "securityRoles", "libraryDirectory"})
+public class Ear50MetaData extends Ear5xMetaData
+{
+   private static final long serialVersionUID = 1;
+
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.ejb.jboss;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * 5.0 jboss.xml metadata without a namespace
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
- at XmlRootElement(name="jboss", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.UNQUALIFIED)
- at XmlType(name="jbossType", namespace="")
-public class JBoss50DTDMetaData extends JBossMetaData
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1;
-
-   /**
-    * Create a new JBoss50DTDMetaData.
-    */
-   public JBoss50DTDMetaData()
-   {
-      // For serialization
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,58 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * 5.0 jboss.xml metadata without a namespace
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNQUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="jbossType", namespace="")
+public class JBoss50DTDMetaData extends JBossMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1;
+
+   /**
+    * Create a new JBoss50DTDMetaData.
+    */
+   public JBoss50DTDMetaData()
+   {
+      // For serialization
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.ejb.jboss;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * 5.0 jboss.xml metadata
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at XmlRootElement(name="jboss", namespace=JavaEEMetaDataConstants.JBOSS_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.JBOSS_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
-public class JBoss50MetaData extends JBossMetaData
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1;
-
-   /**
-    * Create a new JBoss50MetaData.
-    */
-   public JBoss50MetaData()
-   {
-      // For serialization
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,58 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * 5.0 jboss.xml metadata
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlRootElement(name="jboss", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JBOSS_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+public class JBoss50MetaData extends JBossMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1;
+
+   /**
+    * Create a new JBoss50MetaData.
+    */
+   public JBoss50MetaData()
+   {
+      // For serialization
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,75 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.ejb.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * EjbJar1xMetaData.
- * 
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 66015 $
- */
- at XmlRootElement(name="ejb-jar", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="ejb-jarType",
-      namespace="",
-      propOrder={"descriptionGroup", "enterpriseBeans", "assemblyDescriptor", "ejbClientJar"})
-public class EjbJar1xMetaData extends EjbJarMetaData
-{
-   /**
-    * Override to get the version from the root element version attribute.
-    * 
-    * @param version the version.
-    * @throws IllegalArgumentException for a null version
-    */
-   @XmlAttribute
-   public void setVersion(String version)
-   {
-      super.setVersion(version);
-   }
-
-   /**
-    * Whether this is ejb1.x
-    * 
-    * @return true when ejb1.x
-    */
-   public boolean isEJB1x()
-   {
-      return true;
-   }
-
-   public InterceptorsMetaData getInterceptors()
-   {
-      return null;
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar1xMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,76 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * EjbJar1xMetaData.
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 66015 $
+ */
+ at XmlRootElement(name="ejb-jar", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="ejb-jarType",
+      namespace="",
+      propOrder={"descriptionGroup", "enterpriseBeans", "assemblyDescriptor", "ejbClientJar"})
+public class EjbJar1xMetaData extends EjbJarMetaData
+{
+   /**
+    * Override to get the version from the root element version attribute.
+    * 
+    * @param version the version.
+    * @throws IllegalArgumentException for a null version
+    */
+   @XmlAttribute
+   public void setVersion(String version)
+   {
+      super.setVersion(version);
+   }
+
+   /**
+    * Whether this is ejb1.x
+    * 
+    * @return true when ejb1.x
+    */
+   public boolean isEJB1x()
+   {
+      return true;
+   }
+
+   public InterceptorsMetaData getInterceptors()
+   {
+      return null;
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,56 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.ejb.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * EjbJar20MetaData.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
- at XmlRootElement(name="ejb-jar", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="ejb-jarType",
-      namespace="",
-      propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar"})
-public class EjbJar20MetaData extends EjbJar2xMetaData
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1;
-
-   @Override
-   public boolean isEJB2x()
-   {
-      return true;
-   }   
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar20MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * EjbJar20MetaData.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+ at XmlRootElement(name="ejb-jar", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="ejb-jarType",
+      namespace="",
+      propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar"})
+public class EjbJar20MetaData extends EjbJar2xMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1;
+
+   @Override
+   public boolean isEJB2x()
+   {
+      return true;
+   }   
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,81 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.ejb.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * EjbJar21MetaData.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at XmlRootElement(name="ejb-jar", namespace=JavaEEMetaDataConstants.J2EE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="http://java.sun.com/xml/ns/j2ee",
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="ejb-jarType",
-      namespace=JavaEEMetaDataConstants.J2EE_NS,
-      propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar"})
-/*@XmlTypeImpls
-({
-   @XmlTypeImpl(name="fully-qualified-classType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="java-typeType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="java-identifierType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="true-falseType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="string", namespace=JavaEEMetaDataConstants.J2EE_NS, startElementCreatesObject=false),
-   @XmlTypeImpl(name="xsdStringType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="env-entry-type-valuesType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="ejb-linkType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="jndi-nameType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="role-nameType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="message-destination-typeType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="message-destination-linkType", startElementCreatesObject=false),
-})
-*/
-public class EjbJar21MetaData extends EjbJar2xMetaData
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7919600230211960565L;
-   
-   /**
-    * Create a new EjbJar21MetaData.
-    */
-   public EjbJar21MetaData()
-   {
-      // For serialization
-   }
-   
-   @Override
-   public boolean isEJB21()
-   {
-      return true;
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar21MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,66 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * EjbJar21MetaData.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlRootElement(name="ejb-jar", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="http://java.sun.com/xml/ns/j2ee",
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="ejb-jarType",
+      namespace=JavaEEMetaDataConstants.J2EE_NS,
+      propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar"})
+public class EjbJar21MetaData extends EjbJar2xMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 7919600230211960565L;
+   
+   /**
+    * Create a new EjbJar21MetaData.
+    */
+   public EjbJar21MetaData()
+   {
+      // For serialization
+   }
+   
+   @Override
+   public boolean isEJB21()
+   {
+      return true;
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,74 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.ejb.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * EjbJar30MetaData.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at XmlRootElement(name="ejb-jar", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="ejb-jarType",
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-      propOrder={"descriptionGroup", "enterpriseBeans", "interceptors", "relationships", "assemblyDescriptor", "ejbClientJar"})
-/*@XmlTypeImpls
-({
-   @XmlTypeImpl(name="fully-qualified-classType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="java-typeType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="java-identifierType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="true-falseType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="string", namespace=JavaEEMetaDataConstants.JAVAEE_NS, startElementCreatesObject=false),
-   @XmlTypeImpl(name="xsdStringType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="env-entry-type-valuesType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="ejb-linkType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="jndi-nameType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="role-nameType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="message-destination-typeType", startElementCreatesObject=false),
-   @XmlTypeImpl(name="message-destination-linkType", startElementCreatesObject=false),
-})
-*/public class EjbJar30MetaData extends EjbJar3xMetaData
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 4822895045737616761L;
-
-   /**
-    * Create a new EjbJar30MetaData.
-    */
-   public EjbJar30MetaData()
-   {
-      // For serialization
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/ejb/spec/EjbJar30MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,60 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * EjbJar30MetaData.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlRootElement(name="ejb-jar", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="ejb-jarType",
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      propOrder={"descriptionGroup", "enterpriseBeans", "interceptors", "relationships", "assemblyDescriptor", "ejbClientJar"})
+public class EjbJar30MetaData extends EjbJar3xMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 4822895045737616761L;
+
+   /**
+    * Create a new EjbJar30MetaData.
+    */
+   public EjbJar30MetaData()
+   {
+      // For serialization
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,139 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.javaee.spec;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.support.ResourceInjectionMetaDataWithDescriptions;
-
-/**
- * EnvironmentEntryMetaData.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at XmlType(name="env-entryType")
-public class EnvironmentEntryMetaData extends ResourceInjectionMetaDataWithDescriptions
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4919146521508624575L;
-
-   /** The type */
-   private String type;
-   
-   /** The value */
-   private String value;
-   
-   /**
-    * Create a new EnvironmentEntryMetaData.
-    */
-   public EnvironmentEntryMetaData()
-   {
-      // For serialization
-   }
-
-   /**
-    * Get the envEntryName.
-    * 
-    * @return the envEntryName.
-    */
-   public String getEnvEntryName()
-   {
-      return getName();
-   }
-
-   /**
-    * Set the envEntryName.
-    * 
-    * @param envEntryName the envEntryName.
-    * @throws IllegalArgumentException for a null envEntryName
-    */
-   public void setEnvEntryName(String envEntryName)
-   {
-      setName(envEntryName);
-   }
-
-   /**
-    * Get the type.
-    * 
-    * @return the type.
-    */
-   public String getType()
-   {
-      return type;
-   }
-
-   /**
-    * Set the type.
-    * 
-    * @param type the type.
-    * @throws IllegalArgumentException for a null type
-    */
-   @XmlElement(name="env-entry-type")
-   public void setType(String type)
-   {
-      if (type == null)
-         throw new IllegalArgumentException("Null type");
-      this.type = type;
-   }
-
-   /**
-    * Get the value.
-    * 
-    * @return the value.
-    */
-   public String getValue()
-   {
-      return value;
-   }
-
-   /**
-    * Set the value.
-    * 
-    * @param value the value.
-    * @throws IllegalArgumentException for a null value
-    */
-   @XmlElement(name="env-entry-value")
-   //@SchemaValue(false)
-   public void setValue(String value)
-   {
-      if (value == null)
-         throw new IllegalArgumentException("Null value");
-      this.value = value;
-   }
-
-   public void merge(EnvironmentEntryMetaData override,
-         EnvironmentEntryMetaData original)
-   {
-      super.merge(override, original);
-      if (override != null && override.type != null)
-         setType(override.type);
-      else if (original != null && original.type != null)
-         setType(original.type);
-      if (override != null && override.value != null)
-         setValue(override.value);
-      else if (original != null && original.value != null)
-         setValue(original.value);
-   }
-
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentEntryMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,140 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.javaee.spec;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.support.ResourceInjectionMetaDataWithDescriptions;
+import org.jboss.xb.annotations.JBossXmlPreserveWhitespace;
+
+/**
+ * EnvironmentEntryMetaData.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlType(name="env-entryType")
+public class EnvironmentEntryMetaData extends ResourceInjectionMetaDataWithDescriptions
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = -4919146521508624575L;
+
+   /** The type */
+   private String type;
+   
+   /** The value */
+   private String value;
+   
+   /**
+    * Create a new EnvironmentEntryMetaData.
+    */
+   public EnvironmentEntryMetaData()
+   {
+      // For serialization
+   }
+
+   /**
+    * Get the envEntryName.
+    * 
+    * @return the envEntryName.
+    */
+   public String getEnvEntryName()
+   {
+      return getName();
+   }
+
+   /**
+    * Set the envEntryName.
+    * 
+    * @param envEntryName the envEntryName.
+    * @throws IllegalArgumentException for a null envEntryName
+    */
+   public void setEnvEntryName(String envEntryName)
+   {
+      setName(envEntryName);
+   }
+
+   /**
+    * Get the type.
+    * 
+    * @return the type.
+    */
+   public String getType()
+   {
+      return type;
+   }
+
+   /**
+    * Set the type.
+    * 
+    * @param type the type.
+    * @throws IllegalArgumentException for a null type
+    */
+   @XmlElement(name="env-entry-type")
+   public void setType(String type)
+   {
+      if (type == null)
+         throw new IllegalArgumentException("Null type");
+      this.type = type;
+   }
+
+   /**
+    * Get the value.
+    * 
+    * @return the value.
+    */
+   public String getValue()
+   {
+      return value;
+   }
+
+   /**
+    * Set the value.
+    * 
+    * @param value the value.
+    * @throws IllegalArgumentException for a null value
+    */
+   @XmlElement(name="env-entry-value")
+   @JBossXmlPreserveWhitespace
+   public void setValue(String value)
+   {
+      if (value == null)
+         throw new IllegalArgumentException("Null value");
+      this.value = value;
+   }
+
+   public void merge(EnvironmentEntryMetaData override,
+         EnvironmentEntryMetaData original)
+   {
+      super.merge(override, original);
+      if (override != null && override.type != null)
+         setType(override.type);
+      else if (original != null && original.type != null)
+         setType(original.type);
+      if (override != null && override.value != null)
+         setValue(override.value);
+      else if (original != null && original.value != null)
+         setValue(original.value);
+   }
+
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.web.jboss;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * DTD based schema for use with jboss-web.xml without a namespace
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
- at XmlRootElement(name="jboss-web", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.UNSET)
- at XmlType(name="jboss-webType", namespace="")
-public class JBoss50DTDWebMetaData extends JBossWebMetaData
-{
-   private static final long serialVersionUID = 1;
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.web.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * DTD based schema for use with jboss-web.xml without a namespace
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss-web", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNSET,
+      normalizeSpace=true)
+ at XmlType(name="jboss-webType", namespace="")
+public class JBoss50DTDWebMetaData extends JBossWebMetaData
+{
+   private static final long serialVersionUID = 1;
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,60 +0,0 @@
-package org.jboss.metadata.web.spec;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Web application spec metadata.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
- at XmlRootElement(name="web-app", namespace="")
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = "", prefix="jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace="",
-      elementFormDefault=XmlNsForm.UNSET)
-public class Web23MetaData extends WebMetaData
-{
-   private static final long serialVersionUID = 1;
-
-   public boolean isMetadataComplete()
-   {
-      return true;
-   }
-
-   @Override
-   public String getVersion()
-   {
-      return "2.3";
-   }
-
-   public List<TaglibMetaData> getTaglibs()
-   {
-      JspConfigMetaData jspConfig = super.getJspConfig();
-      List<TaglibMetaData> taglibs = null;
-      if (jspConfig != null)
-      {
-         taglibs = jspConfig.getTaglibs();
-      }
-      return taglibs;
-   }
-   /**
-    * Map the 2.3 taglibs onto jsp-config/taglibs
-    * @param taglibs
-    */
-   @XmlElement(name="taglib")
-   public void setTaglibs(List<TaglibMetaData> taglibs)
-   {
-      JspConfigMetaData jspConfig = new JspConfigMetaData();
-      jspConfig.setTaglibs(taglibs);
-      super.setJspConfig(jspConfig);
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,61 @@
+package org.jboss.metadata.web.spec;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Web application spec metadata.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="web-app", namespace="")
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = "", prefix="jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace="",
+      elementFormDefault=XmlNsForm.UNSET,
+      normalizeSpace=true)
+public class Web23MetaData extends WebMetaData
+{
+   private static final long serialVersionUID = 1;
+
+   public boolean isMetadataComplete()
+   {
+      return true;
+   }
+
+   @Override
+   public String getVersion()
+   {
+      return "2.3";
+   }
+
+   public List<TaglibMetaData> getTaglibs()
+   {
+      JspConfigMetaData jspConfig = super.getJspConfig();
+      List<TaglibMetaData> taglibs = null;
+      if (jspConfig != null)
+      {
+         taglibs = jspConfig.getTaglibs();
+      }
+      return taglibs;
+   }
+   /**
+    * Map the 2.3 taglibs onto jsp-config/taglibs
+    * @param taglibs
+    */
+   @XmlElement(name="taglib")
+   public void setTaglibs(List<TaglibMetaData> taglibs)
+   {
+      JspConfigMetaData jspConfig = new JspConfigMetaData();
+      jspConfig.setTaglibs(taglibs);
+      super.setJspConfig(jspConfig);
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,30 +0,0 @@
-package org.jboss.metadata.web.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Web application spec metadata.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
- at XmlRootElement(name="web-app", namespace=JavaEEMetaDataConstants.J2EE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.J2EE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
-public class Web24MetaData extends WebMetaData
-{
-   private static final long serialVersionUID = 1;
-
-   public boolean isMetadataComplete()
-   {
-      return true;
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web24MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,31 @@
+package org.jboss.metadata.web.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Web application spec metadata.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="web-app", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.J2EE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+public class Web24MetaData extends WebMetaData
+{
+   private static final long serialVersionUID = 1;
+
+   public boolean isMetadataComplete()
+   {
+      return true;
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,42 +0,0 @@
-package org.jboss.metadata.web.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Web application spec metadata.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
- at XmlRootElement(name="web-app", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
-      ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-      elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="web-appType",
-      namespace=JavaEEMetaDataConstants.JAVAEE_NS)
-public class Web25MetaData extends WebMetaData
-{
-   private static final long serialVersionUID = 1;
-   private boolean metadataComplete;
-
-   public boolean isMetadataComplete()
-   {
-      return metadataComplete;
-   }
-
-   @XmlAttribute(name="metadata-complete")
-   public void setMetadataComplete(boolean metadataComplete)
-   {
-      this.metadataComplete = metadataComplete;
-   }
-
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java (from rev 76701, projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/main/java/org/jboss/metadata/web/spec/Web25MetaData.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,43 @@
+package org.jboss.metadata.web.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Web application spec metadata.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="web-app", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+      ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED,
+      normalizeSpace=true)
+ at XmlType(name="web-appType",
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+public class Web25MetaData extends WebMetaData
+{
+   private static final long serialVersionUID = 1;
+   private boolean metadataComplete;
+
+   public boolean isMetadataComplete()
+   {
+      return metadataComplete;
+   }
+
+   @XmlAttribute(name="metadata-complete")
+   public void setMetadataComplete(boolean metadataComplete)
+   {
+      this.metadataComplete = metadataComplete;
+   }
+
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,294 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.ear;
-
-
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
-
-import org.jboss.annotation.javaee.Description;
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.annotation.javaee.DisplayName;
-import org.jboss.annotation.javaee.DisplayNames;
-import org.jboss.annotation.javaee.Icon;
-import org.jboss.annotation.javaee.Icons;
-import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
-import org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData;
-import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
-import org.jboss.metadata.ear.spec.Ear14MetaData;
-import org.jboss.metadata.ear.spec.EarMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData;
-import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.IconImpl;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
-/**
- * Ear4x tests
- * 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class Ear4xUnitTestCase extends AbstractJavaEEMetaDataTest
-{
-   public static Test suite()
-   {
-      return suite(Ear4xUnitTestCase.class);
-   }
-   
-   public static SchemaBindingResolver initResolver()
-   {
-      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-      resolver.addClassBindingForLocation("application", Ear13DTDMetaData.class);
-      resolver.addClassBindingForLocation("application_1_2.dtd", Ear13DTDMetaData.class);
-      resolver.addClassBindingForLocation("application_1_3.dtd", Ear13DTDMetaData.class);
-      resolver.addClassBindingForLocation("application_1_4.xsd", Ear14MetaData.class);
-      resolver.addClassBindingForLocation("jboss-app_3_2.dtd", JBoss50DTDAppMetaData.class);
-      resolver.addClassBindingForLocation("jboss-app_4_0.dtd", JBoss50DTDAppMetaData.class);
-      resolver.addClassBindingForLocation("jboss-app_4_2.dtd", JBoss50DTDAppMetaData.class);
-      resolver.addClassBindingForLocation("jboss-app_5_0.dtd", JBoss50DTDAppMetaData.class);
-      resolver.addClassBindingForLocation("jboss-app_5_0.xsd", JBoss50AppMetaData.class);
-      return resolver;
-   }
-
-   public Ear4xUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   protected EarMetaData unmarshal() throws Exception
-   {
-      return unmarshal(EarMetaData.class);
-   }
-
-   public void testNoDtd() throws Exception
-   {
-      EarMetaData result = unmarshal();
-      assertEquals("JBossTest Web Container Testsuite", result.getDescriptionGroup().getDisplayName());
-      ModulesMetaData modules = result.getModules();
-      assertNotNull(modules);
-      assertEquals(1, modules.size());
-      ModuleMetaData module = modules.get(0);
-      assertEquals("manifest-web.war", module.getFileName());
-      WebModuleMetaData webModule = (WebModuleMetaData) module.getValue();
-      assertEquals("/manifest", webModule.getContextRoot());
-   }
-   public void testVersion14() throws Exception
-   {
-      EarMetaData result = unmarshal();
-      assertEquals("application_1_4-id", result.getId());
-      assertEquals("1.4", result.getVersion());
-      assertFalse(result.isEE13());
-      assertTrue(result.isEE14());
-      assertFalse(result.isEE5());
-   }
-   public void testVersion13() throws Exception
-   {
-      EarMetaData result = unmarshal();
-      assertEquals("application_1_3-id", result.getId());
-      assertEquals("1.3", result.getVersion());
-      assertTrue(result.isEE13());
-      assertFalse(result.isEE14());
-      assertFalse(result.isEE5());
-   }
-
-   public void testDescriptionGroup() throws Exception
-   {
-      EarMetaData result = unmarshal();
-      DescriptionGroupMetaData group = result.getDescriptionGroup();
-      assertNotNull(group);
-      Descriptions descriptions = group.getDescriptions();
-      assertNotNull(descriptions);
-      
-      DescriptionImpl en = new DescriptionImpl();
-      en.setDescription("en-ear-desc");
-      DescriptionImpl de = new DescriptionImpl();
-      de.setDescription("de-ear-desc");
-      de.setLanguage("de");
-      DescriptionImpl fr = new DescriptionImpl();
-      fr.setDescription("fr-ear-desc");
-      fr.setLanguage("fr");
-      
-      Description[] expected = {en, fr, de};
-      assertEquals(expected, descriptions.value());
-
-      DisplayNames displayNames = group.getDisplayNames();
-      assertNotNull(displayNames);
-      
-      DisplayNameImpl endn = new DisplayNameImpl();
-      endn.setDisplayName("en-ear-disp");
-      DisplayNameImpl frdn = new DisplayNameImpl();
-      frdn.setDisplayName("fr-ear-disp");
-      frdn.setLanguage("fr");
-      DisplayNameImpl dedn = new DisplayNameImpl();
-      dedn.setDisplayName("de-ear-disp");
-      dedn.setLanguage("de");
-
-      DisplayName[] expecteddns = {endn, frdn, dedn};
-      assertEquals(expecteddns, displayNames.value());
-
-      Icons icons = group.getIcons();
-      assertNotNull(icons);
-      IconImpl enicn = new IconImpl();
-      enicn.setId("en-ear-icon-id");
-      enicn.setSmallIcon("en-ear-small-icon");
-      enicn.setLargeIcon("en-ear-large-icon");
-      IconImpl fricn = new IconImpl();
-      fricn.setLanguage("fr");
-      fricn.setId("fr-ear-icon-id");
-      fricn.setSmallIcon("fr-ear-small-icon");
-      fricn.setLargeIcon("fr-ear-large-icon");
-      IconImpl deicn = new IconImpl();
-      deicn.setLanguage("de");
-      deicn.setId("de-ear-icon-id");
-      deicn.setSmallIcon("de-ear-small-icon");
-      deicn.setLargeIcon("de-ear-large-icon");
-      
-      Icon[] expectedicns = {enicn, fricn, deicn};
-      assertEquals(expectedicns, icons.value());
-   }
-
-   public void testDescriptionGroup13() throws Exception
-   {
-      EarMetaData result = unmarshal();
-      DescriptionGroupMetaData group = result.getDescriptionGroup();
-      assertNotNull(group);
-      assertEquals("1.3 EE Client", group.getDescription());
-      assertEquals("The cts.jar with an application client jar", group.getDisplayName());
-   }
-
-   public void testSecurityRoles()
-      throws Exception
-   {
-      EarMetaData specMetaData = unmarshal();
-      JBossAppMetaData jbossMetaData = unmarshal("Ear4x_testJBossSecurityRoles.xml", JBossAppMetaData.class, null);
-      JBossAppMetaData metaData = new JBossAppMetaData();
-      metaData.merge(jbossMetaData, specMetaData);
-
-      SecurityRolesMetaData secRoles = metaData.getSecurityRoles();
-      assertNotNull(secRoles);
-      assertEquals(4, secRoles.size());
-      // VP
-      SecurityRoleMetaData VP = secRoles.get("VP");
-      assertNotNull(VP);
-      assertEquals("VP", VP.getRoleName());
-      assertNull(VP.getPrincipals());
-      // Employee
-      SecurityRoleMetaData Employee = secRoles.get("Employee");
-      assertNotNull(Employee);
-      assertEquals("Employee", Employee.getRoleName());
-      assertEquals(2, Employee.getPrincipals().size());
-      Set<String> principals = Employee.getPrincipals();
-      HashSet<String> expected = new HashSet<String>();
-      expected.add("javajoe");
-      expected.add("j2ee");
-      assertEquals(expected, principals);
-      // Manager
-      SecurityRoleMetaData Manager = secRoles.get("Manager");
-      assertNotNull(Manager);
-      assertEquals("Manager", Manager.getRoleName());
-      assertEquals(1, Manager.getPrincipals().size());
-      String[] principalsArray = new String[0];
-      principalsArray = Manager.getPrincipals().toArray(principalsArray);
-      assertEquals("javajoe", principalsArray[0]);
-      // Administrator
-      SecurityRoleMetaData Administrator = secRoles.get("Administrator");
-      assertNotNull(Administrator);
-      assertEquals("Administrator", Administrator.getRoleName());
-      assertEquals(1, Administrator.getPrincipals().size());
-      principalsArray = new String[0];
-      principalsArray = Administrator.getPrincipals().toArray(principalsArray);
-      assertEquals("j2ee", principalsArray[0]);
-
-      Set<String> j2eeRoles = secRoles.getSecurityRoleNamesByPrincipal("j2ee");
-      HashSet<String> expectedj2eeRoles = new HashSet<String>();
-      expectedj2eeRoles.add("Employee");
-      expectedj2eeRoles.add("Administrator");
-      assertEquals(expectedj2eeRoles, j2eeRoles);
-      Set<String> javajoeRoles = secRoles.getSecurityRoleNamesByPrincipal("javajoe");
-      HashSet<String> expectedjavajoeRoles = new HashSet<String>();
-      expectedjavajoeRoles.add("Employee");
-      expectedjavajoeRoles.add("Manager");
-      assertEquals(expectedjavajoeRoles, javajoeRoles);
-
-      SecurityRolesMetaData j2eeRolesMD = secRoles.getSecurityRolesByPrincipal("j2ee");
-      assertEquals(2, j2eeRolesMD.size());
-      Employee = j2eeRolesMD.get("Employee");
-      assertNotNull(Employee);
-      assertEquals("Employee", Employee.getRoleName());
-      principals = Employee.getPrincipals();
-      assertEquals(2, principals.size());
-      assertEquals(expected, principals);
-   }
-
-   /**
-    * Test that the merged JBossAppMetaData without any jboss-app.xml input
-    * shows all of the application.xml information.
-    */
-   public void testAppXmlOnly()
-      throws Exception
-   {
-      EarMetaData specMetaData = unmarshal();
-      JBossAppMetaData metaData = new JBossAppMetaData();
-      metaData.merge(metaData, specMetaData);
-
-      assertEquals(6, metaData.getModules().size());
-      ModuleMetaData rar = metaData.getModule("rar0.rar");
-      assertEquals("connector0", rar.getId());
-      assertEquals(ModuleType.Connector, rar.getType());
-      assertEquals("META-INF/alt-ra.xml", rar.getAlternativeDD());
-      ModuleMetaData car = metaData.getModule("client0.jar");
-      assertEquals("java0", car.getId());
-      assertEquals(ModuleType.Client, car.getType());
-      assertEquals("META-INF/alt-application-client.xml", car.getAlternativeDD());
-      ModuleMetaData ejb1 = metaData.getModule("ejb-jar1.jar");
-      assertEquals("ejb1", ejb1.getId());
-      assertEquals(ModuleType.Ejb, ejb1.getType());
-      assertEquals("META-INF/alt-ejb-jar.xml", ejb1.getAlternativeDD());
-      ModuleMetaData web1 = metaData.getModule("web-app1.war");
-      assertEquals("web1", web1.getId());
-      assertEquals(ModuleType.Web, web1.getType());
-      assertEquals("WEB-INF/alt-web.xml", web1.getAlternativeDD());
-      WebModuleMetaData wm1 = (WebModuleMetaData) web1.getValue();
-      assertEquals("/web1", wm1.getContextRoot());
-
-      SecurityRolesMetaData roles = metaData.getSecurityRoles();
-      assertEquals(2, roles.size());
-      SecurityRoleMetaData r0 = roles.get("role0");
-      assertEquals("security-role0", r0.getId());
-      assertEquals("The 0 security role", r0.getDescriptions().value()[0].value());
-      SecurityRoleMetaData r1 = roles.get("role1");
-      assertEquals("security-role1", r1.getId());
-      assertEquals("The 1 security role", r1.getDescriptions().value()[0].value());
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java (from rev 76701, projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,295 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.ear;
+
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.annotation.javaee.Description;
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.annotation.javaee.DisplayName;
+import org.jboss.annotation.javaee.DisplayNames;
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
+import org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
+import org.jboss.metadata.ear.spec.Ear14MetaData;
+import org.jboss.metadata.ear.spec.EarMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Ear4x tests
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class Ear4xUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+   public static Test suite()
+   {
+      return suite(Ear4xUnitTestCase.class);
+   }
+   
+   public static SchemaBindingResolver initResolver()
+   {
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("application", Ear13DTDMetaData.class);
+      resolver.addClassBindingForLocation("application_1_2.dtd", Ear13DTDMetaData.class);
+      resolver.addClassBindingForLocation("application_1_3.dtd", Ear13DTDMetaData.class);
+      resolver.addClassBindingForLocation("application_1_4.xsd", Ear14MetaData.class);
+      resolver.addClassBindingForLocation("jboss-app_3_2.dtd", JBoss50DTDAppMetaData.class);
+      resolver.addClassBindingForLocation("jboss-app_4_0.dtd", JBoss50DTDAppMetaData.class);
+      resolver.addClassBindingForLocation("jboss-app_4_2.dtd", JBoss50DTDAppMetaData.class);
+      resolver.addClassBindingForLocation("jboss-app_5_0.dtd", JBoss50DTDAppMetaData.class);
+      resolver.addClassBindingForLocation("jboss-app_5_0.xsd", JBoss50AppMetaData.class);
+      return resolver;
+   }
+
+   public Ear4xUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   protected EarMetaData unmarshal() throws Exception
+   {
+      return unmarshal(EarMetaData.class);
+   }
+
+   public void testNoDtd() throws Exception
+   {
+      EarMetaData result = unmarshal();
+      assertEquals("JBossTest Web Container Testsuite", result.getDescriptionGroup().getDisplayName());
+      ModulesMetaData modules = result.getModules();
+      assertNotNull(modules);
+      assertEquals(1, modules.size());
+      ModuleMetaData module = modules.get(0);
+      assertEquals("manifest-web.war", module.getFileName());
+      WebModuleMetaData webModule = (WebModuleMetaData) module.getValue();
+      assertEquals("/manifest", webModule.getContextRoot());
+   }
+   public void testVersion14() throws Exception
+   {
+      EarMetaData result = unmarshal();
+      assertEquals("application_1_4-id", result.getId());
+      assertEquals("1.4", result.getVersion());
+      assertFalse(result.isEE13());
+      assertTrue(result.isEE14());
+      assertFalse(result.isEE5());
+   }
+   public void testVersion13() throws Exception
+   {
+      EarMetaData result = unmarshal();
+      assertEquals("application_1_3-id", result.getId());
+      assertEquals("1.3", result.getVersion());
+      assertTrue(result.isEE13());
+      assertFalse(result.isEE14());
+      assertFalse(result.isEE5());
+   }
+
+   public void testDescriptionGroup() throws Exception
+   {
+      EarMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      Descriptions descriptions = group.getDescriptions();
+      assertNotNull(descriptions);
+      
+      DescriptionImpl en = new DescriptionImpl();
+      en.setDescription("en-ear-desc");
+      DescriptionImpl de = new DescriptionImpl();
+      de.setDescription("de-ear-desc");
+      de.setLanguage("de");
+      DescriptionImpl fr = new DescriptionImpl();
+      fr.setDescription("fr-ear-desc");
+      fr.setLanguage("fr");
+      
+      Description[] expected = {en, fr, de};
+      assertEquals(expected, descriptions.value());
+
+      DisplayNames displayNames = group.getDisplayNames();
+      assertNotNull(displayNames);
+      
+      DisplayNameImpl endn = new DisplayNameImpl();
+      endn.setDisplayName("en-ear-disp");
+      DisplayNameImpl frdn = new DisplayNameImpl();
+      frdn.setDisplayName("fr-ear-disp");
+      frdn.setLanguage("fr");
+      DisplayNameImpl dedn = new DisplayNameImpl();
+      dedn.setDisplayName("de-ear-disp");
+      dedn.setLanguage("de");
+
+      DisplayName[] expecteddns = {endn, frdn, dedn};
+      assertEquals(expecteddns, displayNames.value());
+
+      Icons icons = group.getIcons();
+      assertNotNull(icons);
+      IconImpl enicn = new IconImpl();
+      enicn.setId("en-ear-icon-id");
+      enicn.setSmallIcon("en-ear-small-icon");
+      enicn.setLargeIcon("en-ear-large-icon");
+      IconImpl fricn = new IconImpl();
+      fricn.setLanguage("fr");
+      fricn.setId("fr-ear-icon-id");
+      fricn.setSmallIcon("fr-ear-small-icon");
+      fricn.setLargeIcon("fr-ear-large-icon");
+      IconImpl deicn = new IconImpl();
+      deicn.setLanguage("de");
+      deicn.setId("de-ear-icon-id");
+      deicn.setSmallIcon("de-ear-small-icon");
+      deicn.setLargeIcon("de-ear-large-icon");
+      
+      Icon[] expectedicns = {enicn, fricn, deicn};
+      assertEquals(expectedicns, icons.value());
+   }
+
+   public void testDescriptionGroup13() throws Exception
+   {
+      EarMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      assertEquals("1.3 EE Client", group.getDescription());
+      assertEquals("The cts.jar with an application client jar", group.getDisplayName());
+      assertNotNull(result.getModules().get("cts.jar"));
+   }
+
+   public void testSecurityRoles()
+      throws Exception
+   {
+      EarMetaData specMetaData = unmarshal();
+      JBossAppMetaData jbossMetaData = unmarshal("Ear4x_testJBossSecurityRoles.xml", JBossAppMetaData.class, null);
+      JBossAppMetaData metaData = new JBossAppMetaData();
+      metaData.merge(jbossMetaData, specMetaData);
+
+      SecurityRolesMetaData secRoles = metaData.getSecurityRoles();
+      assertNotNull(secRoles);
+      assertEquals(4, secRoles.size());
+      // VP
+      SecurityRoleMetaData VP = secRoles.get("VP");
+      assertNotNull(VP);
+      assertEquals("VP", VP.getRoleName());
+      assertNull(VP.getPrincipals());
+      // Employee
+      SecurityRoleMetaData Employee = secRoles.get("Employee");
+      assertNotNull(Employee);
+      assertEquals("Employee", Employee.getRoleName());
+      assertEquals(2, Employee.getPrincipals().size());
+      Set<String> principals = Employee.getPrincipals();
+      HashSet<String> expected = new HashSet<String>();
+      expected.add("javajoe");
+      expected.add("j2ee");
+      assertEquals(expected, principals);
+      // Manager
+      SecurityRoleMetaData Manager = secRoles.get("Manager");
+      assertNotNull(Manager);
+      assertEquals("Manager", Manager.getRoleName());
+      assertEquals(1, Manager.getPrincipals().size());
+      String[] principalsArray = new String[0];
+      principalsArray = Manager.getPrincipals().toArray(principalsArray);
+      assertEquals("javajoe", principalsArray[0]);
+      // Administrator
+      SecurityRoleMetaData Administrator = secRoles.get("Administrator");
+      assertNotNull(Administrator);
+      assertEquals("Administrator", Administrator.getRoleName());
+      assertEquals(1, Administrator.getPrincipals().size());
+      principalsArray = new String[0];
+      principalsArray = Administrator.getPrincipals().toArray(principalsArray);
+      assertEquals("j2ee", principalsArray[0]);
+
+      Set<String> j2eeRoles = secRoles.getSecurityRoleNamesByPrincipal("j2ee");
+      HashSet<String> expectedj2eeRoles = new HashSet<String>();
+      expectedj2eeRoles.add("Employee");
+      expectedj2eeRoles.add("Administrator");
+      assertEquals(expectedj2eeRoles, j2eeRoles);
+      Set<String> javajoeRoles = secRoles.getSecurityRoleNamesByPrincipal("javajoe");
+      HashSet<String> expectedjavajoeRoles = new HashSet<String>();
+      expectedjavajoeRoles.add("Employee");
+      expectedjavajoeRoles.add("Manager");
+      assertEquals(expectedjavajoeRoles, javajoeRoles);
+
+      SecurityRolesMetaData j2eeRolesMD = secRoles.getSecurityRolesByPrincipal("j2ee");
+      assertEquals(2, j2eeRolesMD.size());
+      Employee = j2eeRolesMD.get("Employee");
+      assertNotNull(Employee);
+      assertEquals("Employee", Employee.getRoleName());
+      principals = Employee.getPrincipals();
+      assertEquals(2, principals.size());
+      assertEquals(expected, principals);
+   }
+
+   /**
+    * Test that the merged JBossAppMetaData without any jboss-app.xml input
+    * shows all of the application.xml information.
+    */
+   public void testAppXmlOnly()
+      throws Exception
+   {
+      EarMetaData specMetaData = unmarshal();
+      JBossAppMetaData metaData = new JBossAppMetaData();
+      metaData.merge(metaData, specMetaData);
+
+      assertEquals(6, metaData.getModules().size());
+      ModuleMetaData rar = metaData.getModule("rar0.rar");
+      assertEquals("connector0", rar.getId());
+      assertEquals(ModuleType.Connector, rar.getType());
+      assertEquals("META-INF/alt-ra.xml", rar.getAlternativeDD());
+      ModuleMetaData car = metaData.getModule("client0.jar");
+      assertEquals("java0", car.getId());
+      assertEquals(ModuleType.Client, car.getType());
+      assertEquals("META-INF/alt-application-client.xml", car.getAlternativeDD());
+      ModuleMetaData ejb1 = metaData.getModule("ejb-jar1.jar");
+      assertEquals("ejb1", ejb1.getId());
+      assertEquals(ModuleType.Ejb, ejb1.getType());
+      assertEquals("META-INF/alt-ejb-jar.xml", ejb1.getAlternativeDD());
+      ModuleMetaData web1 = metaData.getModule("web-app1.war");
+      assertEquals("web1", web1.getId());
+      assertEquals(ModuleType.Web, web1.getType());
+      assertEquals("WEB-INF/alt-web.xml", web1.getAlternativeDD());
+      WebModuleMetaData wm1 = (WebModuleMetaData) web1.getValue();
+      assertEquals("/web1", wm1.getContextRoot());
+
+      SecurityRolesMetaData roles = metaData.getSecurityRoles();
+      assertEquals(2, roles.size());
+      SecurityRoleMetaData r0 = roles.get("role0");
+      assertEquals("security-role0", r0.getId());
+      assertEquals("The 0 security role", r0.getDescriptions().value()[0].value());
+      SecurityRoleMetaData r1 = roles.get("role1");
+      assertEquals("security-role1", r1.getId());
+      assertEquals("The 1 security role", r1.getDescriptions().value()[0].value());
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,151 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.ear;
-
-
-import junit.framework.Test;
-
-import org.jboss.annotation.javaee.Description;
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.annotation.javaee.DisplayName;
-import org.jboss.annotation.javaee.DisplayNames;
-import org.jboss.annotation.javaee.Icon;
-import org.jboss.annotation.javaee.Icons;
-import org.jboss.metadata.ear.spec.Ear50MetaData;
-import org.jboss.metadata.ear.spec.Ear5xMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.IconImpl;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
-/**
- * Ear5x tests
- * 
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class Ear5xUnitTestCase extends AbstractJavaEEMetaDataTest
-{
-   public static Test suite()
-   {
-      return suite(Ear5xUnitTestCase.class);
-   }
-
-   public static boolean validateSchema()
-   {
-      return true;
-   }
-
-   public static SchemaBindingResolver initResolver()
-   {
-      return schemaResolverForClass(Ear50MetaData.class);
-   }
-   
-   public Ear5xUnitTestCase(String name)
-   {
-      super(name);
-   }
-   
-   protected Ear5xMetaData unmarshal() throws Exception
-   {
-      return unmarshal(Ear50MetaData.class);
-   }
-
-   public void testId() throws Exception
-   {
-      Ear5xMetaData result = unmarshal();
-      assertEquals("application-test-id", result.getId());
-   }
-   
-   public void testVersion() throws Exception
-   {
-      Ear5xMetaData result = unmarshal();
-      assertEquals("5", result.getVersion());
-      assertFalse(result.isEE14());
-      assertTrue(result.isEE5());
-   }
-
-   public void testDescriptionGroup() throws Exception
-   {
-      Ear5xMetaData result = unmarshal();
-      DescriptionGroupMetaData group = result.getDescriptionGroup();
-      assertNotNull(group);
-      Descriptions descriptions = group.getDescriptions();
-      assertNotNull(descriptions);
-      
-      DescriptionImpl en = new DescriptionImpl();
-      en.setDescription("en-ear-desc");
-      DescriptionImpl de = new DescriptionImpl();
-      de.setDescription("de-ear-desc");
-      de.setLanguage("de");
-      DescriptionImpl fr = new DescriptionImpl();
-      fr.setDescription("fr-ear-desc");
-      fr.setLanguage("fr");
-      
-      Description[] expected = {en, fr, de};
-      assertEquals(expected, descriptions.value());
-
-      DisplayNames displayNames = group.getDisplayNames();
-      assertNotNull(displayNames);
-      
-      DisplayNameImpl endn = new DisplayNameImpl();
-      endn.setDisplayName("en-ear-disp");
-      DisplayNameImpl frdn = new DisplayNameImpl();
-      frdn.setDisplayName("fr-ear-disp");
-      frdn.setLanguage("fr");
-      DisplayNameImpl dedn = new DisplayNameImpl();
-      dedn.setDisplayName("de-ear-disp");
-      dedn.setLanguage("de");
-
-      DisplayName[] expecteddns = {endn, frdn, dedn};
-      assertEquals(expecteddns, displayNames.value());
-
-      Icons icons = group.getIcons();
-      assertNotNull(icons);
-      IconImpl enicn = new IconImpl();
-      enicn.setId("en-ear-icon-id");
-      enicn.setSmallIcon("en-ear-small-icon");
-      enicn.setLargeIcon("en-ear-large-icon");
-      IconImpl fricn = new IconImpl();
-      fricn.setLanguage("fr");
-      fricn.setId("fr-ear-icon-id");
-      fricn.setSmallIcon("fr-ear-small-icon");
-      fricn.setLargeIcon("fr-ear-large-icon");
-      IconImpl deicn = new IconImpl();
-      deicn.setLanguage("de");
-      deicn.setId("de-ear-icon-id");
-      deicn.setSmallIcon("de-ear-small-icon");
-      deicn.setLargeIcon("de-ear-large-icon");
-      
-      Icon[] expectedicns = {enicn, fricn, deicn};
-      assertEquals(expectedicns, icons.value());
-   }
-
-   public void testWhitespace()
-      throws Exception
-   {
-      Ear5xMetaData result = unmarshal();
-      assertEquals(4, result.getModules().size());
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java (from rev 76701, projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,160 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.ear;
+
+
+import junit.framework.Test;
+
+import org.jboss.annotation.javaee.Description;
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.annotation.javaee.DisplayName;
+import org.jboss.annotation.javaee.DisplayNames;
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.spec.Ear50MetaData;
+import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Ear5x tests
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class Ear5xUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+   public static Test suite()
+   {
+      return suite(Ear5xUnitTestCase.class);
+   }
+
+   public static boolean validateSchema()
+   {
+      return true;
+   }
+
+   public static SchemaBindingResolver initResolver()
+   {
+      return schemaResolverForClass(Ear50MetaData.class);
+   }
+   
+   public Ear5xUnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   protected Ear5xMetaData unmarshal() throws Exception
+   {
+      return unmarshal(Ear50MetaData.class);
+   }
+
+   public void testId() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      assertEquals("application-test-id", result.getId());
+   }
+   
+   public void testVersion() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      assertEquals("5", result.getVersion());
+      assertFalse(result.isEE14());
+      assertTrue(result.isEE5());
+   }
+
+   public void testDescriptionGroup() throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      DescriptionGroupMetaData group = result.getDescriptionGroup();
+      assertNotNull(group);
+      Descriptions descriptions = group.getDescriptions();
+      assertNotNull(descriptions);
+      
+      DescriptionImpl en = new DescriptionImpl();
+      en.setDescription("en-ear-desc");
+      DescriptionImpl de = new DescriptionImpl();
+      de.setDescription("de-ear-desc");
+      de.setLanguage("de");
+      DescriptionImpl fr = new DescriptionImpl();
+      fr.setDescription("fr-ear-desc");
+      fr.setLanguage("fr");
+      
+      Description[] expected = {en, fr, de};
+      assertEquals(expected, descriptions.value());
+
+      DisplayNames displayNames = group.getDisplayNames();
+      assertNotNull(displayNames);
+      
+      DisplayNameImpl endn = new DisplayNameImpl();
+      endn.setDisplayName("en-ear-disp");
+      DisplayNameImpl frdn = new DisplayNameImpl();
+      frdn.setDisplayName("fr-ear-disp");
+      frdn.setLanguage("fr");
+      DisplayNameImpl dedn = new DisplayNameImpl();
+      dedn.setDisplayName("de-ear-disp");
+      dedn.setLanguage("de");
+
+      DisplayName[] expecteddns = {endn, frdn, dedn};
+      assertEquals(expecteddns, displayNames.value());
+
+      Icons icons = group.getIcons();
+      assertNotNull(icons);
+      IconImpl enicn = new IconImpl();
+      enicn.setId("en-ear-icon-id");
+      enicn.setSmallIcon("en-ear-small-icon");
+      enicn.setLargeIcon("en-ear-large-icon");
+      IconImpl fricn = new IconImpl();
+      fricn.setLanguage("fr");
+      fricn.setId("fr-ear-icon-id");
+      fricn.setSmallIcon("fr-ear-small-icon");
+      fricn.setLargeIcon("fr-ear-large-icon");
+      IconImpl deicn = new IconImpl();
+      deicn.setLanguage("de");
+      deicn.setId("de-ear-icon-id");
+      deicn.setSmallIcon("de-ear-small-icon");
+      deicn.setLargeIcon("de-ear-large-icon");
+      
+      Icon[] expectedicns = {enicn, fricn, deicn};
+      assertEquals(expectedicns, icons.value());
+   }
+
+   public void testWhitespace()
+      throws Exception
+   {
+      Ear5xMetaData result = unmarshal();
+      ModulesMetaData modules = result.getModules();
+      assertEquals(4, modules.size());
+      assertEquals("transport_ejb_vehicle_client.jar", modules.get(0).getName());
+      assertEquals("transport_ejb_vehicle_ejb.jar", modules.get(1).getName());
+      assertEquals("transport_jsp_vehicle_web.war", modules.get(2).getName());
+      assertEquals("transport_servlet_vehicle_web.war", modules.get(3).getName());
+      assertEquals("transport_servlet_vehicle", ((WebModuleMetaData)modules.get(3).getValue()).getContextRoot());
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.metadata.ejb.whitespace;
-
-import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
-/**
- * JBAS-4612
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class WhitespaceUnitTestCase extends AbstractJavaEEMetaDataTest
-{
-
-   public WhitespaceUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static SchemaBindingResolver initResolver()
-   {
-      return schemaResolverForClass(EjbJar30MetaData.class);
-   }
-
-   public void testEnvEntry() throws Exception
-   {
-      EjbJar3xMetaData xml = unmarshal();
-      assertEquals("Whitespace", xml.getDescriptionGroup().getDisplayNames().value()[0].value());
-      assertEquals(1, xml.getEnterpriseBeans().size());
-      IEnterpriseBeanMetaData bean = xml.getEnterpriseBeans().iterator().next();
-      assertTrue(bean instanceof SessionBeanMetaData);
-      assertEquals("WhitespaceBean", bean.getEjbName());
-      assertEquals(1, bean.getEnvironmentEntries().size());
-      EnvironmentEntryMetaData envEntry = bean.getEnvironmentEntries().iterator().next();
-      assertEquals("whitespace", envEntry.getEnvEntryName());
-      assertEquals("java.lang.String", envEntry.getType());
-      assertEquals(" ", envEntry.getValue());
-   }
-   
-   protected EjbJar3xMetaData unmarshal() throws Exception
-   {
-      return unmarshal(EjbJar30MetaData.class);
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java (from rev 76701, projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.ejb.whitespace;
+
+import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar1xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * JBAS-4612
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class WhitespaceUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+
+   public WhitespaceUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static SchemaBindingResolver initResolver()
+   {
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("ejb-jar_1_1.dtd", EjbJar1xMetaData.class);
+      resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
+      resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
+      resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
+      resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
+      resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
+      resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
+      resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
+      resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
+      // Set the JBoss50DTDMetaData class as the default for the jboss root element
+      resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
+      // Workaround wildard resolution slowness
+      resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
+      resolver.addClassBinding("http://java.sun.com/xml/ns/javaee", EjbJar30MetaData.class);
+      return resolver;
+   }
+
+   public void testEjbJar30EnvEntry() throws Exception
+   {
+      EjbJar3xMetaData xml = unmarshal(EjbJar30MetaData.class);
+      assertEjbJarEnvEntry(xml);
+   }
+
+   public void testEjbJar20EnvEntry() throws Exception
+   {
+      EjbJarMetaData xml = unmarshal(EjbJar20MetaData.class);
+      assertEjbJarEnvEntry(xml);
+   }
+
+   public void testEjbJar21EnvEntry() throws Exception
+   {
+      EjbJarMetaData xml = unmarshal(EjbJar21MetaData.class);
+      assertEjbJarEnvEntry(xml);
+   }
+
+   public void testEjbJar1xEnvEntry() throws Exception
+   {
+      EjbJarMetaData xml = unmarshal(EjbJar1xMetaData.class);
+      assertEjbJarEnvEntry(xml);
+   }
+
+   public void testJBoss50DTDEjbRef() throws Exception
+   {
+      JBoss50DTDMetaData jboss = unmarshal(JBoss50DTDMetaData.class);
+      assertJBossEjbRef(jboss);
+   }
+
+   public void testJBoss50EjbRef() throws Exception
+   {
+      JBossMetaData jboss = unmarshal(JBoss50MetaData.class);
+      assertJBossEjbRef(jboss);
+   }
+
+   private void assertJBossEjbRef(JBossMetaData jboss)
+   {
+      JBossEnterpriseBeanMetaData bean = jboss.getEnterpriseBean("SessionB");
+      assertNotNull(bean);
+      EJBReferenceMetaData ejbRef = bean.getEjbReferenceByName("ejb/NoLinkSessionA");
+      assertNotNull(ejbRef);
+      assertEquals("naming/SessionA", ejbRef.getJndiName());
+   }
+
+   private void assertEjbJarEnvEntry(EjbJarMetaData xml)
+   {
+      assertEquals("Whitespace", xml.getDescriptionGroup().getDisplayNames().value()[0].value());
+      assertEquals(1, xml.getEnterpriseBeans().size());
+      IEnterpriseBeanMetaData bean = xml.getEnterpriseBeans().iterator().next();
+      assertTrue(bean instanceof SessionBeanMetaData);
+      assertEquals("WhitespaceBean", bean.getEjbName());
+      assertEquals(1, bean.getEnvironmentEntries().size());
+      EnvironmentEntryMetaData envEntry = bean.getEnvironmentEntries().iterator().next();
+      assertEquals("whitespace", envEntry.getEnvEntryName());
+      assertEquals("java.lang.String", envEntry.getType());
+      assertEquals(" ", envEntry.getValue());
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.metadata.web;
-
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.web.spec.Web23MetaData;
-import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
-/**
- * Test all entries of 2.3 web-app
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: $
- */
-public class WebApp23UnitTestCase extends AbstractJavaEEEverythingTest
-{
-
-   public WebApp23UnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   protected void assertEverything(WebMetaData webApp)
-   {
-      DescriptionGroupMetaData dg = webApp.getDescriptionGroup();
-      assertNotNull(dg);
-      assertEquals("web-app-desc", dg.getDescription());
-      assertEquals("web-app_2_3-display-name", dg.getDisplayName());
-   }
-
-   public static SchemaBindingResolver initResolver()
-   {
-      return schemaResolverForClass(Web23MetaData.class);
-   }
-   
-   public void testEverything() throws Exception
-   {
-      WebMetaData webApp = unmarshal();
-      assertEverything(webApp);
-   }
-   public void testVersion() throws Exception
-   {
-      Web23MetaData webApp = (Web23MetaData) unmarshal();
-      DescriptionGroupMetaData dg = webApp.getDescriptionGroup();
-      assertNotNull(dg);
-      assertEquals("A servlet 2.3 descriptor", dg.getDescription());
-      assertEquals("web-app_2_3", webApp.getId());
-      assertEquals("2.3", webApp.getVersion());
-      assertEquals("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", webApp.getDtdPublicId());
-      assertEquals("web-app_2_3-display-name", dg.getDisplayName());
-   }
-
-   protected WebMetaData unmarshal() throws Exception
-   {
-      return unmarshal(Web23MetaData.class);
-   }
-}

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java (from rev 76701, projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.web;
+
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.metadata.web.spec.Web23MetaData;
+import org.jboss.metadata.web.spec.WebMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test all entries of 2.3 web-app
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class WebApp23UnitTestCase extends AbstractJavaEEEverythingTest
+{
+
+   public WebApp23UnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   protected void assertEverything(WebMetaData webApp)
+   {
+      DescriptionGroupMetaData dg = webApp.getDescriptionGroup();
+      assertNotNull(dg);
+      assertEquals("web-app-desc", dg.getDescription());
+      assertEquals("web-app_2_3-display-name", dg.getDisplayName());
+      ServletMetaData servlet = webApp.getServlets().get("servlet0-name");
+      assertNotNull(servlet);
+      assertEquals("servlet0.class", servlet.getServletClass());
+   }
+
+   public static SchemaBindingResolver initResolver()
+   {
+      return schemaResolverForClass(Web23MetaData.class);
+   }
+   
+   public void testEverything() throws Exception
+   {
+      WebMetaData webApp = unmarshal();
+      assertEverything(webApp);
+   }
+   public void testVersion() throws Exception
+   {
+      Web23MetaData webApp = (Web23MetaData) unmarshal();
+      DescriptionGroupMetaData dg = webApp.getDescriptionGroup();
+      assertNotNull(dg);
+      assertEquals("A servlet 2.3 descriptor", dg.getDescription());
+      assertEquals("web-app_2_3", webApp.getId());
+      assertEquals("2.3", webApp.getVersion());
+      assertEquals("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", webApp.getDtdPublicId());
+      assertEquals("web-app_2_3-display-name", dg.getDisplayName());
+   }
+
+   protected WebMetaData unmarshal() throws Exception
+   {
+      return unmarshal(Web23MetaData.class);
+   }
+}

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
-   version="1.4"
-   id="appclient-test">
-   <!-- description group -->
-   <description>en-application-client-desc</description>
-   <description xml:lang="fr">fr-application-client-desc</description>
-   <description xml:lang="de">de-application-client-desc</description>
-   <display-name>en-application-client-disp</display-name>
-   <display-name xml:lang="fr">fr-application-client-disp</display-name>
-   <display-name xml:lang="de">de-application-client-disp</display-name>
-   <icon id="en-application-client-icon-id">
-      <small-icon>en-application-client-small-icon</small-icon>
-      <large-icon>en-application-client-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="fr" id="fr-application-client-icon-id">
-      <small-icon>fr-application-client-small-icon</small-icon>
-      <large-icon>fr-application-client-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="de" id="de-application-client-icon-id">
-      <small-icon>de-application-client-small-icon</small-icon>
-      <large-icon>de-application-client-large-icon</large-icon>
-   </icon>
-   
-   <!-- env entry -->
-   <env-entry id="appClientEnvEntry1-id">
-      <description>en-appClientEnvEntry1-desc</description>
-      <description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
-      <description xml:lang="de">de-appClientEnvEntry1-desc</description>
-      <env-entry-name>appClientEnvEntry1Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
-      <env-entry-value>appClientEnvEntry1Value</env-entry-value>
-   </env-entry>
-   <env-entry id="appClientEnvEntry2-id">
-      <description>en-appClientEnvEntry2-desc</description>
-      <description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
-      <description xml:lang="de">de-appClientEnvEntry2-desc</description>
-      <env-entry-name>appClientEnvEntry2Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
-      <env-entry-value>appClientEnvEntry2Value</env-entry-value>
-   </env-entry>
-   
-   <!-- ejb ref -->
-   <ejb-ref id="appClientEjbRef1-id">
-      <description>en-appClientEjbRef1-desc</description>
-      <description xml:lang="fr">fr-appClientEjbRef1-desc</description>
-      <description xml:lang="de">de-appClientEjbRef1-desc</description>
-      <ejb-ref-name>appClientEjbRef1Name</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <home>appClientEjbRef1Home</home>
-      <remote>appClientEjbRef1Remote</remote>
-      <ejb-link>appClientEjbRef1EjbLink</ejb-link>
-   </ejb-ref>
-   <ejb-ref id="appClientEjbRef2-id">
-      <description>en-appClientEjbRef2-desc</description>
-      <description xml:lang="fr">fr-appClientEjbRef2-desc</description>
-      <description xml:lang="de">de-appClientEjbRef2-desc</description>
-      <ejb-ref-name>appClientEjbRef2Name</ejb-ref-name>
-      <ejb-ref-type>Entity</ejb-ref-type>
-      <home>appClientEjbRef2Home</home>
-      <remote>appClientEjbRef2Remote</remote>
-      <ejb-link>appClientEjbRef2EjbLink</ejb-link>
-   </ejb-ref>
-
-   <!-- service ref -->
-   <service-ref id="appClientServiceRef1-id">
-      <description>en-appClientServiceRef1-desc</description>
-      <description xml:lang="fr">fr-appClientServiceRef1-desc</description>
-      <description xml:lang="de">de-appClientServiceRef1-desc</description>
-      <service-ref-name>appClientServiceRef1Name</service-ref-name>
-      <service-interface>appClientServiceRef1Iface</service-interface>
-   </service-ref>
-   <service-ref id="appClientServiceRef2-id">
-      <description>en-appClientServiceRef2-desc</description>
-      <description xml:lang="fr">fr-appClientServiceRef2-desc</description>
-      <description xml:lang="de">de-appClientServiceRef2-desc</description>
-      <service-ref-name>appClientServiceRef2Name</service-ref-name>
-      <service-interface>appClientServiceRef2Iface</service-interface>
-   </service-ref>
-
-   <!-- resource ref -->
-   <resource-ref id="appClientResourceRef1-id">
-      <description>en-appClientResourceRef1-desc</description>
-      <description xml:lang="fr">fr-appClientResourceRef1-desc</description>
-      <description xml:lang="de">de-appClientResourceRef1-desc</description>
-      <res-ref-name>appClientResourceRef1Name</res-ref-name>
-      <res-type>appClientResourceRef1Type</res-type>
-      <res-auth>Application</res-auth>
-      <res-sharing-scope>Shareable</res-sharing-scope>
-   </resource-ref>
-   <resource-ref id="appClientResourceRef2-id">
-      <description>en-appClientResourceRef2-desc</description>
-      <description xml:lang="fr">fr-appClientResourceRef2-desc</description>
-      <description xml:lang="de">de-appClientResourceRef2-desc</description>
-      <res-ref-name>appClientResourceRef2Name</res-ref-name>
-      <res-type>appClientResourceRef2Type</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Unshareable</res-sharing-scope>
-   </resource-ref>
-   
-   <!-- resource env ref -->
-   <resource-env-ref id="appClientResourceEnvRef1-id">
-      <description>en-appClientResourceEnvRef1-desc</description>
-      <description xml:lang="fr">fr-appClientResourceEnvRef1-desc</description>
-      <description xml:lang="de">de-appClientResourceEnvRef1-desc</description>
-      <resource-env-ref-name>appClientResourceEnvRef1Name</resource-env-ref-name>
-      <resource-env-ref-type>appClientResourceEnvRef1Type</resource-env-ref-type>
-   </resource-env-ref>
-   <resource-env-ref id="appClientResourceEnvRef2-id">
-      <description>en-appClientResourceEnvRef2-desc</description>
-      <description xml:lang="fr">fr-appClientResourceEnvRef2-desc</description>
-      <description xml:lang="de">de-appClientResourceEnvRef2-desc</description>
-      <resource-env-ref-name>appClientResourceEnvRef2Name</resource-env-ref-name>
-      <resource-env-ref-type>appClientResourceEnvRef2Type</resource-env-ref-type>
-   </resource-env-ref>
-   
-   <!-- message destination ref -->
-   <message-destination-ref id="appClientMessageDestinationRef1-id">
-      <description>en-appClientMessageDestinationRef1-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestinationRef1-desc</description>
-      <description xml:lang="de">de-appClientMessageDestinationRef1-desc</description>
-      <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
-      <message-destination-type>appClientMessageDestinationRef1Type</message-destination-type>
-      <message-destination-usage>Consumes</message-destination-usage>
-      <message-destination-link>appClientMessageDestinationRef1Link</message-destination-link>
-   </message-destination-ref>
-   <message-destination-ref id="appClientMessageDestinationRef2-id">
-      <description>en-appClientMessageDestinationRef2-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestinationRef2-desc</description>
-      <description xml:lang="de">de-appClientMessageDestinationRef2-desc</description>
-      <message-destination-ref-name>appClientMessageDestinationRef2Name</message-destination-ref-name>
-      <message-destination-type>appClientMessageDestinationRef2Type</message-destination-type>
-      <message-destination-usage>Produces</message-destination-usage>
-      <message-destination-link>appClientMessageDestinationRef2Link</message-destination-link>
-   </message-destination-ref>
-   <message-destination-ref id="appClientMessageDestinationRef3-id">
-      <description>en-appClientMessageDestinationRef3-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestinationRef3-desc</description>
-      <description xml:lang="de">de-appClientMessageDestinationRef3-desc</description>
-      <message-destination-ref-name>appClientMessageDestinationRef3Name</message-destination-ref-name>
-      <message-destination-type>appClientMessageDestinationRef3Type</message-destination-type>
-      <message-destination-usage>ConsumesProduces</message-destination-usage>
-      <message-destination-link>appClientMessageDestinationRef3Link</message-destination-link>
-   </message-destination-ref>
-   
-   <!-- callback handler -->
-   <callback-handler id="appClientCallbackHandler-id">org.jboss.test.metadata.client.AppClientCallbackHandler</callback-handler>
-   
-   <!-- message destination -->
-   <message-destination id="appClientMessageDestination1-id">
-      <description>en-appClientMessageDestination1-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestination1-desc</description>
-      <description xml:lang="de">de-appClientMessageDestination1-desc</description>
-      <display-name>en-appClientMessageDestination1-disp</display-name>
-      <display-name xml:lang="fr">fr-appClientMessageDestination1-disp</display-name>
-      <display-name xml:lang="de">de-appClientMessageDestination1-disp</display-name>
-      <icon id="en-appClientMessageDestination1-icon-id">
-         <small-icon>en-appClientMessageDestination1-small-icon</small-icon>
-         <large-icon>en-appClientMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-appClientMessageDestination1-icon-id">
-         <small-icon>fr-appClientMessageDestination1-small-icon</small-icon>
-         <large-icon>fr-appClientMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-appClientMessageDestination1-icon-id">
-         <small-icon>de-appClientMessageDestination1-small-icon</small-icon>
-         <large-icon>de-appClientMessageDestination1-large-icon</large-icon>
-      </icon>
-      <message-destination-name>appClientMessageDestination1Name</message-destination-name>
-   </message-destination>
-   <message-destination id="appClientMessageDestination2-id">
-      <description>en-appClientMessageDestination2-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestination2-desc</description>
-      <description xml:lang="de">de-appClientMessageDestination2-desc</description>
-      <display-name>en-appClientMessageDestination2-disp</display-name>
-      <display-name xml:lang="fr">fr-appClientMessageDestination2-disp</display-name>
-      <display-name xml:lang="de">de-appClientMessageDestination2-disp</display-name>
-      <icon id="en-appClientMessageDestination2-icon-id">
-         <small-icon>en-appClientMessageDestination2-small-icon</small-icon>
-         <large-icon>en-appClientMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-appClientMessageDestination2-icon-id">
-         <small-icon>fr-appClientMessageDestination2-small-icon</small-icon>
-         <large-icon>fr-appClientMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-appClientMessageDestination2-icon-id">
-         <small-icon>de-appClientMessageDestination2-small-icon</small-icon>
-         <large-icon>de-appClientMessageDestination2-large-icon</large-icon>
-      </icon>
-      <message-destination-name>appClientMessageDestination2Name</message-destination-name>
-   </message-destination>
-</application-client>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+   version="1.4"
+   id="appclient-test">
+   <!-- description group -->
+   <description>en-application-client-desc</description>
+   <description xml:lang="fr">fr-application-client-desc</description>
+   <description xml:lang="de">de-application-client-desc</description>
+   <display-name>en-application-client-disp</display-name>
+   <display-name xml:lang="fr">fr-application-client-disp</display-name>
+   <display-name xml:lang="de">de-application-client-disp</display-name>
+   <icon id="en-application-client-icon-id">
+      <small-icon>en-application-client-small-icon</small-icon>
+      <large-icon>en-application-client-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="fr" id="fr-application-client-icon-id">
+      <small-icon>fr-application-client-small-icon</small-icon>
+      <large-icon>fr-application-client-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="de" id="de-application-client-icon-id">
+      <small-icon>de-application-client-small-icon</small-icon>
+      <large-icon>de-application-client-large-icon</large-icon>
+   </icon>
+   
+   <!-- env entry -->
+   <env-entry id="appClientEnvEntry1-id">
+      <description>en-appClientEnvEntry1-desc</description>
+      <description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
+      <description xml:lang="de">de-appClientEnvEntry1-desc</description>
+      <env-entry-name>
+         appClientEnvEntry1Name
+      </env-entry-name>
+      <env-entry-type>java.lang.String</env-entry-type>
+      <env-entry-value>appClientEnvEntry1Value</env-entry-value>
+   </env-entry>
+   <env-entry id="appClientEnvEntry2-id">
+      <description>en-appClientEnvEntry2-desc</description>
+      <description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
+      <description xml:lang="de">de-appClientEnvEntry2-desc</description>
+      <env-entry-name>appClientEnvEntry2Name</env-entry-name>
+      <env-entry-type>java.lang.String</env-entry-type>
+      <env-entry-value>appClientEnvEntry2Value</env-entry-value>
+   </env-entry>
+   
+   <!-- ejb ref -->
+   <ejb-ref id="appClientEjbRef1-id">
+      <description>en-appClientEjbRef1-desc</description>
+      <description xml:lang="fr">fr-appClientEjbRef1-desc</description>
+      <description xml:lang="de">de-appClientEjbRef1-desc</description>
+      <ejb-ref-name>appClientEjbRef1Name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <home>appClientEjbRef1Home</home>
+      <remote>appClientEjbRef1Remote</remote>
+      <ejb-link>appClientEjbRef1EjbLink</ejb-link>
+   </ejb-ref>
+   <ejb-ref id="appClientEjbRef2-id">
+      <description>en-appClientEjbRef2-desc</description>
+      <description xml:lang="fr">fr-appClientEjbRef2-desc</description>
+      <description xml:lang="de">de-appClientEjbRef2-desc</description>
+      <ejb-ref-name>appClientEjbRef2Name</ejb-ref-name>
+      <ejb-ref-type>Entity</ejb-ref-type>
+      <home>appClientEjbRef2Home</home>
+      <remote>appClientEjbRef2Remote</remote>
+      <ejb-link>appClientEjbRef2EjbLink</ejb-link>
+   </ejb-ref>
+
+   <!-- service ref -->
+   <service-ref id="appClientServiceRef1-id">
+      <description>en-appClientServiceRef1-desc</description>
+      <description xml:lang="fr">fr-appClientServiceRef1-desc</description>
+      <description xml:lang="de">de-appClientServiceRef1-desc</description>
+      <service-ref-name>appClientServiceRef1Name</service-ref-name>
+      <service-interface>appClientServiceRef1Iface</service-interface>
+   </service-ref>
+   <service-ref id="appClientServiceRef2-id">
+      <description>en-appClientServiceRef2-desc</description>
+      <description xml:lang="fr">fr-appClientServiceRef2-desc</description>
+      <description xml:lang="de">de-appClientServiceRef2-desc</description>
+      <service-ref-name>appClientServiceRef2Name</service-ref-name>
+      <service-interface>appClientServiceRef2Iface</service-interface>
+   </service-ref>
+
+   <!-- resource ref -->
+   <resource-ref id="appClientResourceRef1-id">
+      <description>en-appClientResourceRef1-desc</description>
+      <description xml:lang="fr">fr-appClientResourceRef1-desc</description>
+      <description xml:lang="de">de-appClientResourceRef1-desc</description>
+      <res-ref-name>appClientResourceRef1Name</res-ref-name>
+      <res-type>appClientResourceRef1Type</res-type>
+      <res-auth>Application</res-auth>
+      <res-sharing-scope>Shareable</res-sharing-scope>
+   </resource-ref>
+   <resource-ref id="appClientResourceRef2-id">
+      <description>en-appClientResourceRef2-desc</description>
+      <description xml:lang="fr">fr-appClientResourceRef2-desc</description>
+      <description xml:lang="de">de-appClientResourceRef2-desc</description>
+      <res-ref-name>appClientResourceRef2Name</res-ref-name>
+      <res-type>appClientResourceRef2Type</res-type>
+      <res-auth>Container</res-auth>
+      <res-sharing-scope>Unshareable</res-sharing-scope>
+   </resource-ref>
+   
+   <!-- resource env ref -->
+   <resource-env-ref id="appClientResourceEnvRef1-id">
+      <description>en-appClientResourceEnvRef1-desc</description>
+      <description xml:lang="fr">fr-appClientResourceEnvRef1-desc</description>
+      <description xml:lang="de">de-appClientResourceEnvRef1-desc</description>
+      <resource-env-ref-name>appClientResourceEnvRef1Name</resource-env-ref-name>
+      <resource-env-ref-type>appClientResourceEnvRef1Type</resource-env-ref-type>
+   </resource-env-ref>
+   <resource-env-ref id="appClientResourceEnvRef2-id">
+      <description>en-appClientResourceEnvRef2-desc</description>
+      <description xml:lang="fr">fr-appClientResourceEnvRef2-desc</description>
+      <description xml:lang="de">de-appClientResourceEnvRef2-desc</description>
+      <resource-env-ref-name>appClientResourceEnvRef2Name</resource-env-ref-name>
+      <resource-env-ref-type>appClientResourceEnvRef2Type</resource-env-ref-type>
+   </resource-env-ref>
+   
+   <!-- message destination ref -->
+   <message-destination-ref id="appClientMessageDestinationRef1-id">
+      <description>en-appClientMessageDestinationRef1-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef1-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef1-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef1Type</message-destination-type>
+      <message-destination-usage>Consumes</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef1Link</message-destination-link>
+   </message-destination-ref>
+   <message-destination-ref id="appClientMessageDestinationRef2-id">
+      <description>en-appClientMessageDestinationRef2-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef2-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef2-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef2Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef2Type</message-destination-type>
+      <message-destination-usage>Produces</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef2Link</message-destination-link>
+   </message-destination-ref>
+   <message-destination-ref id="appClientMessageDestinationRef3-id">
+      <description>en-appClientMessageDestinationRef3-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef3-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef3-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef3Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef3Type</message-destination-type>
+      <message-destination-usage>ConsumesProduces</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef3Link</message-destination-link>
+   </message-destination-ref>
+   
+   <!-- callback handler -->
+   <callback-handler id="appClientCallbackHandler-id">org.jboss.test.metadata.client.AppClientCallbackHandler</callback-handler>
+   
+   <!-- message destination -->
+   <message-destination id="appClientMessageDestination1-id">
+      <description>en-appClientMessageDestination1-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestination1-desc</description>
+      <description xml:lang="de">de-appClientMessageDestination1-desc</description>
+      <display-name>en-appClientMessageDestination1-disp</display-name>
+      <display-name xml:lang="fr">fr-appClientMessageDestination1-disp</display-name>
+      <display-name xml:lang="de">de-appClientMessageDestination1-disp</display-name>
+      <icon id="en-appClientMessageDestination1-icon-id">
+         <small-icon>en-appClientMessageDestination1-small-icon</small-icon>
+         <large-icon>en-appClientMessageDestination1-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="fr" id="fr-appClientMessageDestination1-icon-id">
+         <small-icon>fr-appClientMessageDestination1-small-icon</small-icon>
+         <large-icon>fr-appClientMessageDestination1-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="de" id="de-appClientMessageDestination1-icon-id">
+         <small-icon>de-appClientMessageDestination1-small-icon</small-icon>
+         <large-icon>de-appClientMessageDestination1-large-icon</large-icon>
+      </icon>
+      <message-destination-name>appClientMessageDestination1Name</message-destination-name>
+   </message-destination>
+   <message-destination id="appClientMessageDestination2-id">
+      <description>en-appClientMessageDestination2-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestination2-desc</description>
+      <description xml:lang="de">de-appClientMessageDestination2-desc</description>
+      <display-name>en-appClientMessageDestination2-disp</display-name>
+      <display-name xml:lang="fr">fr-appClientMessageDestination2-disp</display-name>
+      <display-name xml:lang="de">de-appClientMessageDestination2-disp</display-name>
+      <icon id="en-appClientMessageDestination2-icon-id">
+         <small-icon>en-appClientMessageDestination2-small-icon</small-icon>
+         <large-icon>en-appClientMessageDestination2-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="fr" id="fr-appClientMessageDestination2-icon-id">
+         <small-icon>fr-appClientMessageDestination2-small-icon</small-icon>
+         <large-icon>fr-appClientMessageDestination2-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="de" id="de-appClientMessageDestination2-icon-id">
+         <small-icon>de-appClientMessageDestination2-small-icon</small-icon>
+         <large-icon>de-appClientMessageDestination2-large-icon</large-icon>
+      </icon>
+      <message-destination-name>appClientMessageDestination2Name</message-destination-name>
+   </message-destination>
+</application-client>
\ No newline at end of file

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client version="1.4"
-    xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
-    
-    <description>A sample application client descriptor</description>
-    <display-name>J2EE Client Tests</display-name>
-    
-    <env-entry>
-        <env-entry-name>String0</env-entry-name>
-        <env-entry-type>java.lang.String</env-entry-type>
-        <env-entry-value>String0Value</env-entry-value>
-    </env-entry>
-    <env-entry>
-        <env-entry-name>Float0</env-entry-name>
-        <env-entry-type>java.lang.Float</env-entry-type>
-        <env-entry-value>3.14</env-entry-value>
-    </env-entry>
-    <env-entry>
-        <env-entry-name>Long0</env-entry-name>
-        <env-entry-type>java.lang.Long</env-entry-type>
-        <env-entry-value>123456789</env-entry-value>
-    </env-entry>
-    
-    <ejb-ref>
-        <ejb-ref-name>ejb/StatelessSessionBean</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <home>org.jboss.test.cts.interfaces.StatelessSessionHome</home>
-        <remote>org.jboss.test.cts.interfaces.StatelessSession</remote>
-    </ejb-ref>
-    <ejb-ref>
-        <ejb-ref-name>ejb/StatelessSessionBean2</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <home>org.jboss.test.cts.interfaces.StatelessSessionHome</home>
-        <remote>org.jboss.test.cts.interfaces.StatelessSession</remote>
-        <ejb-link>StatelessSessionBean</ejb-link>
-    </ejb-ref>
-    
-    <!-- URL Connection Factories (java:comp/env/url) -->
-    <resource-ref>
-        <description>The JBoss Web Site HomePage</description>
-        <res-ref-name>url/JBossHome</res-ref-name>
-        <res-type>java.net.URL</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref>
-    <resource-ref>
-        <description>SomeWebSite HomePage</description>
-        <res-ref-name>url/IndirectURL</res-ref-name>
-        <res-type>java.net.URL</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref>
-    
-    <!-- A JMS destination (java:comp/env/jms) -->
-    <resource-env-ref>
-        <description>A test of the resource-env-ref tag</description>
-        <resource-env-ref-name>jms/aQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-    </resource-env-ref>
-    
-    <message-destination-ref>
-        <description>A message-destination-ref needing a jboss/resource-env-ref</description>
-        <message-destination-ref-name>jms/anotherQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
-        <message-destination-usage>Consumes</message-destination-usage>
-    </message-destination-ref>
-    
-    <message-destination-ref>
-        <message-destination-ref-name>jms/anotherQueue2</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
-        <message-destination-usage>Consumes</message-destination-usage>
-        <message-destination-link>TheOtherQueue</message-destination-link>
-    </message-destination-ref>
-    
-    <callback-handler>org.jboss.test.client.test.SystemPropertyCallbackHandler</callback-handler>
-    
-    <message-destination id="TheOtherQueue-id">
-        <description>Some msg destination needing a jboss/resource-env-ref</description>
-        <message-destination-name>TheOtherQueue</message-destination-name>
-    </message-destination>
-</application-client>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testBasic.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client version="1.4"
+    xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
+    
+    <description>A sample application client descriptor</description>
+    <display-name>J2EE Client Tests</display-name>
+    
+    <env-entry>
+        <env-entry-name>
+           String0
+        </env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>String0Value </env-entry-value>
+    </env-entry>
+    <env-entry>
+        <env-entry-name>Float0</env-entry-name>
+        <env-entry-type>java.lang.Float</env-entry-type>
+        <env-entry-value>3.14</env-entry-value>
+    </env-entry>
+    <env-entry>
+        <env-entry-name>Long0</env-entry-name>
+        <env-entry-type>java.lang.Long</env-entry-type>
+        <env-entry-value>123456789</env-entry-value>
+    </env-entry>
+    
+    <ejb-ref>
+        <ejb-ref-name>ejb/StatelessSessionBean</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <home>org.jboss.test.cts.interfaces.StatelessSessionHome</home>
+        <remote>org.jboss.test.cts.interfaces.StatelessSession</remote>
+    </ejb-ref>
+    <ejb-ref>
+        <ejb-ref-name>ejb/StatelessSessionBean2</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <home>org.jboss.test.cts.interfaces.StatelessSessionHome</home>
+        <remote>org.jboss.test.cts.interfaces.StatelessSession</remote>
+        <ejb-link>StatelessSessionBean</ejb-link>
+    </ejb-ref>
+    
+    <!-- URL Connection Factories (java:comp/env/url) -->
+    <resource-ref>
+        <description>The JBoss Web Site HomePage</description>
+        <res-ref-name>url/JBossHome</res-ref-name>
+        <res-type>java.net.URL</res-type>
+        <res-auth>Container</res-auth>
+    </resource-ref>
+    <resource-ref>
+        <description>SomeWebSite HomePage</description>
+        <res-ref-name>url/IndirectURL</res-ref-name>
+        <res-type>java.net.URL</res-type>
+        <res-auth>Container</res-auth>
+    </resource-ref>
+    
+    <!-- A JMS destination (java:comp/env/jms) -->
+    <resource-env-ref>
+        <description>A test of the resource-env-ref tag</description>
+        <resource-env-ref-name>jms/aQueue</resource-env-ref-name>
+        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+    </resource-env-ref>
+    
+    <message-destination-ref>
+        <description>A message-destination-ref needing a jboss/resource-env-ref</description>
+        <message-destination-ref-name>jms/anotherQueue</message-destination-ref-name>
+        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-usage>Consumes</message-destination-usage>
+    </message-destination-ref>
+    
+    <message-destination-ref>
+        <message-destination-ref-name>jms/anotherQueue2</message-destination-ref-name>
+        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-usage>Consumes</message-destination-usage>
+        <message-destination-link>TheOtherQueue</message-destination-link>
+    </message-destination-ref>
+    
+    <callback-handler>org.jboss.test.client.test.SystemPropertyCallbackHandler</callback-handler>
+    
+    <message-destination id="TheOtherQueue-id">
+        <description>Some msg destination needing a jboss/resource-env-ref</description>
+        <message-destination-name>TheOtherQueue</message-destination-name>
+    </message-destination>
+</application-client>
\ No newline at end of file

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-client
-    PUBLIC "-//JBoss//DTD Application Client 4.2//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-client_4_2.dtd">
-
-<jboss-client>
-    <jndi-name>BeanMirrorSEIClient_client</jndi-name>
-    <service-ref>
-        <service-ref-name>service/beanMirrorSEI</service-ref-name>
-        <port-component-ref>
-            <service-endpoint-interface>com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs</service-endpoint-interface>
-            <port-qname>{http://BeanMirrorSEI.org}HelloWsPort</port-qname>
-        </port-component-ref>
-        <wsdl-override>http://localhost:8080/BeanMirrorSEIWeb/ws4ee/beanMirrorSEI?WSDL</wsdl-override>
-    </service-ref>
-</jboss-client>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testJBossServiceRef.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-client
+    PUBLIC "-//JBoss//DTD Application Client 4.2//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-client_4_2.dtd">
+
+<jboss-client>
+    <jndi-name>BeanMirrorSEIClient_client</jndi-name>
+    <service-ref>
+        <service-ref-name>
+              service/beanMirrorSEI
+        </service-ref-name>
+        <port-component-ref>
+            <service-endpoint-interface>com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs</service-endpoint-interface>
+            <port-qname>{http://BeanMirrorSEI.org}HelloWsPort</port-qname>
+        </port-component-ref>
+        <wsdl-override>http://localhost:8080/BeanMirrorSEIWeb/ws4ee/beanMirrorSEI?WSDL</wsdl-override>
+    </service-ref>
+</jboss-client>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    version="1.4"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
-    <display-name>BeanMirrorSEIClient_client</display-name>
-    <service-ref>
-        <service-ref-name>service/beanMirrorSEI</service-ref-name>
-        <service-interface>javax.xml.rpc.Service</service-interface>
-        <wsdl-file>META-INF/wsdl/BeanMirrorSEI.wsdl</wsdl-file>
-        <jaxrpc-mapping-file>BeanMirrorSEI.xml</jaxrpc-mapping-file>
-        <port-component-ref>
-            <service-endpoint-interface>com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs</service-endpoint-interface>
-        </port-component-ref>
-    </service-ref>
-</application-client>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14_testServiceRef.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="1.4"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
+    <display-name>BeanMirrorSEIClient_client</display-name>
+    <service-ref>
+        <service-ref-name>
+           service/beanMirrorSEI
+        </service-ref-name>
+        <service-interface>javax.xml.rpc.Service</service-interface>
+        <wsdl-file>META-INF/wsdl/BeanMirrorSEI.wsdl</wsdl-file>
+        <jaxrpc-mapping-file>BeanMirrorSEI.xml</jaxrpc-mapping-file>
+        <port-component-ref>
+            <service-endpoint-interface>com.sun.ts.tests.webservices.deploy.beanMirrorSEI.HelloWs</service-endpoint-interface>
+        </port-component-ref>
+    </service-ref>
+</application-client>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client xmlns="http://java.sun.com/xml/ns/javaee"
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
-                    version="5"
-                    metadata-complete="true"
-                    id="appclient-test">
-   <!-- description group -->
-   <description>en-application-client-desc</description>
-   <description xml:lang="fr">fr-application-client-desc</description>
-   <description xml:lang="de">de-application-client-desc</description>
-   <display-name>en-application-client-disp</display-name>
-   <display-name xml:lang="fr">fr-application-client-disp</display-name>
-   <display-name xml:lang="de">de-application-client-disp</display-name>
-   <icon id="en-application-client-icon-id">
-      <small-icon>en-application-client-small-icon</small-icon>
-      <large-icon>en-application-client-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="fr" id="fr-application-client-icon-id">
-      <small-icon>fr-application-client-small-icon</small-icon>
-      <large-icon>fr-application-client-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="de" id="de-application-client-icon-id">
-      <small-icon>de-application-client-small-icon</small-icon>
-      <large-icon>de-application-client-large-icon</large-icon>
-   </icon>
-
-   <!-- env entry -->
-   <env-entry id="appClientEnvEntry1-id">
-      <description>en-appClientEnvEntry1-desc</description>
-      <description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
-      <description xml:lang="de">de-appClientEnvEntry1-desc</description>
-      <env-entry-name>appClientEnvEntry1Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
-      <env-entry-value>appClientEnvEntry1Value</env-entry-value>
-      <mapped-name>appClientEnvEntry1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientEnvEntry1Injection1Class</injection-target-class>
-         <injection-target-name>appClientEnvEntry1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientEnvEntry1Injection2Class</injection-target-class>
-         <injection-target-name>appClientEnvEntry1Injection2Name</injection-target-name>
-      </injection-target>
-   </env-entry>
-   <env-entry id="appClientEnvEntry2-id">
-      <description>en-appClientEnvEntry2-desc</description>
-      <description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
-      <description xml:lang="de">de-appClientEnvEntry2-desc</description>
-      <env-entry-name>appClientEnvEntry2Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
-      <env-entry-value>appClientEnvEntry2Value</env-entry-value>
-      <mapped-name>appClientEnvEntry2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientEnvEntry2Injection1Class</injection-target-class>
-         <injection-target-name>appClientEnvEntry2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientEnvEntry2Injection2Class</injection-target-class>
-         <injection-target-name>appClientEnvEntry2Injection2Name</injection-target-name>
-      </injection-target>
-   </env-entry>
-   
-   <!-- ejb ref -->
-   <ejb-ref id="appClientEjbRef1-id">
-      <description>en-appClientEjbRef1-desc</description>
-      <description xml:lang="fr">fr-appClientEjbRef1-desc</description>
-      <description xml:lang="de">de-appClientEjbRef1-desc</description>
-      <ejb-ref-name>appClientEjbRef1Name</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <home>appClientEjbRef1Home</home>
-      <remote>appClientEjbRef1Remote</remote>
-      <ejb-link>appClientEjbRef1EjbLink</ejb-link>
-      <mapped-name>appClientEjbRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientEjbRef1Injection1Class</injection-target-class>
-         <injection-target-name>appClientEjbRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientEjbRef1Injection2Class</injection-target-class>
-         <injection-target-name>appClientEjbRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </ejb-ref>
-   <ejb-ref id="appClientEjbRef2-id">
-      <description>en-appClientEjbRef2-desc</description>
-      <description xml:lang="fr">fr-appClientEjbRef2-desc</description>
-      <description xml:lang="de">de-appClientEjbRef2-desc</description>
-      <ejb-ref-name>appClientEjbRef2Name</ejb-ref-name>
-      <ejb-ref-type>Entity</ejb-ref-type>
-      <home>appClientEjbRef2Home</home>
-      <remote>appClientEjbRef2Remote</remote>
-      <ejb-link>appClientEjbRef2EjbLink</ejb-link>
-      <mapped-name>appClientEjbRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientEjbRef2Injection1Class</injection-target-class>
-         <injection-target-name>appClientEjbRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientEjbRef2Injection2Class</injection-target-class>
-         <injection-target-name>appClientEjbRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </ejb-ref>
-   
-   <!-- service ref -->
-   <!-- TODO: full service-ref contents -->
-   <service-ref id="appClientServiceRef1-id">
-      <description>en-appClientServiceRef1-desc</description>
-      <description xml:lang="fr">fr-appClientServiceRef1-desc</description>
-      <description xml:lang="de">de-appClientServiceRef1-desc</description>
-      <service-ref-name>appClientServiceRef1Name</service-ref-name>
-      <service-interface>appClientServiceRef1Iface</service-interface>
-   </service-ref>
-   <service-ref id="appClientServiceRef2-id">
-      <description>en-appClientServiceRef2-desc</description>
-      <description xml:lang="fr">fr-appClientServiceRef2-desc</description>
-      <description xml:lang="de">de-appClientServiceRef2-desc</description>
-      <service-ref-name>appClientServiceRef2Name</service-ref-name>
-      <service-interface>appClientServiceRef2Iface</service-interface>
-   </service-ref>
-   
-   <!-- resource ref -->
-   <resource-ref id="appClientResourceRef1-id">
-      <description>en-appClientResourceRef1-desc</description>
-      <description xml:lang="fr">fr-appClientResourceRef1-desc</description>
-      <description xml:lang="de">de-appClientResourceRef1-desc</description>
-      <res-ref-name>appClientResourceRef1Name</res-ref-name>
-      <res-type>appClientResourceRef1Type</res-type>
-      <res-auth>Application</res-auth>
-      <res-sharing-scope>Shareable</res-sharing-scope>
-      <mapped-name>appClientResourceRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientResourceRef1Injection1Class</injection-target-class>
-         <injection-target-name>appClientResourceRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientResourceRef1Injection2Class</injection-target-class>
-         <injection-target-name>appClientResourceRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-ref>
-   <resource-ref id="appClientResourceRef2-id">
-      <description>en-appClientResourceRef2-desc</description>
-      <description xml:lang="fr">fr-appClientResourceRef2-desc</description>
-      <description xml:lang="de">de-appClientResourceRef2-desc</description>
-      <res-ref-name>appClientResourceRef2Name</res-ref-name>
-      <res-type>appClientResourceRef2Type</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Unshareable</res-sharing-scope>
-      <mapped-name>appClientResourceRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientResourceRef2Injection1Class</injection-target-class>
-         <injection-target-name>appClientResourceRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientResourceRef2Injection2Class</injection-target-class>
-         <injection-target-name>appClientResourceRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-ref>
-   
-   <!-- resource env ref -->
-   <resource-env-ref id="appClientResourceEnvRef1-id">
-      <description>en-appClientResourceEnvRef1-desc</description>
-      <description xml:lang="fr">fr-appClientResourceEnvRef1-desc</description>
-      <description xml:lang="de">de-appClientResourceEnvRef1-desc</description>
-      <resource-env-ref-name>appClientResourceEnvRef1Name</resource-env-ref-name>
-      <resource-env-ref-type>appClientResourceEnvRef1Type</resource-env-ref-type>
-      <mapped-name>appClientResourceEnvRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientResourceEnvRef1Injection1Class</injection-target-class>
-         <injection-target-name>appClientResourceEnvRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientResourceEnvRef1Injection2Class</injection-target-class>
-         <injection-target-name>appClientResourceEnvRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-env-ref>
-   <resource-env-ref id="appClientResourceEnvRef2-id">
-      <description>en-appClientResourceEnvRef2-desc</description>
-      <description xml:lang="fr">fr-appClientResourceEnvRef2-desc</description>
-      <description xml:lang="de">de-appClientResourceEnvRef2-desc</description>
-      <resource-env-ref-name>appClientResourceEnvRef2Name</resource-env-ref-name>
-      <resource-env-ref-type>appClientResourceEnvRef2Type</resource-env-ref-type>
-      <mapped-name>appClientResourceEnvRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientResourceEnvRef2Injection1Class</injection-target-class>
-         <injection-target-name>appClientResourceEnvRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientResourceEnvRef2Injection2Class</injection-target-class>
-         <injection-target-name>appClientResourceEnvRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-env-ref>
-
-   <!-- message destination ref -->
-   <message-destination-ref id="appClientMessageDestinationRef1-id">
-      <description>en-appClientMessageDestinationRef1-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestinationRef1-desc</description>
-      <description xml:lang="de">de-appClientMessageDestinationRef1-desc</description>
-      <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
-      <message-destination-type>appClientMessageDestinationRef1Type</message-destination-type>
-      <message-destination-usage>Consumes</message-destination-usage>
-      <message-destination-link>appClientMessageDestinationRef1Link</message-destination-link>
-      <mapped-name>appClientMessageDestinationRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientMessageDestinationRef1Injection1Class</injection-target-class>
-         <injection-target-name>appClientMessageDestinationRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientMessageDestinationRef1Injection2Class</injection-target-class>
-         <injection-target-name>appClientMessageDestinationRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   <message-destination-ref id="appClientMessageDestinationRef2-id">
-      <description>en-appClientMessageDestinationRef2-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestinationRef2-desc</description>
-      <description xml:lang="de">de-appClientMessageDestinationRef2-desc</description>
-      <message-destination-ref-name>appClientMessageDestinationRef2Name</message-destination-ref-name>
-      <message-destination-type>appClientMessageDestinationRef2Type</message-destination-type>
-      <message-destination-usage>Produces</message-destination-usage>
-      <message-destination-link>appClientMessageDestinationRef2Link</message-destination-link>
-      <mapped-name>appClientMessageDestinationRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientMessageDestinationRef2Injection1Class</injection-target-class>
-         <injection-target-name>appClientMessageDestinationRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientMessageDestinationRef2Injection2Class</injection-target-class>
-         <injection-target-name>appClientMessageDestinationRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   <message-destination-ref id="appClientMessageDestinationRef3-id">
-      <description>en-appClientMessageDestinationRef3-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestinationRef3-desc</description>
-      <description xml:lang="de">de-appClientMessageDestinationRef3-desc</description>
-      <message-destination-ref-name>appClientMessageDestinationRef3Name</message-destination-ref-name>
-      <message-destination-type>appClientMessageDestinationRef3Type</message-destination-type>
-      <message-destination-usage>ConsumesProduces</message-destination-usage>
-      <message-destination-link>appClientMessageDestinationRef3Link</message-destination-link>
-      <mapped-name>appClientMessageDestinationRef3MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientMessageDestinationRef3Injection1Class</injection-target-class>
-         <injection-target-name>appClientMessageDestinationRef3Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientMessageDestinationRef3Injection2Class</injection-target-class>
-         <injection-target-name>appClientMessageDestinationRef3Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   
-   <!-- persistence unit ref -->
-   <persistence-unit-ref id="appClientPersistenceUnitRef1-id">
-      <description>en-appClientPersistenceUnitRef1-desc</description>
-      <description xml:lang="fr">fr-appClientPersistenceUnitRef1-desc</description>
-      <description xml:lang="de">de-appClientPersistenceUnitRef1-desc</description>
-      <persistence-unit-ref-name>appClientPersistenceUnitRef1Name</persistence-unit-ref-name>
-      <persistence-unit-name>appClientPersistenceUnitRef1Unit</persistence-unit-name>
-      <mapped-name>appClientPersistenceUnitRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientPersistenceUnitRef1Injection1Class</injection-target-class>
-         <injection-target-name>appClientPersistenceUnitRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientPersistenceUnitRef1Injection2Class</injection-target-class>
-         <injection-target-name>appClientPersistenceUnitRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </persistence-unit-ref>
-   <persistence-unit-ref id="appClientPersistenceUnitRef2-id">
-      <description>en-appClientPersistenceUnitRef2-desc</description>
-      <description xml:lang="fr">fr-appClientPersistenceUnitRef2-desc</description>
-      <description xml:lang="de">de-appClientPersistenceUnitRef2-desc</description>
-      <persistence-unit-ref-name>appClientPersistenceUnitRef2Name</persistence-unit-ref-name>
-      <persistence-unit-name>appClientPersistenceUnitRef2Unit</persistence-unit-name>
-      <mapped-name>appClientPersistenceUnitRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>appClientPersistenceUnitRef2Injection1Class</injection-target-class>
-         <injection-target-name>appClientPersistenceUnitRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>appClientPersistenceUnitRef2Injection2Class</injection-target-class>
-         <injection-target-name>appClientPersistenceUnitRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </persistence-unit-ref>
-   
-   <!-- post-construct -->
-   <post-construct>
-      <lifecycle-callback-class>appClientPostConstruct1Class</lifecycle-callback-class>
-      <lifecycle-callback-method>appClientPostConstruct1Method</lifecycle-callback-method>
-   </post-construct>
-   <post-construct>
-      <lifecycle-callback-class>appClientPostConstruct2Class</lifecycle-callback-class>
-      <lifecycle-callback-method>appClientPostConstruct2Method</lifecycle-callback-method>
-   </post-construct>
-   
-   <!-- pre-destroy -->
-   <pre-destroy>
-      <lifecycle-callback-class>appClientPreDestroy1Class</lifecycle-callback-class>
-      <lifecycle-callback-method>appClientPreDestroy1Method</lifecycle-callback-method>
-   </pre-destroy>
-   <pre-destroy>
-      <lifecycle-callback-class>appClientPreDestroy2Class</lifecycle-callback-class>
-      <lifecycle-callback-method>appClientPreDestroy2Method</lifecycle-callback-method>
-   </pre-destroy>
-   
-   <!-- callback handler -->
-   <callback-handler id="appClientCallbackHandler-id">org.jboss.test.metadata.client.AppClientCallbackHandler</callback-handler>
-   
-   <!-- message destination -->
-   <message-destination id="appClientMessageDestination1-id">
-      <description>en-appClientMessageDestination1-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestination1-desc</description>
-      <description xml:lang="de">de-appClientMessageDestination1-desc</description>
-      <display-name>en-appClientMessageDestination1-disp</display-name>
-      <display-name xml:lang="fr">fr-appClientMessageDestination1-disp</display-name>
-      <display-name xml:lang="de">de-appClientMessageDestination1-disp</display-name>
-      <icon id="en-appClientMessageDestination1-icon-id">
-         <small-icon>en-appClientMessageDestination1-small-icon</small-icon>
-         <large-icon>en-appClientMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-appClientMessageDestination1-icon-id">
-         <small-icon>fr-appClientMessageDestination1-small-icon</small-icon>
-         <large-icon>fr-appClientMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-appClientMessageDestination1-icon-id">
-         <small-icon>de-appClientMessageDestination1-small-icon</small-icon>
-         <large-icon>de-appClientMessageDestination1-large-icon</large-icon>
-      </icon>
-      <message-destination-name>appClientMessageDestination1Name</message-destination-name>
-      <mapped-name>appClientMessageDestination1MappedName</mapped-name>
-   </message-destination>
-   <message-destination id="appClientMessageDestination2-id">
-      <description>en-appClientMessageDestination2-desc</description>
-      <description xml:lang="fr">fr-appClientMessageDestination2-desc</description>
-      <description xml:lang="de">de-appClientMessageDestination2-desc</description>
-      <display-name>en-appClientMessageDestination2-disp</display-name>
-      <display-name xml:lang="fr">fr-appClientMessageDestination2-disp</display-name>
-      <display-name xml:lang="de">de-appClientMessageDestination2-disp</display-name>
-      <icon id="en-appClientMessageDestination2-icon-id">
-         <small-icon>en-appClientMessageDestination2-small-icon</small-icon>
-         <large-icon>en-appClientMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-appClientMessageDestination2-icon-id">
-         <small-icon>fr-appClientMessageDestination2-small-icon</small-icon>
-         <large-icon>fr-appClientMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-appClientMessageDestination2-icon-id">
-         <small-icon>de-appClientMessageDestination2-small-icon</small-icon>
-         <large-icon>de-appClientMessageDestination2-large-icon</large-icon>
-      </icon>
-      <message-destination-name>appClientMessageDestination2Name</message-destination-name>
-      <mapped-name>appClientMessageDestination2MappedName</mapped-name>
-   </message-destination>
-</application-client>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://java.sun.com/xml/ns/javaee"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
+                    version="5"
+                    metadata-complete="true"
+                    id="appclient-test">
+   <!-- description group -->
+   <description>en-application-client-desc</description>
+   <description xml:lang="fr">fr-application-client-desc</description>
+   <description xml:lang="de">de-application-client-desc</description>
+   <display-name>en-application-client-disp</display-name>
+   <display-name xml:lang="fr">fr-application-client-disp</display-name>
+   <display-name xml:lang="de">de-application-client-disp</display-name>
+   <icon id="en-application-client-icon-id">
+      <small-icon>en-application-client-small-icon</small-icon>
+      <large-icon>en-application-client-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="fr" id="fr-application-client-icon-id">
+      <small-icon>fr-application-client-small-icon</small-icon>
+      <large-icon>fr-application-client-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="de" id="de-application-client-icon-id">
+      <small-icon>de-application-client-small-icon</small-icon>
+      <large-icon>de-application-client-large-icon</large-icon>
+   </icon>
+
+   <!-- env entry -->
+   <env-entry id="appClientEnvEntry1-id">
+      <description>en-appClientEnvEntry1-desc</description>
+      <description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
+      <description xml:lang="de">de-appClientEnvEntry1-desc</description>
+      <env-entry-name>
+        appClientEnvEntry1Name
+      </env-entry-name>
+      <env-entry-type>java.lang.String</env-entry-type>
+      <env-entry-value>appClientEnvEntry1Value</env-entry-value>
+      <mapped-name>appClientEnvEntry1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry1Injection1Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry1Injection2Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry1Injection2Name</injection-target-name>
+      </injection-target>
+   </env-entry>
+   <env-entry id="appClientEnvEntry2-id">
+      <description>en-appClientEnvEntry2-desc</description>
+      <description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
+      <description xml:lang="de">de-appClientEnvEntry2-desc</description>
+      <env-entry-name>appClientEnvEntry2Name</env-entry-name>
+      <env-entry-type>java.lang.String</env-entry-type>
+      <env-entry-value>appClientEnvEntry2Value</env-entry-value>
+      <mapped-name>appClientEnvEntry2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry2Injection1Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEnvEntry2Injection2Class</injection-target-class>
+         <injection-target-name>appClientEnvEntry2Injection2Name</injection-target-name>
+      </injection-target>
+   </env-entry>
+   
+   <!-- ejb ref -->
+   <ejb-ref id="appClientEjbRef1-id">
+      <description>en-appClientEjbRef1-desc</description>
+      <description xml:lang="fr">fr-appClientEjbRef1-desc</description>
+      <description xml:lang="de">de-appClientEjbRef1-desc</description>
+      <ejb-ref-name>appClientEjbRef1Name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <home>appClientEjbRef1Home</home>
+      <remote>appClientEjbRef1Remote</remote>
+      <ejb-link>appClientEjbRef1EjbLink</ejb-link>
+      <mapped-name>appClientEjbRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEjbRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientEjbRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEjbRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientEjbRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </ejb-ref>
+   <ejb-ref id="appClientEjbRef2-id">
+      <description>en-appClientEjbRef2-desc</description>
+      <description xml:lang="fr">fr-appClientEjbRef2-desc</description>
+      <description xml:lang="de">de-appClientEjbRef2-desc</description>
+      <ejb-ref-name>appClientEjbRef2Name</ejb-ref-name>
+      <ejb-ref-type>Entity</ejb-ref-type>
+      <home>appClientEjbRef2Home</home>
+      <remote>appClientEjbRef2Remote</remote>
+      <ejb-link>appClientEjbRef2EjbLink</ejb-link>
+      <mapped-name>appClientEjbRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientEjbRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientEjbRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientEjbRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientEjbRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </ejb-ref>
+   
+   <!-- service ref -->
+   <!-- TODO: full service-ref contents -->
+   <service-ref id="appClientServiceRef1-id">
+      <description>en-appClientServiceRef1-desc</description>
+      <description xml:lang="fr">fr-appClientServiceRef1-desc</description>
+      <description xml:lang="de">de-appClientServiceRef1-desc</description>
+      <service-ref-name>appClientServiceRef1Name</service-ref-name>
+      <service-interface>appClientServiceRef1Iface</service-interface>
+   </service-ref>
+   <service-ref id="appClientServiceRef2-id">
+      <description>en-appClientServiceRef2-desc</description>
+      <description xml:lang="fr">fr-appClientServiceRef2-desc</description>
+      <description xml:lang="de">de-appClientServiceRef2-desc</description>
+      <service-ref-name>appClientServiceRef2Name</service-ref-name>
+      <service-interface>appClientServiceRef2Iface</service-interface>
+   </service-ref>
+   
+   <!-- resource ref -->
+   <resource-ref id="appClientResourceRef1-id">
+      <description>en-appClientResourceRef1-desc</description>
+      <description xml:lang="fr">fr-appClientResourceRef1-desc</description>
+      <description xml:lang="de">de-appClientResourceRef1-desc</description>
+      <res-ref-name>appClientResourceRef1Name</res-ref-name>
+      <res-type>appClientResourceRef1Type</res-type>
+      <res-auth>Application</res-auth>
+      <res-sharing-scope>Shareable</res-sharing-scope>
+      <mapped-name>appClientResourceRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-ref>
+   <resource-ref id="appClientResourceRef2-id">
+      <description>en-appClientResourceRef2-desc</description>
+      <description xml:lang="fr">fr-appClientResourceRef2-desc</description>
+      <description xml:lang="de">de-appClientResourceRef2-desc</description>
+      <res-ref-name>appClientResourceRef2Name</res-ref-name>
+      <res-type>appClientResourceRef2Type</res-type>
+      <res-auth>Container</res-auth>
+      <res-sharing-scope>Unshareable</res-sharing-scope>
+      <mapped-name>appClientResourceRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-ref>
+   
+   <!-- resource env ref -->
+   <resource-env-ref id="appClientResourceEnvRef1-id">
+      <description>en-appClientResourceEnvRef1-desc</description>
+      <description xml:lang="fr">fr-appClientResourceEnvRef1-desc</description>
+      <description xml:lang="de">de-appClientResourceEnvRef1-desc</description>
+      <resource-env-ref-name>appClientResourceEnvRef1Name</resource-env-ref-name>
+      <resource-env-ref-type>appClientResourceEnvRef1Type</resource-env-ref-type>
+      <mapped-name>appClientResourceEnvRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-env-ref>
+   <resource-env-ref id="appClientResourceEnvRef2-id">
+      <description>en-appClientResourceEnvRef2-desc</description>
+      <description xml:lang="fr">fr-appClientResourceEnvRef2-desc</description>
+      <description xml:lang="de">de-appClientResourceEnvRef2-desc</description>
+      <resource-env-ref-name>appClientResourceEnvRef2Name</resource-env-ref-name>
+      <resource-env-ref-type>appClientResourceEnvRef2Type</resource-env-ref-type>
+      <mapped-name>appClientResourceEnvRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientResourceEnvRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientResourceEnvRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-env-ref>
+
+   <!-- message destination ref -->
+   <message-destination-ref id="appClientMessageDestinationRef1-id">
+      <description>en-appClientMessageDestinationRef1-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef1-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef1-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef1Type</message-destination-type>
+      <message-destination-usage>Consumes</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef1Link</message-destination-link>
+      <mapped-name>appClientMessageDestinationRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   <message-destination-ref id="appClientMessageDestinationRef2-id">
+      <description>en-appClientMessageDestinationRef2-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef2-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef2-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef2Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef2Type</message-destination-type>
+      <message-destination-usage>Produces</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef2Link</message-destination-link>
+      <mapped-name>appClientMessageDestinationRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   <message-destination-ref id="appClientMessageDestinationRef3-id">
+      <description>en-appClientMessageDestinationRef3-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestinationRef3-desc</description>
+      <description xml:lang="de">de-appClientMessageDestinationRef3-desc</description>
+      <message-destination-ref-name>appClientMessageDestinationRef3Name</message-destination-ref-name>
+      <message-destination-type>appClientMessageDestinationRef3Type</message-destination-type>
+      <message-destination-usage>ConsumesProduces</message-destination-usage>
+      <message-destination-link>appClientMessageDestinationRef3Link</message-destination-link>
+      <mapped-name>appClientMessageDestinationRef3MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef3Injection1Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef3Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientMessageDestinationRef3Injection2Class</injection-target-class>
+         <injection-target-name>appClientMessageDestinationRef3Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   
+   <!-- persistence unit ref -->
+   <persistence-unit-ref id="appClientPersistenceUnitRef1-id">
+      <description>en-appClientPersistenceUnitRef1-desc</description>
+      <description xml:lang="fr">fr-appClientPersistenceUnitRef1-desc</description>
+      <description xml:lang="de">de-appClientPersistenceUnitRef1-desc</description>
+      <persistence-unit-ref-name>appClientPersistenceUnitRef1Name</persistence-unit-ref-name>
+      <persistence-unit-name>appClientPersistenceUnitRef1Unit</persistence-unit-name>
+      <mapped-name>appClientPersistenceUnitRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef1Injection1Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef1Injection2Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </persistence-unit-ref>
+   <persistence-unit-ref id="appClientPersistenceUnitRef2-id">
+      <description>en-appClientPersistenceUnitRef2-desc</description>
+      <description xml:lang="fr">fr-appClientPersistenceUnitRef2-desc</description>
+      <description xml:lang="de">de-appClientPersistenceUnitRef2-desc</description>
+      <persistence-unit-ref-name>appClientPersistenceUnitRef2Name</persistence-unit-ref-name>
+      <persistence-unit-name>appClientPersistenceUnitRef2Unit</persistence-unit-name>
+      <mapped-name>appClientPersistenceUnitRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef2Injection1Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>appClientPersistenceUnitRef2Injection2Class</injection-target-class>
+         <injection-target-name>appClientPersistenceUnitRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </persistence-unit-ref>
+   
+   <!-- post-construct -->
+   <post-construct>
+      <lifecycle-callback-class>appClientPostConstruct1Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPostConstruct1Method</lifecycle-callback-method>
+   </post-construct>
+   <post-construct>
+      <lifecycle-callback-class>appClientPostConstruct2Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPostConstruct2Method</lifecycle-callback-method>
+   </post-construct>
+   
+   <!-- pre-destroy -->
+   <pre-destroy>
+      <lifecycle-callback-class>appClientPreDestroy1Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPreDestroy1Method</lifecycle-callback-method>
+   </pre-destroy>
+   <pre-destroy>
+      <lifecycle-callback-class>appClientPreDestroy2Class</lifecycle-callback-class>
+      <lifecycle-callback-method>appClientPreDestroy2Method</lifecycle-callback-method>
+   </pre-destroy>
+   
+   <!-- callback handler -->
+   <callback-handler id="appClientCallbackHandler-id">org.jboss.test.metadata.client.AppClientCallbackHandler</callback-handler>
+   
+   <!-- message destination -->
+   <message-destination id="appClientMessageDestination1-id">
+      <description>en-appClientMessageDestination1-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestination1-desc</description>
+      <description xml:lang="de">de-appClientMessageDestination1-desc</description>
+      <display-name>en-appClientMessageDestination1-disp</display-name>
+      <display-name xml:lang="fr">fr-appClientMessageDestination1-disp</display-name>
+      <display-name xml:lang="de">de-appClientMessageDestination1-disp</display-name>
+      <icon id="en-appClientMessageDestination1-icon-id">
+         <small-icon>en-appClientMessageDestination1-small-icon</small-icon>
+         <large-icon>en-appClientMessageDestination1-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="fr" id="fr-appClientMessageDestination1-icon-id">
+         <small-icon>fr-appClientMessageDestination1-small-icon</small-icon>
+         <large-icon>fr-appClientMessageDestination1-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="de" id="de-appClientMessageDestination1-icon-id">
+         <small-icon>de-appClientMessageDestination1-small-icon</small-icon>
+         <large-icon>de-appClientMessageDestination1-large-icon</large-icon>
+      </icon>
+      <message-destination-name>appClientMessageDestination1Name</message-destination-name>
+      <mapped-name>appClientMessageDestination1MappedName</mapped-name>
+   </message-destination>
+   <message-destination id="appClientMessageDestination2-id">
+      <description>en-appClientMessageDestination2-desc</description>
+      <description xml:lang="fr">fr-appClientMessageDestination2-desc</description>
+      <description xml:lang="de">de-appClientMessageDestination2-desc</description>
+      <display-name>en-appClientMessageDestination2-disp</display-name>
+      <display-name xml:lang="fr">fr-appClientMessageDestination2-disp</display-name>
+      <display-name xml:lang="de">de-appClientMessageDestination2-disp</display-name>
+      <icon id="en-appClientMessageDestination2-icon-id">
+         <small-icon>en-appClientMessageDestination2-small-icon</small-icon>
+         <large-icon>en-appClientMessageDestination2-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="fr" id="fr-appClientMessageDestination2-icon-id">
+         <small-icon>fr-appClientMessageDestination2-small-icon</small-icon>
+         <large-icon>fr-appClientMessageDestination2-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="de" id="de-appClientMessageDestination2-icon-id">
+         <small-icon>de-appClientMessageDestination2-small-icon</small-icon>
+         <large-icon>de-appClientMessageDestination2-large-icon</large-icon>
+      </icon>
+      <message-destination-name>appClientMessageDestination2Name</message-destination-name>
+      <mapped-name>appClientMessageDestination2MappedName</mapped-name>
+   </message-destination>
+</application-client>
\ No newline at end of file

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-client xmlns="http://www.jboss.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.com/xml/ns/javaee/jboss-client_5_0.xsd"
-   version="5.0"
-   id="appclient-test">
-   <!-- jndi name -->
-   <jndi-name>appClientJndiName</jndi-name>
-   
-   <!-- resource ref -->
-   <resource-ref id="appClientResourceRef2-id">
-      <res-ref-name>appClientResourceRef2Name</res-ref-name>
-      <res-url>http://localhost</res-url>
-   </resource-ref>
-      
-   <message-destination-ref>
-      <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
-      <jndi-name>MDB_QUEUE</jndi-name>
-   </message-destination-ref>
-   
-   <!-- depends -->
-   <depends>appClientDepends1</depends>
-   <depends>appClientDepends2</depends>
-</jboss-client>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/client/JBossClient5Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-client xmlns="http://www.jboss.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.com/xml/ns/javaee/jboss-client_5_0.xsd"
+   version="5.0"
+   id="appclient-test">
+   <!-- jndi name -->
+   <jndi-name>
+       appClientJndiName
+   </jndi-name>
+   
+   <!-- resource ref -->
+   <resource-ref id="appClientResourceRef2-id">
+      <res-ref-name>appClientResourceRef2Name</res-ref-name>
+      <res-url>http://localhost</res-url>
+   </resource-ref>
+      
+   <message-destination-ref>
+      <message-destination-ref-name>appClientMessageDestinationRef1Name</message-destination-ref-name>
+      <jndi-name>MDB_QUEUE</jndi-name>
+   </message-destination-ref>
+   
+   <!-- depends -->
+   <depends>appClientDepends1</depends>
+   <depends>appClientDepends2</depends>
+</jboss-client>
\ No newline at end of file

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,15 +0,0 @@
-<!DOCTYPE application PUBLIC
-   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-   "http://java.sun.com/dtd/application_1_3.dtd">
-   
-<application>
-   <display-name>The cts.jar with an application client jar</display-name>
-   <description>1.3 EE Client</description>
-   <module>
-       <ejb>cts.jar</ejb>
-   </module>
-   <module>
-       <java>app-client.jar</java>
-   </module>
-</application>
-   
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,17 @@
+<!DOCTYPE application PUBLIC
+   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+   "http://java.sun.com/dtd/application_1_3.dtd">
+   
+<application>
+   <display-name>The cts.jar with an application client jar</display-name>
+   <description>1.3 EE Client</description>
+   <module>
+       <ejb>
+         cts.jar
+       </ejb>
+   </module>
+   <module>
+       <java>app-client.jar</java>
+   </module>
+</application>
+   
\ No newline at end of file

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
-    <description>Application description</description>
-    <display-name>jsp_sec_secbasic</display-name>
-    <module>
-        <web>
-            <web-uri>jsp_sec_secbasic_web.war</web-uri>
-            <context-root>jsp_sec_secbasic_web</context-root>
-        </web>
-    </module>
-    <security-role>
-        <role-name>VP</role-name>
-    </security-role>
-    <security-role>
-        <role-name>Employee</role-name>
-    </security-role>
-    <security-role>
-        <role-name>Manager</role-name>
-    </security-role>
-    <security-role>
-        <role-name>Administrator</role-name>
-    </security-role>
-</application>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+    <description>Application description</description>
+    <display-name>jsp_sec_secbasic</display-name>
+    <module>
+        <web>
+            <web-uri>jsp_sec_secbasic_web.war</web-uri>
+            <context-root>jsp_sec_secbasic_web</context-root>
+        </web>
+    </module>
+    <security-role>
+        <role-name>
+           VP
+        </role-name>
+    </security-role>
+    <security-role>
+        <role-name>Employee</role-name>
+    </security-role>
+    <security-role>
+        <role-name>Manager</role-name>
+    </security-role>
+    <security-role>
+        <role-name>Administrator</role-name>
+    </security-role>
+</application>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    version="5"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
-    <description>Application Archive</description>
-    <display-name>transport_vehicles</display-name>
-    
-    
-    <module>
-        <java>
-            transport_ejb_vehicle_client.jar
-        </java>
-    </module>
-    
-    
-    <module>
-        <ejb>
-            transport_ejb_vehicle_ejb.jar
-        </ejb>
-    </module>
-    
-    
-    <module>
-        <web>
-            <web-uri>transport_jsp_vehicle_web.war</web-uri>
-            <context-root>transport_jsp_vehicle</context-root>
-        </web>
-    </module>
-    
-    
-    <module>
-        <web>
-            <web-uri>transport_servlet_vehicle_web.war</web-uri>
-            <context-root>transport_servlet_vehicle</context-root>
-        </web>
-    </module>
-    
-</application>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="5"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
+    <description>Application Archive</description>
+    <display-name>transport_vehicles</display-name>
+    
+    
+    <module>
+        <java>
+            transport_ejb_vehicle_client.jar
+        </java>
+    </module>
+    
+    
+    <module>
+        <ejb>
+            transport_ejb_vehicle_ejb.jar
+        </ejb>
+    </module>
+    
+    
+    <module>
+        <web>
+            <web-uri>transport_jsp_vehicle_web.war</web-uri>
+            <context-root>transport_jsp_vehicle</context-root>
+        </web>
+    </module>
+    
+    
+    <module>
+        <web>
+            <web-uri>transport_servlet_vehicle_web.war</web-uri>
+            <context-root>
+                transport_servlet_vehicle
+            </context-root>
+        </web>
+    </module>
+    
+</application>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar1xEnvEntry.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,20 @@
+<!DOCTYPE ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN' 'http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd'>
+
+<ejb-jar >
+   <display-name>Whitespace</display-name>
+   <enterprise-beans>
+      <session>
+        <ejb-name>WhitespaceBean </ejb-name>
+        <home>Home</home>
+        <remote>Remote</remote>
+        <ejb-class>WhitespaceBean </ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <env-entry-name>whitespace</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value> </env-entry-value>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+</ejb-jar>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar20EnvEntry.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar
+  PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+  "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+
+<ejb-jar >
+   <display-name>Whitespace</display-name>
+   <enterprise-beans>
+      <session>
+        <ejb-name>WhitespaceBean </ejb-name>
+        <ejb-class>WhitespaceBean </ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <env-entry-name>whitespace</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value> </env-entry-value>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+</ejb-jar>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar21EnvEntry.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,19 @@
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+       version="2.1">
+   <display-name>Whitespace</display-name>
+   <enterprise-beans>
+      <session>
+        <ejb-name>WhitespaceBean </ejb-name>
+        <ejb-class>WhitespaceBean </ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <env-entry>
+            <env-entry-name>whitespace</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value> </env-entry-value>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+</ejb-jar>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEjbJar30EnvEntry.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<ejb-jar
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+                            http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+        version="3.0">
+   <display-name>Whitespace</display-name>
+   <enterprise-beans>
+      <session>
+         <ejb-name>WhitespaceBean </ejb-name>
+         <env-entry>
+            <env-entry-name>whitespace</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value> </env-entry-value>
+         </env-entry>
+      </session>
+   </enterprise-beans>
+</ejb-jar>
\ No newline at end of file

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testEnvEntry.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<ejb-jar
-        xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-                            http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
-        version="3.0">
-   <display-name>Whitespace</display-name>
-   <enterprise-beans>
-      <session>
-         <ejb-name>WhitespaceBean</ejb-name>
-         <env-entry>
-            <env-entry-name>whitespace</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value> </env-entry-value>
-         </env-entry>
-      </session>
-   </enterprise-beans>
-</ejb-jar>
\ No newline at end of file

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50DTDEjbRef.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 4.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+  <enterprise-beans>
+    <session>
+       <ejb-name>SessionB</ejb-name>
+       <jndi-name>naming/SessionB</jndi-name>
+
+       <ejb-ref>
+         <ejb-ref-name>ejb/NoLinkSessionA</ejb-ref-name>
+         <jndi-name>naming/SessionA </jndi-name>
+       </ejb-ref>
+
+    </session>
+  </enterprise-beans>
+</jboss>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<jboss
+      xmlns="http://www.jboss.com/xml/ns/javaee"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+                          http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+      version="3.0">
+  <enterprise-beans>
+    <session>
+       <ejb-name>SessionB</ejb-name>
+       <jndi-name>naming/SessionB</jndi-name>
+
+       <ejb-ref>
+         <ejb-ref-name>ejb/NoLinkSessionA</ejb-ref-name>
+         <jndi-name>naming/SessionA </jndi-name>
+       </ejb-ref>
+
+    </session>
+  </enterprise-beans>
+</jboss>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,26 +0,0 @@
-  <!DOCTYPE jboss-web PUBLIC
-    "-//JBoss//DTD Web Application 5.0//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
-
-<jboss-web>
-
-	<replication-config>
-	   <cache-name>testCache</cache-name>
-	   <replication-trigger>SET</replication-trigger>
-      <replication-granularity>FIELD</replication-granularity>
-      <replication-field-batch-mode>true</replication-field-batch-mode>
-      <use-jk>true</use-jk>
-      <max-unreplicated-interval>30</max-unreplicated-interval>
-      <snapshot-mode>INTERVAL</snapshot-mode>
-      <snapshot-interval>5</snapshot-interval>
-   </replication-config>
-   
-   <max-active-sessions>20</max-active-sessions>
-   
-   <passivation-config>
-      <use-session-passivation>true</use-session-passivation>
-      <passivation-min-idle-time>2</passivation-min-idle-time>
-      <passivation-max-idle-time>5</passivation-max-idle-time>
-   </passivation-config>
-   
-</jboss-web>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClustering.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,28 @@
+  <!DOCTYPE jboss-web PUBLIC
+    "-//JBoss//DTD Web Application 5.0//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
+<jboss-web>
+
+	<replication-config>
+        <cache-name>
+           testCache
+        </cache-name>
+	   <replication-trigger>SET</replication-trigger>
+      <replication-granularity>FIELD</replication-granularity>
+      <replication-field-batch-mode>true</replication-field-batch-mode>
+      <use-jk>true</use-jk>
+      <max-unreplicated-interval>30</max-unreplicated-interval>
+      <snapshot-mode>INTERVAL</snapshot-mode>
+      <snapshot-interval>5</snapshot-interval>
+   </replication-config>
+   
+   <max-active-sessions>20</max-active-sessions>
+   
+   <passivation-config>
+      <use-session-passivation>true</use-session-passivation>
+      <passivation-min-idle-time>2</passivation-min-idle-time>
+      <passivation-max-idle-time>5</passivation-max-idle-time>
+   </passivation-config>
+   
+</jboss-web>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
-"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-"http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app id="web-app_2_3">
-   
-   <icon id="en-web-app-icon-id">
-      <small-icon>en-web-app-small-icon</small-icon>
-      <large-icon>en-web-app-large-icon</large-icon>
-   </icon>
-   <display-name>web-app_2_3-display-name</display-name>
-
-    <description>web-app-desc</description>
-    
-    <distributable/>
-
-    <context-param id="context-param0">
-      <param-name>context-param0-name</param-name>
-      <param-value>context-param0-value</param-value>
-      <description>context-param0-description</description>
-    </context-param>
-
-   <filter id="filter0">
-      <filter-name>filter0Name</filter-name>
-      <filter-class>filter0.class</filter-class>
-   </filter>
-   <filter-mapping id="filter0-mapping">
-      <filter-name>filter0Name</filter-name>
-      <url-pattern>/filter0/*</url-pattern>
-   </filter-mapping>
-    <filter-mapping id="filter1-mapping">
-       <filter-name>filter1Name</filter-name>
-       <servlet-name>servlet1</servlet-name>
-    </filter-mapping>
-
-    <listener id="listener0">
-        <listener-class>listener0.class</listener-class>
-    </listener>
-
-   <servlet id="servlet0">
-      <servlet-name>servlet0-name</servlet-name>
-      <servlet-class>servlet0.class</servlet-class>
-      <init-param id="servlet0-init-param0">
-         <param-name>init-param0-name</param-name>
-         <param-value>init-param0-value</param-value>
-      </init-param>
-      <init-param id="servlet0-init-param1">
-         <param-name>init-param1-name</param-name>
-         <param-value>init-param1-value</param-value>
-      </init-param>
-      <load-on-startup>1</load-on-startup>
-      <run-as>
-         <role-name>role0</role-name>
-      </run-as>
-      <security-role-ref>
-         <role-name>role1</role-name>
-      </security-role-ref>
-   </servlet>
-    <servlet id="servlet1">
-       <servlet-name>servlet1-name</servlet-name>
-       <servlet-class>servlet1.class</servlet-class>
-       <init-param id="servlet1-init-param0">
-          <param-name>init-param0-name</param-name>
-          <param-value>init-param0-value</param-value>
-       </init-param>
-       <init-param id="servlet1-init-param1">
-          <param-name>init-param1-name</param-name>
-          <param-value>init-param1-value</param-value>
-       </init-param>
-       <load-on-startup>1</load-on-startup>
-       <run-as>
-          <role-name>role0</role-name>
-       </run-as>
-       <security-role-ref>
-          <role-name>role1</role-name>
-       </security-role-ref>
-    </servlet>
-    <servlet-mapping id="servlet0-mapping">
-      <servlet-name>servlet0-name</servlet-name>
-      <url-pattern>/servlet0/*</url-pattern>
-   </servlet-mapping>
-    <servlet-mapping id="servlet1-mapping">
-       <servlet-name>servlet1-name</servlet-name>
-       <url-pattern>/servlet1/*</url-pattern>
-    </servlet-mapping>
-
-   <session-config id="session-config0">
-      <session-timeout>30</session-timeout>
-   </session-config>
-   <mime-mapping id="mime-mapping0">
-      <extension>ext0</extension>
-      <mime-type>x/type0</mime-type>
-   </mime-mapping>
-   <mime-mapping id="mime-mapping1">
-      <extension>ext1</extension>
-      <mime-type>x/type1</mime-type>
-   </mime-mapping>
-
-   <welcome-file-list id="welcome-file-list0">
-      <welcome-file>index.html</welcome-file>
-      <welcome-file>*.welcome</welcome-file>
-   </welcome-file-list>
-   
-   <error-page id="error-page0">
-      <error-code>404</error-code>
-      <location>/error-page0</location>
-   </error-page>
-   <error-page id="error-page1">
-      <exception-type>java.lang.Throwable</exception-type>
-      <location>/error-page1</location>
-   </error-page>
-
-   <taglib>
-      <taglib-uri>jsp-config0</taglib-uri>
-      <taglib-location>/WEB-INF/tlds/jsp-config0.tld</taglib-location>
-   </taglib>
-
-   <!-- resource env ref -->
-   <resource-env-ref id="webAppResourceEnvRef1-id">
-      <description>en-webAppResourceEnvRef1-desc</description>
-      <resource-env-ref-name>webAppResourceEnvRef1Name</resource-env-ref-name>
-      <resource-env-ref-type>webAppResourceEnvRef1Type</resource-env-ref-type>
-   </resource-env-ref>
-   <resource-env-ref id="webAppResourceEnvRef2-id">
-      <description>en-webAppResourceEnvRef2-desc</description>
-      <resource-env-ref-name>webAppResourceEnvRef2Name</resource-env-ref-name>
-      <resource-env-ref-type>webAppResourceEnvRef2Type</resource-env-ref-type>
-   </resource-env-ref>
-   
-   <!-- resource ref -->
-   <resource-ref id="webAppResourceRef1-id">
-      <description>en-webAppResourceRef1-desc</description>
-      <res-ref-name>webAppResourceRef1Name</res-ref-name>
-      <res-type>webAppResourceRef1Type</res-type>
-      <res-auth>Application</res-auth>
-      <res-sharing-scope>Shareable</res-sharing-scope>
-   </resource-ref>
-   <resource-ref id="webAppResourceRef2-id">
-      <description>en-webAppResourceRef2-desc</description>
-      <res-ref-name>webAppResourceRef2Name</res-ref-name>
-      <res-type>webAppResourceRef2Type</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Unshareable</res-sharing-scope>
-   </resource-ref>
-   
-    <security-constraint id="security-constraint0">
-       <display-name>security-constraint0-display-name</display-name>
-       <web-resource-collection id="web-resource-collection0">
-          <web-resource-name>web-resource0-name</web-resource-name>
-         <url-pattern>/resource0/*</url-pattern>
-      </web-resource-collection>
-       <web-resource-collection id="web-resource-collection1">
-          <web-resource-name>web-resource1-name</web-resource-name>
-          <url-pattern>/resource1/*</url-pattern>
-       </web-resource-collection>
-       <auth-constraint id="auth-constraint0">
-          <description></description>
-          <role-name>role0</role-name>
-       </auth-constraint>
-       <user-data-constraint>
-          <transport-guarantee>NONE</transport-guarantee>
-       </user-data-constraint>
-    </security-constraint>
-    <security-constraint id="security-constraint-excluded">
-       <display-name>security-constraint-excluded-name</display-name>
-       <web-resource-collection id="web-resource-excluded">
-          <web-resource-name>web-resource-excluded-name</web-resource-name>
-          <url-pattern>/resource-excluded/*</url-pattern>
-       </web-resource-collection>
-       <auth-constraint />
-   </security-constraint>
-    <security-constraint id="security-constraint-unchecked">
-       <display-name>security-constraint-unchecked-name</display-name>
-       <web-resource-collection id="web-resource-collection-unchecked">
-          <web-resource-name>web-resource-unchecked-name</web-resource-name>
-          <url-pattern>/resource-unchecked/*</url-pattern>
-       </web-resource-collection>
-    </security-constraint>
-
-   <login-config id="login-config-FORM">
-      <auth-method>FORM</auth-method>
-      <form-login-config>
-         <form-login-page>/login.jsp</form-login-page>
-         <form-error-page>/login-error.jsp</form-error-page>
-      </form-login-config>
-   </login-config>
-   
-   <security-role id="security-role0">
-      <role-name>role0</role-name>
-   </security-role>
-    <security-role id="security-role1">
-       <role-name>role1</role-name>
-    </security-role>
-    
-   <!-- env entry -->
-   <env-entry id="webAppEnvEntry1-id">
-      <description>en-webAppEnvEntry1-desc</description>
-      <env-entry-name>webAppEnvEntry1Name</env-entry-name>
-      <env-entry-value>webAppEnvEntry1Value</env-entry-value>
-      <env-entry-type>java.lang.String</env-entry-type>
-   </env-entry>
-   <env-entry id="webAppEnvEntry2-id">
-      <description>en-webAppEnvEntry2-desc</description>
-      <env-entry-name>webAppEnvEntry2Name</env-entry-name>
-      <env-entry-value>webAppEnvEntry2Value</env-entry-value>
-      <env-entry-type>java.lang.String</env-entry-type>
-   </env-entry>
-
-   <!-- ejb ref -->
-   <ejb-ref id="webAppEjbRef1-id">
-      <description>en-webAppEjbRef1-desc</description>
-      <ejb-ref-name>webAppEjbRef1Name</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <home>webAppEjbRef1Home</home>
-      <remote>webAppEjbRef1Remote</remote>
-      <ejb-link>webAppEjbRef1EjbLink</ejb-link>
-   </ejb-ref>
-   <ejb-ref id="webAppEjbRef2-id">
-      <description>en-webAppEjbRef2-desc</description>
-      <ejb-ref-name>webAppEjbRef2Name</ejb-ref-name>
-      <ejb-ref-type>Entity</ejb-ref-type>
-      <home>webAppEjbRef2Home</home>
-      <remote>webAppEjbRef2Remote</remote>
-      <ejb-link>webAppEjbRef2EjbLink</ejb-link>
-   </ejb-ref>
-
-   <ejb-local-ref id="webAppEjbLocalRef1-id">
-      <description>en-webAppEjbLocalRef1-desc</description>
-      <ejb-ref-name>webAppEjbLocalRef1-name</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <local-home>ejb.local.home.class</local-home>
-      <local>ejb.local.class</local>
-      <ejb-link>webAppEjbLocalRef1-link</ejb-link>
-   </ejb-local-ref>
-   <ejb-local-ref id="webAppEjbLocalRef2-id">
-      <description>en-webAppEjbLocalRef2-desc</description>
-      <ejb-ref-name>webAppEjbLocalRef2-name</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <local-home>ejb.local.home.class</local-home>
-      <local>ejb.local.class</local>
-      <ejb-link>webAppEjbLocalRef2-link</ejb-link>
-   </ejb-local-ref>
-</web-app>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+"http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app id="web-app_2_3">
+   
+   <icon id="en-web-app-icon-id">
+      <small-icon>en-web-app-small-icon</small-icon>
+      <large-icon>en-web-app-large-icon</large-icon>
+   </icon>
+   <display-name>web-app_2_3-display-name</display-name>
+
+    <description>web-app-desc</description>
+    
+    <distributable/>
+
+    <context-param id="context-param0">
+      <param-name>context-param0-name</param-name>
+      <param-value>context-param0-value</param-value>
+      <description>context-param0-description</description>
+    </context-param>
+
+   <filter id="filter0">
+      <filter-name>filter0Name</filter-name>
+      <filter-class>filter0.class</filter-class>
+   </filter>
+   <filter-mapping id="filter0-mapping">
+      <filter-name>filter0Name</filter-name>
+      <url-pattern>/filter0/*</url-pattern>
+   </filter-mapping>
+    <filter-mapping id="filter1-mapping">
+       <filter-name>filter1Name</filter-name>
+       <servlet-name>servlet1</servlet-name>
+    </filter-mapping>
+
+    <listener id="listener0">
+        <listener-class>listener0.class</listener-class>
+    </listener>
+
+   <servlet id="servlet0">
+      <servlet-name>servlet0-name</servlet-name>
+      <servlet-class>
+         servlet0.class
+      </servlet-class>
+      <init-param id="servlet0-init-param0">
+         <param-name>init-param0-name</param-name>
+         <param-value>init-param0-value</param-value>
+      </init-param>
+      <init-param id="servlet0-init-param1">
+         <param-name>init-param1-name</param-name>
+         <param-value>init-param1-value</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+      <run-as>
+         <role-name>role0</role-name>
+      </run-as>
+      <security-role-ref>
+         <role-name>role1</role-name>
+      </security-role-ref>
+   </servlet>
+    <servlet id="servlet1">
+       <servlet-name>servlet1-name</servlet-name>
+       <servlet-class>servlet1.class</servlet-class>
+       <init-param id="servlet1-init-param0">
+          <param-name>init-param0-name</param-name>
+          <param-value>init-param0-value</param-value>
+       </init-param>
+       <init-param id="servlet1-init-param1">
+          <param-name>init-param1-name</param-name>
+          <param-value>init-param1-value</param-value>
+       </init-param>
+       <load-on-startup>1</load-on-startup>
+       <run-as>
+          <role-name>role0</role-name>
+       </run-as>
+       <security-role-ref>
+          <role-name>role1</role-name>
+       </security-role-ref>
+    </servlet>
+    <servlet-mapping id="servlet0-mapping">
+      <servlet-name>servlet0-name</servlet-name>
+      <url-pattern>/servlet0/*</url-pattern>
+   </servlet-mapping>
+    <servlet-mapping id="servlet1-mapping">
+       <servlet-name>servlet1-name</servlet-name>
+       <url-pattern>/servlet1/*</url-pattern>
+    </servlet-mapping>
+
+   <session-config id="session-config0">
+      <session-timeout>30</session-timeout>
+   </session-config>
+   <mime-mapping id="mime-mapping0">
+      <extension>ext0</extension>
+      <mime-type>x/type0</mime-type>
+   </mime-mapping>
+   <mime-mapping id="mime-mapping1">
+      <extension>ext1</extension>
+      <mime-type>x/type1</mime-type>
+   </mime-mapping>
+
+   <welcome-file-list id="welcome-file-list0">
+      <welcome-file>index.html</welcome-file>
+      <welcome-file>*.welcome</welcome-file>
+   </welcome-file-list>
+   
+   <error-page id="error-page0">
+      <error-code>404</error-code>
+      <location>/error-page0</location>
+   </error-page>
+   <error-page id="error-page1">
+      <exception-type>java.lang.Throwable</exception-type>
+      <location>/error-page1</location>
+   </error-page>
+
+   <taglib>
+      <taglib-uri>jsp-config0</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/jsp-config0.tld</taglib-location>
+   </taglib>
+
+   <!-- resource env ref -->
+   <resource-env-ref id="webAppResourceEnvRef1-id">
+      <description>en-webAppResourceEnvRef1-desc</description>
+      <resource-env-ref-name>webAppResourceEnvRef1Name</resource-env-ref-name>
+      <resource-env-ref-type>webAppResourceEnvRef1Type</resource-env-ref-type>
+   </resource-env-ref>
+   <resource-env-ref id="webAppResourceEnvRef2-id">
+      <description>en-webAppResourceEnvRef2-desc</description>
+      <resource-env-ref-name>webAppResourceEnvRef2Name</resource-env-ref-name>
+      <resource-env-ref-type>webAppResourceEnvRef2Type</resource-env-ref-type>
+   </resource-env-ref>
+   
+   <!-- resource ref -->
+   <resource-ref id="webAppResourceRef1-id">
+      <description>en-webAppResourceRef1-desc</description>
+      <res-ref-name>webAppResourceRef1Name</res-ref-name>
+      <res-type>webAppResourceRef1Type</res-type>
+      <res-auth>Application</res-auth>
+      <res-sharing-scope>Shareable</res-sharing-scope>
+   </resource-ref>
+   <resource-ref id="webAppResourceRef2-id">
+      <description>en-webAppResourceRef2-desc</description>
+      <res-ref-name>webAppResourceRef2Name</res-ref-name>
+      <res-type>webAppResourceRef2Type</res-type>
+      <res-auth>Container</res-auth>
+      <res-sharing-scope>Unshareable</res-sharing-scope>
+   </resource-ref>
+   
+    <security-constraint id="security-constraint0">
+       <display-name>security-constraint0-display-name</display-name>
+       <web-resource-collection id="web-resource-collection0">
+          <web-resource-name>web-resource0-name</web-resource-name>
+         <url-pattern>/resource0/*</url-pattern>
+      </web-resource-collection>
+       <web-resource-collection id="web-resource-collection1">
+          <web-resource-name>web-resource1-name</web-resource-name>
+          <url-pattern>/resource1/*</url-pattern>
+       </web-resource-collection>
+       <auth-constraint id="auth-constraint0">
+          <description></description>
+          <role-name>role0</role-name>
+       </auth-constraint>
+       <user-data-constraint>
+          <transport-guarantee>NONE</transport-guarantee>
+       </user-data-constraint>
+    </security-constraint>
+    <security-constraint id="security-constraint-excluded">
+       <display-name>security-constraint-excluded-name</display-name>
+       <web-resource-collection id="web-resource-excluded">
+          <web-resource-name>web-resource-excluded-name</web-resource-name>
+          <url-pattern>/resource-excluded/*</url-pattern>
+       </web-resource-collection>
+       <auth-constraint />
+   </security-constraint>
+    <security-constraint id="security-constraint-unchecked">
+       <display-name>security-constraint-unchecked-name</display-name>
+       <web-resource-collection id="web-resource-collection-unchecked">
+          <web-resource-name>web-resource-unchecked-name</web-resource-name>
+          <url-pattern>/resource-unchecked/*</url-pattern>
+       </web-resource-collection>
+    </security-constraint>
+
+   <login-config id="login-config-FORM">
+      <auth-method>FORM</auth-method>
+      <form-login-config>
+         <form-login-page>/login.jsp</form-login-page>
+         <form-error-page>/login-error.jsp</form-error-page>
+      </form-login-config>
+   </login-config>
+   
+   <security-role id="security-role0">
+      <role-name>role0</role-name>
+   </security-role>
+    <security-role id="security-role1">
+       <role-name>role1</role-name>
+    </security-role>
+    
+   <!-- env entry -->
+   <env-entry id="webAppEnvEntry1-id">
+      <description>en-webAppEnvEntry1-desc</description>
+      <env-entry-name>webAppEnvEntry1Name</env-entry-name>
+      <env-entry-value>webAppEnvEntry1Value</env-entry-value>
+      <env-entry-type>java.lang.String</env-entry-type>
+   </env-entry>
+   <env-entry id="webAppEnvEntry2-id">
+      <description>en-webAppEnvEntry2-desc</description>
+      <env-entry-name>webAppEnvEntry2Name</env-entry-name>
+      <env-entry-value>webAppEnvEntry2Value</env-entry-value>
+      <env-entry-type>java.lang.String</env-entry-type>
+   </env-entry>
+
+   <!-- ejb ref -->
+   <ejb-ref id="webAppEjbRef1-id">
+      <description>en-webAppEjbRef1-desc</description>
+      <ejb-ref-name>webAppEjbRef1Name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <home>webAppEjbRef1Home</home>
+      <remote>webAppEjbRef1Remote</remote>
+      <ejb-link>webAppEjbRef1EjbLink</ejb-link>
+   </ejb-ref>
+   <ejb-ref id="webAppEjbRef2-id">
+      <description>en-webAppEjbRef2-desc</description>
+      <ejb-ref-name>webAppEjbRef2Name</ejb-ref-name>
+      <ejb-ref-type>Entity</ejb-ref-type>
+      <home>webAppEjbRef2Home</home>
+      <remote>webAppEjbRef2Remote</remote>
+      <ejb-link>webAppEjbRef2EjbLink</ejb-link>
+   </ejb-ref>
+
+   <ejb-local-ref id="webAppEjbLocalRef1-id">
+      <description>en-webAppEjbLocalRef1-desc</description>
+      <ejb-ref-name>webAppEjbLocalRef1-name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <local-home>ejb.local.home.class</local-home>
+      <local>ejb.local.class</local>
+      <ejb-link>webAppEjbLocalRef1-link</ejb-link>
+   </ejb-local-ref>
+   <ejb-local-ref id="webAppEjbLocalRef2-id">
+      <description>en-webAppEjbLocalRef2-desc</description>
+      <ejb-ref-name>webAppEjbLocalRef2-name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <local-home>ejb.local.home.class</local-home>
+      <local>ejb.local.class</local>
+      <ejb-link>webAppEjbLocalRef2-link</ejb-link>
+   </ejb-local-ref>
+</web-app>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4"
-    xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    
-   <mime-mapping>
-      <extension>xhtml</extension>
-      <mime-type>application/xhtml+xml</mime-type>
-   </mime-mapping>
-
-</web-app>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp24_testMimeType.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4"
+    xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    
+   <mime-mapping>
+      <extension>xhtml</extension>
+      <mime-type>
+         application/xhtml+xml
+      </mime-type>
+   </mime-mapping>
+
+</web-app>

Deleted: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	2008-08-06 07:50:48 UTC (rev 76699)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -1,564 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    version="2.5" id="web-app-everything" metadata-complete="true">
-
-    <icon>
-       <small-icon>en-web-app-small-icon</small-icon>
-       <large-icon>en-web-app-large-icon</large-icon>
-    </icon>
-   <!-- description group -->
-   <description>en-web-app-desc</description>
-   <description xml:lang="fr">fr-web-app-desc</description>
-   <description xml:lang="de">de-web-app-desc</description>
-   <display-name>en-web-app-disp</display-name>
-   <display-name xml:lang="fr">fr-web-app-disp</display-name>
-   <display-name xml:lang="de">de-web-app-disp</display-name>
-   <icon id="en-web-app-icon-id">
-      <small-icon>en-web-app-small-icon</small-icon>
-      <large-icon>en-web-app-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="fr" id="fr-web-app-icon-id">
-      <small-icon>fr-web-app-small-icon</small-icon>
-      <large-icon>fr-web-app-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="de" id="de-web-app-icon-id">
-      <small-icon>de-web-app-small-icon</small-icon>
-      <large-icon>de-web-app-large-icon</large-icon>
-   </icon>
-
-   <context-param id="context-param0">
-      <description>context-param0-description</description>
-      <param-name>context-param0-name</param-name>
-      <param-value>context-param0-value</param-value>
-   </context-param>
-
-    <session-config id="session-config0">
-       <session-timeout>30</session-timeout>
-    </session-config>
-
-   <distributable/>
-
-   <filter id="filter0">
-      <description>filter0-description</description>
-      <display-name>filter0-display-name</display-name>
-      <icon>
-         <small-icon>filter0-small-icon</small-icon>
-         <large-icon>filter0-large-icon</large-icon>
-      </icon>
-      <filter-name>filter0Name</filter-name>
-      <filter-class>filter0Class</filter-class>
-   </filter>
-    <filter id="filter1">
-       <description>filter1-description</description>
-       <display-name>filter1-display-name</display-name>
-       <icon>
-          <small-icon>filter1-small-icon</small-icon>
-          <large-icon>filter1-large-icon</large-icon>
-       </icon>
-       <filter-name>filter1Name</filter-name>
-       <filter-class>filter1Class</filter-class>
-    </filter>
-    <filter-mapping id="filter0-mapping">
-      <filter-name>filter0Name</filter-name>
-      <url-pattern>/filter0/*</url-pattern>
-      <url-pattern>/*</url-pattern>
-      <dispatcher>FORWARD</dispatcher>
-      <dispatcher>REQUEST</dispatcher>
-   </filter-mapping>
-    <filter-mapping id="filter1-mapping">
-       <filter-name>filter1Name</filter-name>
-       <servlet-name>servlet0</servlet-name>
-       <servlet-name>servlet1</servlet-name>
-       <dispatcher>FORWARD</dispatcher>
-       <dispatcher>REQUEST</dispatcher>
-    </filter-mapping>
-
-   <error-page id="error-page0">
-      <error-code>404</error-code>
-      <location>/error-page0</location>
-   </error-page>
-    <error-page id="error-page1">
-       <exception-type>java.lang.Throwable</exception-type>
-       <location>/error-page1</location>
-    </error-page>
-
-    <jsp-config id="jsp-config0">
-       <taglib>
-          <taglib-uri>jsp-config0</taglib-uri>
-          <taglib-location>/WEB-INF/tlds/jsp-config0.tld</taglib-location>
-       </taglib>
-       <jsp-property-group>
-          <description>Property group for common configuration for all the JSP's</description>
-          <url-pattern>*.jsp</url-pattern>
-          <url-pattern>*.jspx</url-pattern>
-          <el-ignored>false</el-ignored>
-          <page-encoding>ISO-8859-1</page-encoding>
-          <scripting-invalid>false</scripting-invalid>
-          <is-xml>false</is-xml>
-          <include-prelude>/common-jsps/prelude.jsp</include-prelude>
-          <include-coda>/common-jsps/coda.jsp</include-coda>
-          <deferred-syntax-allowed-as-literal>true</deferred-syntax-allowed-as-literal>
-          <trim-directive-whitespaces>true</trim-directive-whitespaces>
-       </jsp-property-group>
-    </jsp-config>
-
-   <listener id="listener0">
-      <description>listener0-description</description>
-      <display-name>listener0-dipslay-name</display-name>
-      <icon id="listener0-icon">
-         <small-icon>listener0-small-icon</small-icon>
-         <large-icon>listener0-icon</large-icon>
-      </icon>
-      <listener-class>listener0.class</listener-class>
-   </listener>
-
-    <login-config id="login-config-FORM">
-       <auth-method>FORM</auth-method>
-       <form-login-config>
-          <form-login-page>/login.jsp</form-login-page>
-          <form-error-page>/login-error.jsp</form-error-page>
-       </form-login-config>
-    </login-config>
-
-    <mime-mapping id="mime-mapping0">
-      <extension>ext0</extension>
-      <mime-type>x/type0</mime-type>
-    </mime-mapping>
-    <mime-mapping id="mime-mapping1">
-       <extension>ext1</extension>
-       <mime-type>x/type1</mime-type>
-    </mime-mapping>
-
-   <servlet id="servlet0">
-      <servlet-name>servlet0-name</servlet-name>
-      <servlet-class>servlet0.class</servlet-class>
-      <init-param id="servlet0-init-param0">
-         <param-name>init-param0-name</param-name>
-         <param-value>init-param0-value</param-value>
-      </init-param>
-      <init-param id="servlet0-init-param1">
-         <param-name>init-param1-name</param-name>
-         <param-value>init-param1-value</param-value>
-      </init-param>
-      <load-on-startup>1</load-on-startup>
-      <run-as>
-         <role-name>run-as-role0</role-name>
-      </run-as>
-      <security-role-ref>
-         <role-name>servlet0-role-ref</role-name>
-         <role-link>role0</role-link>
-      </security-role-ref>
-   </servlet>
-    <servlet id="servlet1">
-       <servlet-name>servlet1-name</servlet-name>
-       <servlet-class>servlet1.class</servlet-class>
-       <init-param id="servlet1-init-param0">
-          <param-name>init-param0-name</param-name>
-          <param-value>init-param0-value</param-value>
-       </init-param>
-       <init-param id="servlet1-init-param1">
-          <param-name>init-param1-name</param-name>
-          <param-value>init-param1-value</param-value>
-       </init-param>
-       <load-on-startup>1</load-on-startup>
-       <run-as>
-          <role-name>run-as-role1</role-name>
-       </run-as>
-       <security-role-ref>
-          <role-name>servlet1-role-ref</role-name>
-          <role-link>role1</role-link>
-       </security-role-ref>
-    </servlet>
-    <servlet-mapping id="servlet0-mapping0">
-      <servlet-name>servlet0-name</servlet-name>
-      <url-pattern>/servlet0/*</url-pattern>
-   </servlet-mapping>
-    <servlet-mapping id="servlet0-mapping1">
-       <servlet-name>servlet0-name</servlet-name>
-       <url-pattern>/servlet0/*.s</url-pattern>
-       <url-pattern>/servlet0/*.sx</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping id="servlet1-mapping2">
-       <servlet-name>servlet1-name</servlet-name>
-       <url-pattern>/servlet1/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping id="servlet1-mapping3">
-       <servlet-name>servlet1-name</servlet-name>
-       <url-pattern>/servlet1/*.s</url-pattern>
-       <url-pattern>/servlet1/*.sx</url-pattern>
-    </servlet-mapping>
-
-    <security-constraint id="security-constraint0">
-       <display-name>security-constraint0-display-name</display-name>
-       <web-resource-collection id="web-resource-collection0">
-          <web-resource-name>web-resource0-name</web-resource-name>
-         <url-pattern>/resource0/*</url-pattern>
-      </web-resource-collection>
-       <web-resource-collection id="web-resource-collection1">
-          <web-resource-name>web-resource1-name</web-resource-name>
-          <url-pattern>/resource1/*</url-pattern>
-       </web-resource-collection>
-       <auth-constraint id="auth-constraint0">
-          <description></description>
-          <role-name>role0</role-name>
-       </auth-constraint>
-       <user-data-constraint>
-          <transport-guarantee>NONE</transport-guarantee>
-       </user-data-constraint>
-    </security-constraint>
-    <security-constraint id="security-constraint-excluded">
-       <display-name>security-constraint-excluded-name</display-name>
-       <web-resource-collection id="web-resource-excluded">
-          <web-resource-name>web-resource-excluded-name</web-resource-name>
-          <url-pattern>/resource-excluded/*</url-pattern>
-       </web-resource-collection>
-       <auth-constraint />
-   </security-constraint>
-    <security-constraint id="security-constraint-unchecked">
-       <display-name>security-constraint-unchecked-name</display-name>
-       <web-resource-collection id="web-resource-collection-unchecked">
-          <web-resource-name>web-resource-unchecked-name</web-resource-name>
-          <url-pattern>/resource-unchecked/*</url-pattern>
-       </web-resource-collection>
-    </security-constraint>
-
-   <security-role id="security-role0">
-      <role-name>role0</role-name>
-   </security-role>
-    <security-role id="security-role1">
-       <role-name>role1</role-name>
-    </security-role>
-    
-    <welcome-file-list id="welcome-file-list0">
-       <welcome-file>index.html</welcome-file>
-       <welcome-file>*.welcome</welcome-file>
-    </welcome-file-list>
-
-   <!-- env entry -->
-   <env-entry id="webAppEnvEntry1-id">
-      <description>en-webAppEnvEntry1-desc</description>
-      <description xml:lang="fr">fr-webAppEnvEntry1-desc</description>
-      <description xml:lang="de">de-webAppEnvEntry1-desc</description>
-      <env-entry-name>webAppEnvEntry1Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
-      <env-entry-value>webAppEnvEntry1Value</env-entry-value>
-      <mapped-name>webAppEnvEntry1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry1Injection1Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry1Injection2Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry1Injection2Name</injection-target-name>
-      </injection-target>
-   </env-entry>
-   <env-entry id="webAppEnvEntry2-id">
-      <description>en-webAppEnvEntry2-desc</description>
-      <description xml:lang="fr">fr-webAppEnvEntry2-desc</description>
-      <description xml:lang="de">de-webAppEnvEntry2-desc</description>
-      <env-entry-name>webAppEnvEntry2Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
-      <env-entry-value>webAppEnvEntry2Value</env-entry-value>
-      <mapped-name>webAppEnvEntry2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry2Injection1Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry2Injection2Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry2Injection2Name</injection-target-name>
-      </injection-target>
-   </env-entry>
-
-   <!-- ejb ref -->
-   <ejb-ref id="webAppEjbRef1-id">
-      <description>en-webAppEjbRef1-desc</description>
-      <description xml:lang="fr">fr-webAppEjbRef1-desc</description>
-      <description xml:lang="de">de-webAppEjbRef1-desc</description>
-      <ejb-ref-name>webAppEjbRef1Name</ejb-ref-name>
-      <ejb-ref-type>Session</ejb-ref-type>
-      <home>webAppEjbRef1Home</home>
-      <remote>webAppEjbRef1Remote</remote>
-      <ejb-link>webAppEjbRef1EjbLink</ejb-link>
-      <mapped-name>webAppEjbRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEjbRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppEjbRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEjbRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppEjbRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </ejb-ref>
-   <ejb-ref id="webAppEjbRef2-id">
-      <description>en-webAppEjbRef2-desc</description>
-      <description xml:lang="fr">fr-webAppEjbRef2-desc</description>
-      <description xml:lang="de">de-webAppEjbRef2-desc</description>
-      <ejb-ref-name>webAppEjbRef2Name</ejb-ref-name>
-      <ejb-ref-type>Entity</ejb-ref-type>
-      <home>webAppEjbRef2Home</home>
-      <remote>webAppEjbRef2Remote</remote>
-      <ejb-link>webAppEjbRef2EjbLink</ejb-link>
-      <mapped-name>webAppEjbRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEjbRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppEjbRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEjbRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppEjbRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </ejb-ref>
-
-    <service-ref id="webAppServiceRef1-id">
-       <description>en-webAppServiceRef1-desc</description>
-       <description xml:lang="fr">fr-webAppServiceRef1-desc</description>
-       <description xml:lang="de">de-webAppServiceRef1-desc</description>
-       <service-ref-name>webAppServiceRef1Name</service-ref-name>
-       <service-interface>webAppServiceRef1Iface</service-interface>
-    </service-ref>
-    <service-ref id="webAppServiceRef2-id">
-       <description>en-webAppServiceRef2-desc</description>
-       <description xml:lang="fr">fr-webAppServiceRef2-desc</description>
-       <description xml:lang="de">de-webAppServiceRef2-desc</description>
-       <service-ref-name>webAppServiceRef2Name</service-ref-name>
-       <service-interface>webAppServiceRef2Iface</service-interface>
-    </service-ref>    
-
-   <!-- resource ref -->
-   <resource-ref id="webAppResourceRef1-id">
-      <description>en-webAppResourceRef1-desc</description>
-      <description xml:lang="fr">fr-webAppResourceRef1-desc</description>
-      <description xml:lang="de">de-webAppResourceRef1-desc</description>
-      <res-ref-name>webAppResourceRef1Name</res-ref-name>
-      <res-type>webAppResourceRef1Type</res-type>
-      <res-auth>Application</res-auth>
-      <res-sharing-scope>Shareable</res-sharing-scope>
-      <mapped-name>webAppResourceRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-ref>
-   <resource-ref id="webAppResourceRef2-id">
-      <description>en-webAppResourceRef2-desc</description>
-      <description xml:lang="fr">fr-webAppResourceRef2-desc</description>
-      <description xml:lang="de">de-webAppResourceRef2-desc</description>
-      <res-ref-name>webAppResourceRef2Name</res-ref-name>
-      <res-type>webAppResourceRef2Type</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Unshareable</res-sharing-scope>
-      <mapped-name>webAppResourceRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-ref>
-   
-   <!-- resource env ref -->
-   <resource-env-ref id="webAppResourceEnvRef1-id">
-      <description>en-webAppResourceEnvRef1-desc</description>
-      <description xml:lang="fr">fr-webAppResourceEnvRef1-desc</description>
-      <description xml:lang="de">de-webAppResourceEnvRef1-desc</description>
-      <resource-env-ref-name>webAppResourceEnvRef1Name</resource-env-ref-name>
-      <resource-env-ref-type>webAppResourceEnvRef1Type</resource-env-ref-type>
-      <mapped-name>webAppResourceEnvRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-env-ref>
-   <resource-env-ref id="webAppResourceEnvRef2-id">
-      <description>en-webAppResourceEnvRef2-desc</description>
-      <description xml:lang="fr">fr-webAppResourceEnvRef2-desc</description>
-      <description xml:lang="de">de-webAppResourceEnvRef2-desc</description>
-      <resource-env-ref-name>webAppResourceEnvRef2Name</resource-env-ref-name>
-      <resource-env-ref-type>webAppResourceEnvRef2Type</resource-env-ref-type>
-      <mapped-name>webAppResourceEnvRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-env-ref>
-   
-   <!-- message destination ref -->
-   <message-destination-ref id="webAppMessageDestinationRef1-id">
-      <description>en-webAppMessageDestinationRef1-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestinationRef1-desc</description>
-      <description xml:lang="de">de-webAppMessageDestinationRef1-desc</description>
-      <message-destination-ref-name>webAppMessageDestinationRef1Name</message-destination-ref-name>
-      <message-destination-type>webAppMessageDestinationRef1Type</message-destination-type>
-      <message-destination-usage>Consumes</message-destination-usage>
-      <message-destination-link>webAppMessageDestinationRef1Link</message-destination-link>
-      <mapped-name>webAppMessageDestinationRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   <message-destination-ref id="webAppMessageDestinationRef2-id">
-      <description>en-webAppMessageDestinationRef2-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestinationRef2-desc</description>
-      <description xml:lang="de">de-webAppMessageDestinationRef2-desc</description>
-      <message-destination-ref-name>webAppMessageDestinationRef2Name</message-destination-ref-name>
-      <message-destination-type>webAppMessageDestinationRef2Type</message-destination-type>
-      <message-destination-usage>Produces</message-destination-usage>
-      <message-destination-link>webAppMessageDestinationRef2Link</message-destination-link>
-      <mapped-name>webAppMessageDestinationRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   <message-destination-ref id="webAppMessageDestinationRef3-id">
-      <description>en-webAppMessageDestinationRef3-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestinationRef3-desc</description>
-      <description xml:lang="de">de-webAppMessageDestinationRef3-desc</description>
-      <message-destination-ref-name>webAppMessageDestinationRef3Name</message-destination-ref-name>
-      <message-destination-type>webAppMessageDestinationRef3Type</message-destination-type>
-      <message-destination-usage>ConsumesProduces</message-destination-usage>
-      <message-destination-link>webAppMessageDestinationRef3Link</message-destination-link>
-      <mapped-name>webAppMessageDestinationRef3MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef3Injection1Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef3Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef3Injection2Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef3Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   
-   <!-- persistence unit ref -->
-   <persistence-unit-ref id="webAppPersistenceUnitRef1-id">
-      <description>en-webAppPersistenceUnitRef1-desc</description>
-      <description xml:lang="fr">fr-webAppPersistenceUnitRef1-desc</description>
-      <description xml:lang="de">de-webAppPersistenceUnitRef1-desc</description>
-      <persistence-unit-ref-name>webAppPersistenceUnitRef1Name</persistence-unit-ref-name>
-      <persistence-unit-name>webAppPersistenceUnitRef1Unit</persistence-unit-name>
-      <mapped-name>webAppPersistenceUnitRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </persistence-unit-ref>
-   <persistence-unit-ref id="webAppPersistenceUnitRef2-id">
-      <description>en-webAppPersistenceUnitRef2-desc</description>
-      <description xml:lang="fr">fr-webAppPersistenceUnitRef2-desc</description>
-      <description xml:lang="de">de-webAppPersistenceUnitRef2-desc</description>
-      <persistence-unit-ref-name>webAppPersistenceUnitRef2Name</persistence-unit-ref-name>
-      <persistence-unit-name>webAppPersistenceUnitRef2Unit</persistence-unit-name>
-      <mapped-name>webAppPersistenceUnitRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </persistence-unit-ref>
-   
-   <!-- post-construct -->
-   <post-construct>
-      <lifecycle-callback-class>webAppPostConstruct1Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPostConstruct1Method</lifecycle-callback-method>
-   </post-construct>
-   <post-construct>
-      <lifecycle-callback-class>webAppPostConstruct2Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPostConstruct2Method</lifecycle-callback-method>
-   </post-construct>
-   
-   <!-- pre-destroy -->
-   <pre-destroy>
-      <lifecycle-callback-class>webAppPreDestroy1Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPreDestroy1Method</lifecycle-callback-method>
-   </pre-destroy>
-   <pre-destroy>
-      <lifecycle-callback-class>webAppPreDestroy2Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPreDestroy2Method</lifecycle-callback-method>
-   </pre-destroy>
-   
-   <!-- message destination -->
-   <message-destination id="webAppMessageDestination1-id">
-      <description>en-webAppMessageDestination1-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestination1-desc</description>
-      <description xml:lang="de">de-webAppMessageDestination1-desc</description>
-      <display-name>en-webAppMessageDestination1-disp</display-name>
-      <display-name xml:lang="fr">fr-webAppMessageDestination1-disp</display-name>
-      <display-name xml:lang="de">de-webAppMessageDestination1-disp</display-name>
-      <icon id="en-webAppMessageDestination1-icon-id">
-         <small-icon>en-webAppMessageDestination1-small-icon</small-icon>
-         <large-icon>en-webAppMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-webAppMessageDestination1-icon-id">
-         <small-icon>fr-webAppMessageDestination1-small-icon</small-icon>
-         <large-icon>fr-webAppMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-webAppMessageDestination1-icon-id">
-         <small-icon>de-webAppMessageDestination1-small-icon</small-icon>
-         <large-icon>de-webAppMessageDestination1-large-icon</large-icon>
-      </icon>
-      <message-destination-name>webAppMessageDestination1Name</message-destination-name>
-      <mapped-name>webAppMessageDestination1MappedName</mapped-name>
-   </message-destination>
-   <message-destination id="webAppMessageDestination2-id">
-      <description>en-webAppMessageDestination2-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestination2-desc</description>
-      <description xml:lang="de">de-webAppMessageDestination2-desc</description>
-      <display-name>en-webAppMessageDestination2-disp</display-name>
-      <display-name xml:lang="fr">fr-webAppMessageDestination2-disp</display-name>
-      <display-name xml:lang="de">de-webAppMessageDestination2-disp</display-name>
-      <icon id="en-webAppMessageDestination2-icon-id">
-         <small-icon>en-webAppMessageDestination2-small-icon</small-icon>
-         <large-icon>en-webAppMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-webAppMessageDestination2-icon-id">
-         <small-icon>fr-webAppMessageDestination2-small-icon</small-icon>
-         <large-icon>fr-webAppMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-webAppMessageDestination2-icon-id">
-         <small-icon>de-webAppMessageDestination2-small-icon</small-icon>
-         <large-icon>de-webAppMessageDestination2-large-icon</large-icon>
-      </icon>
-      <message-destination-name>webAppMessageDestination2Name</message-destination-name>
-      <mapped-name>webAppMessageDestination2MappedName</mapped-name>
-   </message-destination>
-
-    <locale-encoding-mapping-list id="locale-encoding-mapping-list0">
-       <locale-encoding-mapping>
-          <locale>en</locale>
-          <encoding>en</encoding>
-       </locale-encoding-mapping>
-    </locale-encoding-mapping-list>
- </web-app>

Copied: projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml (from rev 76701, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml)
===================================================================
--- projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	                        (rev 0)
+++ projects/metadata/tags/1.0.0.Beta35/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	2008-08-06 14:00:22 UTC (rev 76711)
@@ -0,0 +1,568 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <web-app xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+    version="2.5" id="web-app-everything" metadata-complete="true">
+
+    <icon>
+       <small-icon>en-web-app-small-icon</small-icon>
+       <large-icon>en-web-app-large-icon</large-icon>
+    </icon>
+   <!-- description group -->
+   <description>en-web-app-desc</description>
+   <description xml:lang="fr">fr-web-app-desc</description>
+   <description xml:lang="de">de-web-app-desc</description>
+   <display-name>en-web-app-disp</display-name>
+   <display-name xml:lang="fr">fr-web-app-disp</display-name>
+   <display-name xml:lang="de">de-web-app-disp</display-name>
+   <icon id="en-web-app-icon-id">
+      <small-icon>en-web-app-small-icon</small-icon>
+      <large-icon>en-web-app-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="fr" id="fr-web-app-icon-id">
+      <small-icon>fr-web-app-small-icon</small-icon>
+      <large-icon>fr-web-app-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="de" id="de-web-app-icon-id">
+      <small-icon>de-web-app-small-icon</small-icon>
+      <large-icon>de-web-app-large-icon</large-icon>
+   </icon>
+
+   <context-param id="context-param0">
+      <description>context-param0-description</description>
+      <param-name>context-param0-name</param-name>
+      <param-value>context-param0-value</param-value>
+   </context-param>
+
+    <session-config id="session-config0">
+       <session-timeout>30</session-timeout>
+    </session-config>
+
+   <distributable/>
+
+   <filter id="filter0">
+      <description>filter0-description</description>
+      <display-name>filter0-display-name</display-name>
+      <icon>
+         <small-icon>filter0-small-icon</small-icon>
+         <large-icon>filter0-large-icon</large-icon>
+      </icon>
+      <filter-name>filter0Name</filter-name>
+      <filter-class>filter0Class</filter-class>
+   </filter>
+    <filter id="filter1">
+       <description>filter1-description</description>
+       <display-name>filter1-display-name</display-name>
+       <icon>
+          <small-icon>filter1-small-icon</small-icon>
+          <large-icon>filter1-large-icon</large-icon>
+       </icon>
+       <filter-name>filter1Name</filter-name>
+       <filter-class>filter1Class</filter-class>
+    </filter>
+    <filter-mapping id="filter0-mapping">
+      <filter-name>filter0Name</filter-name>
+      <url-pattern>/filter0/*</url-pattern>
+      <url-pattern>/*</url-pattern>
+      <dispatcher>FORWARD</dispatcher>
+      <dispatcher>REQUEST</dispatcher>
+   </filter-mapping>
+    <filter-mapping id="filter1-mapping">
+       <filter-name>filter1Name</filter-name>
+       <servlet-name>servlet0</servlet-name>
+       <servlet-name>servlet1</servlet-name>
+       <dispatcher>FORWARD</dispatcher>
+       <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+
+   <error-page id="error-page0">
+      <error-code>404</error-code>
+      <location>/error-page0</location>
+   </error-page>
+    <error-page id="error-page1">
+       <exception-type>java.lang.Throwable</exception-type>
+       <location>/error-page1</location>
+    </error-page>
+
+    <jsp-config id="jsp-config0">
+       <taglib>
+          <taglib-uri>jsp-config0</taglib-uri>
+          <taglib-location>/WEB-INF/tlds/jsp-config0.tld</taglib-location>
+       </taglib>
+       <jsp-property-group>
+          <description>Property group for common configuration for all the JSP's</description>
+          <url-pattern>*.jsp</url-pattern>
+          <url-pattern>*.jspx</url-pattern>
+          <el-ignored>false</el-ignored>
+          <page-encoding>ISO-8859-1</page-encoding>
+          <scripting-invalid>false</scripting-invalid>
+          <is-xml>false</is-xml>
+          <include-prelude>/common-jsps/prelude.jsp</include-prelude>
+          <include-coda>/common-jsps/coda.jsp</include-coda>
+          <deferred-syntax-allowed-as-literal>true</deferred-syntax-allowed-as-literal>
+          <trim-directive-whitespaces>true</trim-directive-whitespaces>
+       </jsp-property-group>
+    </jsp-config>
+
+   <listener id="listener0">
+      <description>listener0-description</description>
+      <display-name>listener0-dipslay-name</display-name>
+      <icon id="listener0-icon">
+         <small-icon>listener0-small-icon</small-icon>
+         <large-icon>listener0-icon</large-icon>
+      </icon>
+      <listener-class>
+         listener0.class
+      </listener-class>
+   </listener>
+
+    <login-config id="login-config-FORM">
+       <auth-method>FORM</auth-method>
+       <form-login-config>
+          <form-login-page>/login.jsp</form-login-page>
+          <form-error-page>/login-error.jsp</form-error-page>
+       </form-login-config>
+    </login-config>
+
+    <mime-mapping id="mime-mapping0">
+      <extension>ext0</extension>
+      <mime-type>x/type0</mime-type>
+    </mime-mapping>
+    <mime-mapping id="mime-mapping1">
+       <extension>ext1</extension>
+       <mime-type>x/type1</mime-type>
+    </mime-mapping>
+
+   <servlet id="servlet0">
+      <servlet-name>servlet0-name</servlet-name>
+      <servlet-class>
+         servlet0.class
+      </servlet-class>
+      <init-param id="servlet0-init-param0">
+         <param-name>init-param0-name</param-name>
+         <param-value>init-param0-value</param-value>
+      </init-param>
+      <init-param id="servlet0-init-param1">
+         <param-name>init-param1-name</param-name>
+         <param-value>init-param1-value</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+      <run-as>
+         <role-name>run-as-role0</role-name>
+      </run-as>
+      <security-role-ref>
+         <role-name>servlet0-role-ref</role-name>
+         <role-link>role0</role-link>
+      </security-role-ref>
+   </servlet>
+    <servlet id="servlet1">
+       <servlet-name>servlet1-name</servlet-name>
+       <servlet-class>servlet1.class</servlet-class>
+       <init-param id="servlet1-init-param0">
+          <param-name>init-param0-name</param-name>
+          <param-value>init-param0-value</param-value>
+       </init-param>
+       <init-param id="servlet1-init-param1">
+          <param-name>init-param1-name</param-name>
+          <param-value>init-param1-value</param-value>
+       </init-param>
+       <load-on-startup>1</load-on-startup>
+       <run-as>
+          <role-name>run-as-role1</role-name>
+       </run-as>
+       <security-role-ref>
+          <role-name>servlet1-role-ref</role-name>
+          <role-link>role1</role-link>
+       </security-role-ref>
+    </servlet>
+    <servlet-mapping id="servlet0-mapping0">
+      <servlet-name>servlet0-name</servlet-name>
+      <url-pattern>/servlet0/*</url-pattern>
+   </servlet-mapping>
+    <servlet-mapping id="servlet0-mapping1">
+       <servlet-name>servlet0-name</servlet-name>
+       <url-pattern>/servlet0/*.s</url-pattern>
+       <url-pattern>/servlet0/*.sx</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping id="servlet1-mapping2">
+       <servlet-name>servlet1-name</servlet-name>
+       <url-pattern>/servlet1/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping id="servlet1-mapping3">
+       <servlet-name>servlet1-name</servlet-name>
+       <url-pattern>/servlet1/*.s</url-pattern>
+       <url-pattern>/servlet1/*.sx</url-pattern>
+    </servlet-mapping>
+
+    <security-constraint id="security-constraint0">
+       <display-name>security-constraint0-display-name</display-name>
+       <web-resource-collection id="web-resource-collection0">
+          <web-resource-name>web-resource0-name</web-resource-name>
+         <url-pattern>/resource0/*</url-pattern>
+      </web-resource-collection>
+       <web-resource-collection id="web-resource-collection1">
+          <web-resource-name>web-resource1-name</web-resource-name>
+          <url-pattern>/resource1/*</url-pattern>
+       </web-resource-collection>
+       <auth-constraint id="auth-constraint0">
+          <description></description>
+          <role-name>role0</role-name>
+       </auth-constraint>
+       <user-data-constraint>
+          <transport-guarantee>NONE</transport-guarantee>
+       </user-data-constraint>
+    </security-constraint>
+    <security-constraint id="security-constraint-excluded">
+       <display-name>security-constraint-excluded-name</display-name>
+       <web-resource-collection id="web-resource-excluded">
+          <web-resource-name>web-resource-excluded-name</web-resource-name>
+          <url-pattern>/resource-excluded/*</url-pattern>
+       </web-resource-collection>
+       <auth-constraint />
+   </security-constraint>
+    <security-constraint id="security-constraint-unchecked">
+       <display-name>security-constraint-unchecked-name</display-name>
+       <web-resource-collection id="web-resource-collection-unchecked">
+          <web-resource-name>web-resource-unchecked-name</web-resource-name>
+          <url-pattern>/resource-unchecked/*</url-pattern>
+       </web-resource-collection>
+    </security-constraint>
+
+   <security-role id="security-role0">
+      <role-name>role0</role-name>
+   </security-role>
+    <security-role id="security-role1">
+       <role-name>role1</role-name>
+    </security-role>
+    
+    <welcome-file-list id="welcome-file-list0">
+       <welcome-file>index.html</welcome-file>
+       <welcome-file>*.welcome</welcome-file>
+    </welcome-file-list>
+
+   <!-- env entry -->
+   <env-entry id="webAppEnvEntry1-id">
+      <description>en-webAppEnvEntry1-desc</description>
+      <description xml:lang="fr">fr-webAppEnvEntry1-desc</description>
+      <description xml:lang="de">de-webAppEnvEntry1-desc</description>
+      <env-entry-name>webAppEnvEntry1Name</env-entry-name>
+      <env-entry-type>java.lang.String</env-entry-type>
+      <env-entry-value>webAppEnvEntry1Value</env-entry-value>
+      <mapped-name>webAppEnvEntry1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppEnvEntry1Injection1Class</injection-target-class>
+         <injection-target-name>webAppEnvEntry1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppEnvEntry1Injection2Class</injection-target-class>
+         <injection-target-name>webAppEnvEntry1Injection2Name</injection-target-name>
+      </injection-target>
+   </env-entry>
+   <env-entry id="webAppEnvEntry2-id">
+      <description>en-webAppEnvEntry2-desc</description>
+      <description xml:lang="fr">fr-webAppEnvEntry2-desc</description>
+      <description xml:lang="de">de-webAppEnvEntry2-desc</description>
+      <env-entry-name>webAppEnvEntry2Name</env-entry-name>
+      <env-entry-type>java.lang.String</env-entry-type>
+      <env-entry-value>webAppEnvEntry2Value</env-entry-value>
+      <mapped-name>webAppEnvEntry2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppEnvEntry2Injection1Class</injection-target-class>
+         <injection-target-name>webAppEnvEntry2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppEnvEntry2Injection2Class</injection-target-class>
+         <injection-target-name>webAppEnvEntry2Injection2Name</injection-target-name>
+      </injection-target>
+   </env-entry>
+
+   <!-- ejb ref -->
+   <ejb-ref id="webAppEjbRef1-id">
+      <description>en-webAppEjbRef1-desc</description>
+      <description xml:lang="fr">fr-webAppEjbRef1-desc</description>
+      <description xml:lang="de">de-webAppEjbRef1-desc</description>
+      <ejb-ref-name>webAppEjbRef1Name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <home>webAppEjbRef1Home</home>
+      <remote>webAppEjbRef1Remote</remote>
+      <ejb-link>webAppEjbRef1EjbLink</ejb-link>
+      <mapped-name>webAppEjbRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppEjbRef1Injection1Class</injection-target-class>
+         <injection-target-name>webAppEjbRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppEjbRef1Injection2Class</injection-target-class>
+         <injection-target-name>webAppEjbRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </ejb-ref>
+   <ejb-ref id="webAppEjbRef2-id">
+      <description>en-webAppEjbRef2-desc</description>
+      <description xml:lang="fr">fr-webAppEjbRef2-desc</description>
+      <description xml:lang="de">de-webAppEjbRef2-desc</description>
+      <ejb-ref-name>webAppEjbRef2Name</ejb-ref-name>
+      <ejb-ref-type>Entity</ejb-ref-type>
+      <home>webAppEjbRef2Home</home>
+      <remote>webAppEjbRef2Remote</remote>
+      <ejb-link>webAppEjbRef2EjbLink</ejb-link>
+      <mapped-name>webAppEjbRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppEjbRef2Injection1Class</injection-target-class>
+         <injection-target-name>webAppEjbRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppEjbRef2Injection2Class</injection-target-class>
+         <injection-target-name>webAppEjbRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </ejb-ref>
+
+    <service-ref id="webAppServiceRef1-id">
+       <description>en-webAppServiceRef1-desc</description>
+       <description xml:lang="fr">fr-webAppServiceRef1-desc</description>
+       <description xml:lang="de">de-webAppServiceRef1-desc</description>
+       <service-ref-name>webAppServiceRef1Name</service-ref-name>
+       <service-interface>webAppServiceRef1Iface</service-interface>
+    </service-ref>
+    <service-ref id="webAppServiceRef2-id">
+       <description>en-webAppServiceRef2-desc</description>
+       <description xml:lang="fr">fr-webAppServiceRef2-desc</description>
+       <description xml:lang="de">de-webAppServiceRef2-desc</description>
+       <service-ref-name>webAppServiceRef2Name</service-ref-name>
+       <service-interface>webAppServiceRef2Iface</service-interface>
+    </service-ref>    
+
+   <!-- resource ref -->
+   <resource-ref id="webAppResourceRef1-id">
+      <description>en-webAppResourceRef1-desc</description>
+      <description xml:lang="fr">fr-webAppResourceRef1-desc</description>
+      <description xml:lang="de">de-webAppResourceRef1-desc</description>
+      <res-ref-name>webAppResourceRef1Name</res-ref-name>
+      <res-type>webAppResourceRef1Type</res-type>
+      <res-auth>Application</res-auth>
+      <res-sharing-scope>Shareable</res-sharing-scope>
+      <mapped-name>webAppResourceRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppResourceRef1Injection1Class</injection-target-class>
+         <injection-target-name>webAppResourceRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppResourceRef1Injection2Class</injection-target-class>
+         <injection-target-name>webAppResourceRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-ref>
+   <resource-ref id="webAppResourceRef2-id">
+      <description>en-webAppResourceRef2-desc</description>
+      <description xml:lang="fr">fr-webAppResourceRef2-desc</description>
+      <description xml:lang="de">de-webAppResourceRef2-desc</description>
+      <res-ref-name>webAppResourceRef2Name</res-ref-name>
+      <res-type>webAppResourceRef2Type</res-type>
+      <res-auth>Container</res-auth>
+      <res-sharing-scope>Unshareable</res-sharing-scope>
+      <mapped-name>webAppResourceRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppResourceRef2Injection1Class</injection-target-class>
+         <injection-target-name>webAppResourceRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppResourceRef2Injection2Class</injection-target-class>
+         <injection-target-name>webAppResourceRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-ref>
+   
+   <!-- resource env ref -->
+   <resource-env-ref id="webAppResourceEnvRef1-id">
+      <description>en-webAppResourceEnvRef1-desc</description>
+      <description xml:lang="fr">fr-webAppResourceEnvRef1-desc</description>
+      <description xml:lang="de">de-webAppResourceEnvRef1-desc</description>
+      <resource-env-ref-name>webAppResourceEnvRef1Name</resource-env-ref-name>
+      <resource-env-ref-type>webAppResourceEnvRef1Type</resource-env-ref-type>
+      <mapped-name>webAppResourceEnvRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppResourceEnvRef1Injection1Class</injection-target-class>
+         <injection-target-name>webAppResourceEnvRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppResourceEnvRef1Injection2Class</injection-target-class>
+         <injection-target-name>webAppResourceEnvRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-env-ref>
+   <resource-env-ref id="webAppResourceEnvRef2-id">
+      <description>en-webAppResourceEnvRef2-desc</description>
+      <description xml:lang="fr">fr-webAppResourceEnvRef2-desc</description>
+      <description xml:lang="de">de-webAppResourceEnvRef2-desc</description>
+      <resource-env-ref-name>webAppResourceEnvRef2Name</resource-env-ref-name>
+      <resource-env-ref-type>webAppResourceEnvRef2Type</resource-env-ref-type>
+      <mapped-name>webAppResourceEnvRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppResourceEnvRef2Injection1Class</injection-target-class>
+         <injection-target-name>webAppResourceEnvRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppResourceEnvRef2Injection2Class</injection-target-class>
+         <injection-target-name>webAppResourceEnvRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </resource-env-ref>
+   
+   <!-- message destination ref -->
+   <message-destination-ref id="webAppMessageDestinationRef1-id">
+      <description>en-webAppMessageDestinationRef1-desc</description>
+      <description xml:lang="fr">fr-webAppMessageDestinationRef1-desc</description>
+      <description xml:lang="de">de-webAppMessageDestinationRef1-desc</description>
+      <message-destination-ref-name>webAppMessageDestinationRef1Name</message-destination-ref-name>
+      <message-destination-type>webAppMessageDestinationRef1Type</message-destination-type>
+      <message-destination-usage>Consumes</message-destination-usage>
+      <message-destination-link>webAppMessageDestinationRef1Link</message-destination-link>
+      <mapped-name>webAppMessageDestinationRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppMessageDestinationRef1Injection1Class</injection-target-class>
+         <injection-target-name>webAppMessageDestinationRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppMessageDestinationRef1Injection2Class</injection-target-class>
+         <injection-target-name>webAppMessageDestinationRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   <message-destination-ref id="webAppMessageDestinationRef2-id">
+      <description>en-webAppMessageDestinationRef2-desc</description>
+      <description xml:lang="fr">fr-webAppMessageDestinationRef2-desc</description>
+      <description xml:lang="de">de-webAppMessageDestinationRef2-desc</description>
+      <message-destination-ref-name>webAppMessageDestinationRef2Name</message-destination-ref-name>
+      <message-destination-type>webAppMessageDestinationRef2Type</message-destination-type>
+      <message-destination-usage>Produces</message-destination-usage>
+      <message-destination-link>webAppMessageDestinationRef2Link</message-destination-link>
+      <mapped-name>webAppMessageDestinationRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppMessageDestinationRef2Injection1Class</injection-target-class>
+         <injection-target-name>webAppMessageDestinationRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppMessageDestinationRef2Injection2Class</injection-target-class>
+         <injection-target-name>webAppMessageDestinationRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   <message-destination-ref id="webAppMessageDestinationRef3-id">
+      <description>en-webAppMessageDestinationRef3-desc</description>
+      <description xml:lang="fr">fr-webAppMessageDestinationRef3-desc</description>
+      <description xml:lang="de">de-webAppMessageDestinationRef3-desc</description>
+      <message-destination-ref-name>webAppMessageDestinationRef3Name</message-destination-ref-name>
+      <message-destination-type>webAppMessageDestinationRef3Type</message-destination-type>
+      <message-destination-usage>ConsumesProduces</message-destination-usage>
+      <message-destination-link>webAppMessageDestinationRef3Link</message-destination-link>
+      <mapped-name>webAppMessageDestinationRef3MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppMessageDestinationRef3Injection1Class</injection-target-class>
+         <injection-target-name>webAppMessageDestinationRef3Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppMessageDestinationRef3Injection2Class</injection-target-class>
+         <injection-target-name>webAppMessageDestinationRef3Injection2Name</injection-target-name>
+      </injection-target>
+   </message-destination-ref>
+   
+   <!-- persistence unit ref -->
+   <persistence-unit-ref id="webAppPersistenceUnitRef1-id">
+      <description>en-webAppPersistenceUnitRef1-desc</description>
+      <description xml:lang="fr">fr-webAppPersistenceUnitRef1-desc</description>
+      <description xml:lang="de">de-webAppPersistenceUnitRef1-desc</description>
+      <persistence-unit-ref-name>webAppPersistenceUnitRef1Name</persistence-unit-ref-name>
+      <persistence-unit-name>webAppPersistenceUnitRef1Unit</persistence-unit-name>
+      <mapped-name>webAppPersistenceUnitRef1MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppPersistenceUnitRef1Injection1Class</injection-target-class>
+         <injection-target-name>webAppPersistenceUnitRef1Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppPersistenceUnitRef1Injection2Class</injection-target-class>
+         <injection-target-name>webAppPersistenceUnitRef1Injection2Name</injection-target-name>
+      </injection-target>
+   </persistence-unit-ref>
+   <persistence-unit-ref id="webAppPersistenceUnitRef2-id">
+      <description>en-webAppPersistenceUnitRef2-desc</description>
+      <description xml:lang="fr">fr-webAppPersistenceUnitRef2-desc</description>
+      <description xml:lang="de">de-webAppPersistenceUnitRef2-desc</description>
+      <persistence-unit-ref-name>webAppPersistenceUnitRef2Name</persistence-unit-ref-name>
+      <persistence-unit-name>webAppPersistenceUnitRef2Unit</persistence-unit-name>
+      <mapped-name>webAppPersistenceUnitRef2MappedName</mapped-name>
+      <injection-target>
+         <injection-target-class>webAppPersistenceUnitRef2Injection1Class</injection-target-class>
+         <injection-target-name>webAppPersistenceUnitRef2Injection1Name</injection-target-name>
+      </injection-target>
+      <injection-target>
+         <injection-target-class>webAppPersistenceUnitRef2Injection2Class</injection-target-class>
+         <injection-target-name>webAppPersistenceUnitRef2Injection2Name</injection-target-name>
+      </injection-target>
+   </persistence-unit-ref>
+   
+   <!-- post-construct -->
+   <post-construct>
+      <lifecycle-callback-class>webAppPostConstruct1Class</lifecycle-callback-class>
+      <lifecycle-callback-method>webAppPostConstruct1Method</lifecycle-callback-method>
+   </post-construct>
+   <post-construct>
+      <lifecycle-callback-class>webAppPostConstruct2Class</lifecycle-callback-class>
+      <lifecycle-callback-method>webAppPostConstruct2Method</lifecycle-callback-method>
+   </post-construct>
+   
+   <!-- pre-destroy -->
+   <pre-destroy>
+      <lifecycle-callback-class>webAppPreDestroy1Class</lifecycle-callback-class>
+      <lifecycle-callback-method>webAppPreDestroy1Method</lifecycle-callback-method>
+   </pre-destroy>
+   <pre-destroy>
+      <lifecycle-callback-class>webAppPreDestroy2Class</lifecycle-callback-class>
+      <lifecycle-callback-method>webAppPreDestroy2Method</lifecycle-callback-method>
+   </pre-destroy>
+   
+   <!-- message destination -->
+   <message-destination id="webAppMessageDestination1-id">
+      <description>en-webAppMessageDestination1-desc</description>
+      <description xml:lang="fr">fr-webAppMessageDestination1-desc</description>
+      <description xml:lang="de">de-webAppMessageDestination1-desc</description>
+      <display-name>en-webAppMessageDestination1-disp</display-name>
+      <display-name xml:lang="fr">fr-webAppMessageDestination1-disp</display-name>
+      <display-name xml:lang="de">de-webAppMessageDestination1-disp</display-name>
+      <icon id="en-webAppMessageDestination1-icon-id">
+         <small-icon>en-webAppMessageDestination1-small-icon</small-icon>
+         <large-icon>en-webAppMessageDestination1-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="fr" id="fr-webAppMessageDestination1-icon-id">
+         <small-icon>fr-webAppMessageDestination1-small-icon</small-icon>
+         <large-icon>fr-webAppMessageDestination1-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="de" id="de-webAppMessageDestination1-icon-id">
+         <small-icon>de-webAppMessageDestination1-small-icon</small-icon>
+         <large-icon>de-webAppMessageDestination1-large-icon</large-icon>
+      </icon>
+      <message-destination-name>webAppMessageDestination1Name</message-destination-name>
+      <mapped-name>webAppMessageDestination1MappedName</mapped-name>
+   </message-destination>
+   <message-destination id="webAppMessageDestination2-id">
+      <description>en-webAppMessageDestination2-desc</description>
+      <description xml:lang="fr">fr-webAppMessageDestination2-desc</description>
+      <description xml:lang="de">de-webAppMessageDestination2-desc</description>
+      <display-name>en-webAppMessageDestination2-disp</display-name>
+      <display-name xml:lang="fr">fr-webAppMessageDestination2-disp</display-name>
+      <display-name xml:lang="de">de-webAppMessageDestination2-disp</display-name>
+      <icon id="en-webAppMessageDestination2-icon-id">
+         <small-icon>en-webAppMessageDestination2-small-icon</small-icon>
+         <large-icon>en-webAppMessageDestination2-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="fr" id="fr-webAppMessageDestination2-icon-id">
+         <small-icon>fr-webAppMessageDestination2-small-icon</small-icon>
+         <large-icon>fr-webAppMessageDestination2-large-icon</large-icon>
+      </icon>
+      <icon xml:lang="de" id="de-webAppMessageDestination2-icon-id">
+         <small-icon>de-webAppMessageDestination2-small-icon</small-icon>
+         <large-icon>de-webAppMessageDestination2-large-icon</large-icon>
+      </icon>
+      <message-destination-name>webAppMessageDestination2Name</message-destination-name>
+      <mapped-name>webAppMessageDestination2MappedName</mapped-name>
+   </message-destination>
+
+    <locale-encoding-mapping-list id="locale-encoding-mapping-list0">
+       <locale-encoding-mapping>
+          <locale>en</locale>
+          <encoding>en</encoding>
+       </locale-encoding-mapping>
+    </locale-encoding-mapping-list>
+ </web-app>




More information about the jboss-cvs-commits mailing list