[jboss-cvs] JBossAS SVN: r66686 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/ear and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 2 13:04:00 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-11-02 13:04:00 -0400 (Fri, 02 Nov 2007)
New Revision: 66686
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
Log:
Add test of application.xml only merged view
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2007-11-02 16:45:58 UTC (rev 66685)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2007-11-02 17:04:00 UTC (rev 66686)
@@ -40,6 +40,9 @@
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.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;
@@ -235,4 +238,45 @@
assertEquals("javajoe", principals[0]);
assertEquals("j2ee", principals[1]);
}
+
+ /**
+ * 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());
+ }
}
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml 2007-11-02 17:04:00 UTC (rev 66686)
@@ -0,0 +1,64 @@
+<?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"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+ version="1.4" id="application_1_4-id">
+
+ <description>en-ear-desc</description>
+ <description xml:lang="fr">fr-ear-desc</description>
+ <description xml:lang="de">de-ear-desc</description>
+ <display-name>en-ear-disp</display-name>
+ <display-name xml:lang="fr">fr-ear-disp</display-name>
+ <display-name xml:lang="de">de-ear-disp</display-name>
+ <icon id="en-ear-icon-id">
+ <small-icon>en-ear-small-icon</small-icon>
+ <large-icon>en-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-ear-icon-id">
+ <small-icon>fr-ear-small-icon</small-icon>
+ <large-icon>fr-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-ear-icon-id">
+ <small-icon>de-ear-small-icon</small-icon>
+ <large-icon>de-ear-large-icon</large-icon>
+ </icon>
+
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ <alt-dd>META-INF/alt-ra.xml</alt-dd>
+ </module>
+ <module id="java0">
+ <java>client0.jar</java>
+ <alt-dd>META-INF/alt-application-client.xml</alt-dd>
+ </module>
+ <module id="ejb0">
+ <ejb>ejb-jar0.jar</ejb>
+ <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
+ </module>
+ <module id="ejb1">
+ <ejb>ejb-jar1.jar</ejb>
+ <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
+ </module>
+ <module id="web0">
+ <web>
+ <web-uri>web-app0.war</web-uri>
+ <context-root>/web0</context-root>
+ </web>
+ <alt-dd>WEB-INF/alt-web.xml</alt-dd>
+ </module>
+ <module id="web1">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1</context-root>
+ </web>
+ <alt-dd>WEB-INF/alt-web.xml</alt-dd>
+ </module>
+ <security-role id="security-role0">
+ <description>The 0 security role</description>
+ <role-name>role0</role-name>
+ </security-role>
+ <security-role id="security-role1">
+ <description>The 1 security role</description>
+ <role-name>role1</role-name>
+ </security-role>
+</application>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list