[jboss-cvs] JBossAS SVN: r65904 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ear and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 7 09:43:42 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-07 09:43:41 -0400 (Sun, 07 Oct 2007)
New Revision: 65904
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
projects/metadata/trunk/src/test/resources/log4j.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
Log:
Add ear module mapping and tests
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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 org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class AbstractModule extends IdMetaDataImpl
+{
+
+}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -22,13 +22,26 @@
package org.jboss.metadata.ear.spec;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
@XmlType(name="connectorType")
-public class ConnectorModuleMetaData extends ModuleMetaData
+public class ConnectorModuleMetaData extends AbstractModule
{
+ private static final long serialVersionUID = 1;
+ private String connector;
+ public String getConnector()
+ {
+ return connector;
+ }
+ @XmlValue
+ public void setConnector(String connector)
+ {
+ this.connector = connector;
+ }
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -33,6 +33,12 @@
private String libraryDirectory;
+ @Override
+ public boolean isEE5()
+ {
+ return true;
+ }
+
public String getLibraryDirectory()
{
return libraryDirectory;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -42,7 +42,7 @@
private static final long serialVersionUID = 1;
private String version;
/** The application modules */
- private ModulesMetaData modules;
+ private List<ModuleMetaData> modules;
/** The security roles */
private SecurityRolesMetaData securityRoles;
@@ -86,23 +86,18 @@
public List<ModuleMetaData> getModules()
{
- return null;
+ return modules;
}
- @XmlElementWrapper(name="module")
- @XmlElements({
- @XmlElement(name = "connector", required = false, type = ConnectorModuleMetaData.class),
- @XmlElement(name = "java", required = false, type = JavaModuleMetaData.class),
- @XmlElement(name = "ejb", required = false, type = EjbModuleMetaData.class),
- @XmlElement(name = "web", required = false, type = WebModuleMetaData.class)
- })
+ @XmlElement(name="module")
public void setModules(List<ModuleMetaData> modules)
{
- //this.modules = modules;
+ this.modules = modules;
}
public SecurityRolesMetaData getSecurityRoles()
{
return securityRoles;
}
+ @XmlElement(name="security-role")
public void setSecurityRoles(SecurityRolesMetaData securityRoles)
{
this.securityRoles = securityRoles;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -21,14 +21,28 @@
*/
package org.jboss.metadata.ear.spec;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
@XmlType(name="ejbType")
-public class EjbModuleMetaData extends ModuleMetaData
+public class EjbModuleMetaData extends AbstractModule
{
+ private static final long serialVersionUID = 1;
+ private String ejbJar;
+ public String getEjbJar()
+ {
+ return ejbJar;
+ }
+ @XmlValue
+ public void setEjbJar(String ejbJar)
+ {
+ this.ejbJar = ejbJar;
+ }
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -21,14 +21,29 @@
*/
package org.jboss.metadata.ear.spec;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
@XmlType(name="javaType")
-public class JavaModuleMetaData extends ModuleMetaData
+public class JavaModuleMetaData extends AbstractModule
{
+ private static final long serialVersionUID = 1;
+ private String clientJar;
+ public String getClientJar()
+ {
+ return clientJar;
+ }
+ @XmlValue
+ public void setClientJar(String clientJar)
+ {
+ this.clientJar = clientJar;
+ }
+
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -21,18 +21,35 @@
*/
package org.jboss.metadata.ear.spec;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-import org.jboss.xb.annotations.JBossXmlConstants;
-import org.jboss.xb.annotations.JBossXmlModelGroup;
+import org.jboss.xb.annotations.JBossXmlChild;
+import org.jboss.xb.annotations.JBossXmlChildren;
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at XmlType(name="moduleType")
+ at JBossXmlChildren
+({
+ @JBossXmlChild(name="connector", type=ConnectorModuleMetaData.class),
+ @JBossXmlChild(name="ejb", type=EjbModuleMetaData.class),
+ @JBossXmlChild(name="java", type=JavaModuleMetaData.class),
+ @JBossXmlChild(name="web", type=WebModuleMetaData.class)
+})
public class ModuleMetaData extends IdMetaDataImpl
{
-
+ private static final long serialVersionUID = 1;
+ private AbstractModule module;
+
+ public AbstractModule getValue()
+ {
+ return module;
+ }
+ public void setValue(AbstractModule value)
+ {
+ this.module = value;
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -21,11 +21,36 @@
*/
package org.jboss.metadata.ear.spec;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class WebModuleMetaData extends ModuleMetaData
+ at XmlType(name="webType")
+public class WebModuleMetaData extends AbstractModule
{
+ private static final long serialVersionUID = 1;
+ private String webURI;
+ private String contextRoot;
+ public String getWebURI()
+ {
+ return webURI;
+ }
+ @XmlElement(name="web-uri")
+ public void setWebURI(String webURI)
+ {
+ this.webURI = webURI;
+ }
+ public String getContextRoot()
+ {
+ return contextRoot;
+ }
+ public void setContextRoot(String contextRoot)
+ {
+ this.contextRoot = contextRoot;
+ }
+
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -22,6 +22,8 @@
package org.jboss.test.metadata.ear;
+import java.util.List;
+
import junit.framework.Test;
import org.jboss.annotation.javaee.Description;
@@ -30,11 +32,19 @@
import org.jboss.annotation.javaee.DisplayNames;
import org.jboss.annotation.javaee.Icon;
import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
+import org.jboss.metadata.ear.spec.Ear50MetaData;
import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.ear.spec.EjbModuleMetaData;
+import org.jboss.metadata.ear.spec.JavaModuleMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+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.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -53,7 +63,7 @@
public static SchemaBindingResolver initResolver()
{
- return schemaResolverForClass(Ear5xMetaData.class);
+ return schemaResolverForClass(Ear50MetaData.class);
}
public Ear5xEverythingUnitTestCase(String name)
@@ -63,66 +73,137 @@
protected Ear5xMetaData unmarshal() throws Exception
{
- return unmarshal(Ear5xMetaData.class);
+ return unmarshal(Ear50MetaData.class);
}
- public void testId() throws Exception
+ public void testEverything() throws Exception
{
+ enableTrace("org.jboss.xb");
Ear5xMetaData result = unmarshal();
- assertEquals("application-test-id", result.getId());
+ assertEquals("application-test-everything", result.getId());
+ assertEquals("5", result.getVersion());
+ assertDescriptions(result);
+ assertDisplayName(result);
+ assertIcon(result);
+ assertSecurityRoles(result);
+ assertLibraryDirectory(result);
+ assertModules(result);
}
-
- public void testVersion() throws Exception
- {
- Ear5xMetaData result = unmarshal();
- assertEquals("5.0", result.getVersion());
- assertFalse(result.isEE4());
- assertTrue(result.isEE5());
- }
- public void testDescriptionDefaultLanguage() throws Exception
+ protected void assertDescriptions(Ear5xMetaData ear)
+ throws Exception
{
- Ear5xMetaData result = unmarshal();
- DescriptionGroupMetaData group = result.getDescriptionGroup();
+ DescriptionGroupMetaData group = ear.getDescriptionGroup();
assertNotNull(group);
Descriptions descriptions = group.getDescriptions();
assertNotNull(descriptions);
- DescriptionImpl hello = new DescriptionImpl();
- hello.setDescription("Hello");
- assertEquals(new Description[] { hello }, descriptions.value());
+ DescriptionImpl den = new DescriptionImpl();
+ den.setDescription("en-ear-desc");
+ DescriptionImpl dfr = new DescriptionImpl();
+ dfr.setLanguage("fr");
+ dfr.setDescription("fr-ear-des");
+ DescriptionImpl dde = new DescriptionImpl();
+ dde.setLanguage("de");
+ dde.setDescription("de-ear-des");
+ Description[] expected = {den, dfr, dde};
+ assertEquals(expected, descriptions.value());
}
- public void testDisplayNameDefaultLanguage() throws Exception
+ protected void assertDisplayName(Ear5xMetaData ear)
+ throws Exception
{
- Ear5xMetaData result = unmarshal();
- DescriptionGroupMetaData group = result.getDescriptionGroup();
+ DescriptionGroupMetaData group = ear.getDescriptionGroup();
assertNotNull(group);
DisplayNames displayNames = group.getDisplayNames();
assertNotNull(displayNames);
- DisplayNameImpl hello = new DisplayNameImpl();
- hello.setDisplayName("Hello");
- assertEquals(new DisplayName[] { hello }, displayNames.value());
+ DisplayNameImpl en = new DisplayNameImpl();
+ en.setDisplayName("en-ear-disp");
+ DisplayNameImpl fr = new DisplayNameImpl();
+ fr.setDisplayName("fr-ear-disp");
+ fr.setLanguage("fr");
+ DisplayNameImpl de = new DisplayNameImpl();
+ de.setDisplayName("de-ear-disp");
+ de.setLanguage("de");
+
+ DisplayName[] expected = {en, fr, de};
+ assertEquals(expected, displayNames.value());
}
- public void testIconDefaultLanguage() throws Exception
+ protected void assertIcon(Ear5xMetaData ear)
+ throws Exception
{
- Ear5xMetaData result = unmarshal();
- DescriptionGroupMetaData group = result.getDescriptionGroup();
+ DescriptionGroupMetaData group = ear.getDescriptionGroup();
assertNotNull(group);
Icons icons = group.getIcons();
assertNotNull(icons);
- IconImpl icon = new IconImpl();
- icon.setSmallIcon("small");
- icon.setLargeIcon("large");
- assertEquals(new Icon[] { icon }, icons.value());
+ IconImpl en = new IconImpl();
+ en.setId("en-ear-icon-id");
+ en.setSmallIcon("en-ear-small-icon");
+ en.setLargeIcon("en-ear-large-icon");
+ IconImpl fr = new IconImpl();
+ fr.setLanguage("fr");
+ fr.setId("fr-ear-icon-id");
+ fr.setSmallIcon("fr-ear-small-icon");
+ fr.setLargeIcon("fr-ear-large-icon");
+ IconImpl de = new IconImpl();
+ de.setLanguage("de");
+ de.setId("de-ear-icon-id");
+ de.setSmallIcon("de-ear-small-icon");
+ de.setLargeIcon("de-ear-large-icon");
+
+ Icon[] expected = {en, fr, de};
+ assertEquals(expected, icons.value());
}
-
- public void testModules() throws Exception
+
+ protected void assertSecurityRoles(Ear5xMetaData ear)
{
- Ear5xMetaData result = unmarshal();
+ SecurityRolesMetaData roles = ear.getSecurityRoles();
+ assertEquals("There are 2 roles", 2, roles.size());
+ SecurityRoleMetaData role0 = roles.get("role0");
+ assertEquals("security-role0", role0.getId());
+ assertEquals("role0", role0.getName());
+ assertEquals("The 0 security role", role0.getDescriptions().value()[0].value());
+ SecurityRoleMetaData role1 = roles.get("role1");
+ assertEquals("security-role1", role1.getId());
+ assertEquals("role1", role1.getName());
+ assertEquals("The 1 security role", role1.getDescriptions().value()[0].value());
}
-
+ protected void assertLibraryDirectory(Ear5xMetaData ear)
+ {
+ assertEquals("lib0", ear.getLibraryDirectory());
+ }
+ protected void assertModules(Ear5xMetaData ear)
+ {
+ List<ModuleMetaData> modules = ear.getModules();
+ assertEquals(6, modules.size());
+ ModuleMetaData connector = modules.get(0);
+ assertEquals("connector0", connector.getId());
+ ConnectorModuleMetaData connectorMD = (ConnectorModuleMetaData) connector.getValue();
+ assertEquals("rar0.rar", connectorMD.getConnector());
+ ModuleMetaData java = modules.get(1);
+ assertEquals("java0", java.getId());
+ JavaModuleMetaData javaMD = (JavaModuleMetaData)java.getValue();
+ assertEquals("client0.jar", javaMD.getClientJar());
+ ModuleMetaData ejb0 = modules.get(2);
+ assertEquals("ejb0", ejb0.getId());
+ EjbModuleMetaData ejb0MD = (EjbModuleMetaData)ejb0.getValue();
+ assertEquals("ejb-jar0.jar", ejb0MD.getEjbJar());
+ ModuleMetaData ejb1 = modules.get(3);
+ assertEquals("ejb1", ejb1.getId());
+ EjbModuleMetaData ejb1MD = (EjbModuleMetaData)ejb1.getValue();
+ assertEquals("ejb-jar1.jar", ejb1MD.getEjbJar());
+ ModuleMetaData web0 = modules.get(4);
+ assertEquals("web0", web0.getId());
+ WebModuleMetaData web0MD = (WebModuleMetaData) web0.getValue();
+ assertEquals("/web0", web0MD.getContextRoot());
+ assertEquals("web-app0.war", web0MD.getWebURI());
+ ModuleMetaData web1 = modules.get(5);
+ assertEquals("web1", web1.getId());
+ WebModuleMetaData web1MD = (WebModuleMetaData) web1.getValue();
+ assertEquals("/web1", web1MD.getContextRoot());
+ assertEquals("web-app1.war", web1MD.getWebURI());
+ }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2007-10-07 13:43:41 UTC (rev 65904)
@@ -49,7 +49,7 @@
{
public static Test suite()
{
- return suite(Ear5xEverythingUnitTestCase.class);
+ return suite(Ear5xUnitTestCase.class);
}
public static SchemaBindingResolver initResolver()
@@ -76,7 +76,7 @@
public void testVersion() throws Exception
{
Ear5xMetaData result = unmarshal();
- assertEquals("5.0", result.getVersion());
+ assertEquals("5", result.getVersion());
assertFalse(result.isEE4());
assertTrue(result.isEE5());
}
Modified: projects/metadata/trunk/src/test/resources/log4j.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/log4j.xml 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/test/resources/log4j.xml 2007-10-07 13:43:41 UTC (rev 65904)
@@ -60,7 +60,7 @@
<!-- ============================== -->
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="DEBUG"/>
+ <param name="Threshold" value="TRACE"/>
<param name="Target" value="System.out"/>
<layout class="org.apache.log4j.PatternLayout">
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion.xml 2007-10-07 13:43:41 UTC (rev 65904)
@@ -0,0 +1,10 @@
+<?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">
+
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ </module>
+</application>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml 2007-10-07 10:13:02 UTC (rev 65903)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml 2007-10-07 13:43:41 UTC (rev 65904)
@@ -3,8 +3,58 @@
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_5.xsd"
- version="5" id="application-test-id">
- <module>
- <java>client.jar</java>
+ version="5" id="application-test-everything">
+
+ <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>
</module>
+ <module id="java0">
+ <java>client0.jar</java>
+ </module>
+ <module id="ejb0">
+ <ejb>ejb-jar0.jar</ejb>
+ </module>
+ <module id="ejb1">
+ <ejb>ejb-jar1.jar</ejb>
+ </module>
+ <module id="web0">
+ <web>
+ <web-uri>web-app0.war</web-uri>
+ <context-root>/web0</context-root>
+ </web>
+ </module>
+ <module id="web1">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1</context-root>
+ </web>
+ </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>
+ <library-directory>lib0</library-directory>
</application>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml 2007-10-07 13:43:41 UTC (rev 65904)
@@ -0,0 +1,11 @@
+<?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"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5" id="application-testVersion">
+
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ </module>
+</application>
More information about the jboss-cvs-commits
mailing list