[jboss-cvs] JBossAS SVN: r105402 - in trunk: server/src/etc/deployers and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2010-05-30 16:25:28 -0400 (Sun, 30 May 2010)
New Revision: 105402

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
   trunk/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml
Log:
JBAS-7752

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-05-30 18:07:53 UTC (rev 105401)
+++ trunk/component-matrix/pom.xml	2010-05-30 20:25:28 UTC (rev 105402)
@@ -120,7 +120,7 @@
     <version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
     <version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
     <version.org.jboss.metadata.common>2.0.0.Alpha14</version.org.jboss.metadata.common>
-    <version.org.jboss.metadata.ear>2.0.0.Alpha3</version.org.jboss.metadata.ear>
+    <version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
     <version.org.jboss.metadata.ejb>2.0.0-alpha-11</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
     <version.org.jboss.metadata.war>2.0.0.Alpha14</version.org.jboss.metadata.war>

Modified: trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2010-05-30 18:07:53 UTC (rev 105401)
+++ trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2010-05-30 20:25:28 UTC (rev 105402)
@@ -137,6 +137,10 @@
                <key>application_5.xsd</key>
                <value>org.jboss.metadata.ear.spec.Ear50MetaData</value>
             </entry>
+            <entry>
+               <key>application_6.xsd</key>
+               <value>org.jboss.metadata.ear.spec.Ear60MetaData</value>
+            </entry>
             <!-- JBossAppMetaData -->
             <entry>
                <key>jboss-app</key>

Modified: trunk/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml	2010-05-30 18:07:53 UTC (rev 105401)
+++ trunk/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml	2010-05-30 20:25:28 UTC (rev 105402)
@@ -1,5 +1,12 @@
 <?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">
+-->
+<application 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_6.xsd"
+             version="6">
+
    <display-name>EE5 client test</display-name>
    <module>
       <ejb>ejbdepends1.jar</ejb>