[jboss-cvs] JBossAS SVN: r66189 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ear/spec and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 16 13:45:14 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-16 13:45:14 -0400 (Tue, 16 Oct 2007)
New Revision: 66189
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.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/ModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.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/JBossApp5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/log4j.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
Log:
Fix ear metadata
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java 2007-10-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.ear.jboss;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -45,4 +46,16 @@
{
private static final long serialVersionUID = 1;
+ /**
+ * Override to map the jboss-app version attribute onto the version property
+ */
+ @Override
+ @XmlAttribute(name="version")
+ public void setVersion(String version)
+ {
+ // TODO Auto-generated method stub
+ super.setVersion(version);
+ }
+
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java 2007-10-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -33,6 +33,7 @@
import org.jboss.metadata.ear.spec.Ear5xMetaData;
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.javaee.spec.DescriptionGroupMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithOverride;
@@ -56,7 +57,7 @@
private LoaderRepositoryMetaData loaderRepository;
/** The unauthenticated principal */
private String unauthenticatedPrincipal;
- private List<ModuleMetaData> modules;
+ private ModulesMetaData modules;
private Map<String, ModuleMetaData> modulesMap;
/** The security roles */
private SecurityRolesMetaData securityRoles;
@@ -125,6 +126,7 @@
{
return securityRoles;
}
+ @XmlElement(name="security-role")
public void setSecurityRoles(SecurityRolesMetaData securityRoles)
{
this.securityRoles = securityRoles;
@@ -157,7 +159,7 @@
}
return dir;
}
- public void getLibraryDirectory(String libraryDirectory)
+ public void setLibraryDirectory(String libraryDirectory)
{
this.libraryDirectory = libraryDirectory;
}
@@ -186,7 +188,7 @@
* Get the application module information
* @return the list of application modules
*/
- public List<ModuleMetaData> getModules()
+ public ModulesMetaData getModules()
{
return modules;
}
@@ -195,7 +197,7 @@
* @param module - the list of application modules
*/
@XmlElement(name="module")
- public void setModules(List<ModuleMetaData> modules)
+ public void setModules(ModulesMetaData modules)
{
this.modules = modules;
}
@@ -206,7 +208,7 @@
if (modulesMap == null)
{
modulesMap = new HashMap<String, ModuleMetaData>();
- List<ModuleMetaData> merged = getMergedModules();
+ ModulesMetaData merged = getMergedModules();
for (ModuleMetaData module : merged)
{
String file = module.getValue().getFileName();
@@ -217,17 +219,17 @@
}
@XmlTransient
- public List<ModuleMetaData> getMergedModules()
+ public ModulesMetaData getMergedModules()
{
- List<ModuleMetaData> merged = getOverridenMetaData().getModules();
+ ModulesMetaData merged = getOverridenMetaData().getModules();
if (modules != null && modules.size() > 0)
{
- if (merged != null)
- merged = new ArrayList<ModuleMetaData>(merged);
- else
- merged = new ArrayList<ModuleMetaData>();
+ if (merged == null)
+ merged = new ModulesMetaData();
merged.addAll(modules);
}
+ else if(merged == null)
+ merged = new ModulesMetaData();
return merged;
}
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-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -44,7 +44,7 @@
private String dtdSystemId;
private String version;
/** The application modules */
- private List<ModuleMetaData> modules;
+ private ModulesMetaData modules;
/** The security roles */
private SecurityRolesMetaData securityRoles;
@@ -140,7 +140,7 @@
* Get the application module information
* @return the list of application modules
*/
- public List<ModuleMetaData> getModules()
+ public ModulesMetaData getModules()
{
return modules;
}
@@ -149,7 +149,7 @@
* @param module - the list of application modules
*/
@XmlElement(name="module")
- public void setModules(List<ModuleMetaData> modules)
+ public void setModules(ModulesMetaData modules)
{
this.modules = modules;
}
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-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -27,6 +27,7 @@
import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.metadata.javaee.support.NamedMetaData;
import org.jboss.xb.annotations.JBossXmlChild;
import org.jboss.xb.annotations.JBossXmlChildren;
@@ -45,7 +46,7 @@
@JBossXmlChild(name="service", type=ServiceModuleMetaData.class),
@JBossXmlChild(name="har", type=ServiceModuleMetaData.class)
})
-public class ModuleMetaData extends IdMetaDataImpl
+public class ModuleMetaData extends NamedMetaData
{
private static final long serialVersionUID = 1;
private AbstractModule module;
@@ -60,6 +61,8 @@
public void setValue(AbstractModule value)
{
this.module = value;
+ // Set the mappable name to the module file name
+ super.setName(value.getFileName());
}
public String getAlternativeDD()
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java 2007-10-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -21,32 +21,37 @@
*/
package org.jboss.metadata.ear.spec;
-import java.util.List;
+import java.util.Iterator;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
+import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
-import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
-import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-import org.jboss.xb.annotations.JBossXmlConstants;
-import org.jboss.xb.annotations.JBossXmlModelGroup;
-
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class ModulesMetaData extends IdMetaDataImpl
+public class ModulesMetaData extends AbstractMappedMetaData<ModuleMetaData>
{
- private ModuleMetaData module;
+ private static final long serialVersionUID = 1;
+ public ModulesMetaData()
+ {
+ super("fileName");
+ }
- public ModuleMetaData getModule()
+ /**
+ * Convience method for treating the map as an ordered list. O(n), so not
+ * efficient for large maps.
+ *
+ * @param index
+ * @return
+ */
+ public ModuleMetaData get(int index)
{
+ if(index >= size())
+ throw new IndexOutOfBoundsException(index+" >= "+size());
+ Iterator<ModuleMetaData> iterator = super.iterator();
+ ModuleMetaData module = null;
+ for(int n = 0; n <= index; n ++)
+ module = iterator.next();
return module;
}
- public void setModule(ModuleMetaData module)
- {
- this.module = module;
- }
}
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-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -43,6 +43,7 @@
public void setWebURI(String webURI)
{
this.webURI = webURI;
+ super.setFileName(webURI);
}
public String getContextRoot()
{
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-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -38,6 +38,7 @@
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.ModulesMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
import org.jboss.metadata.javaee.spec.DescriptionImpl;
@@ -177,7 +178,7 @@
}
protected void assertModules(Ear5xMetaData ear)
{
- List<ModuleMetaData> modules = ear.getModules();
+ ModulesMetaData modules = ear.getModules();
assertEquals(6, modules.size());
ModuleMetaData connector = modules.get(0);
assertEquals("connector0", connector.getId());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2007-10-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2007-10-16 17:45:14 UTC (rev 66189)
@@ -33,13 +33,19 @@
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.jboss.ServiceModuleMetaData;
import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
+import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
+import org.jboss.metadata.ear.spec.Ear14MetaData;
import org.jboss.metadata.ear.spec.Ear50MetaData;
import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.ear.spec.EarMetaData;
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.ModulesMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
import org.jboss.metadata.javaee.spec.DescriptionImpl;
@@ -48,6 +54,7 @@
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.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -58,6 +65,8 @@
*/
public class JBossApp5xEverythingUnitTestCase extends AbstractJavaEEMetaDataTest
{
+ private boolean hasJBossAppOverride = false;
+
public static Test suite()
{
return suite(JBossApp5xEverythingUnitTestCase.class);
@@ -65,7 +74,17 @@
public static SchemaBindingResolver initResolver()
{
- return schemaResolverForClass(Ear50MetaData.class);
+ DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+ 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("application_5.xsd", Ear50MetaData.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 JBossApp5xEverythingUnitTestCase(String name)
@@ -84,97 +103,31 @@
Ear5xMetaData spec = unmarshal("Ear5xEverything_testEverything.xml", Ear5xMetaData.class, null);
JBossAppMetaData jbossAppMD = new JBossAppMetaData();
jbossAppMD.setOverridenMetaData(spec);
+ hasJBossAppOverride = false;
assertEveryting(jbossAppMD);
}
public void testEverything()
throws Exception
{
//enableTrace("org.jboss.xb");
- JBossAppMetaData result = unmarshal();
- assertEquals("jboss-app-id", result.getId());
- assertEquals("5.0", result.getVersion());
- assertEveryting(result);
+ Ear5xMetaData spec = unmarshal("Ear5xEverything_testEverything.xml", Ear5xMetaData.class, null);
+ JBossAppMetaData jbossAppMD = unmarshal();
+ jbossAppMD.setOverridenMetaData(spec);
+ hasJBossAppOverride = true;
+ assertEveryting(jbossAppMD);
+ assertEquals("jboss-app-id", jbossAppMD.getId());
+ assertEquals("5.0", jbossAppMD.getVersion());
+ assertEveryting(jbossAppMD);
}
protected void assertEveryting(JBossAppMetaData ear)
throws Exception
{
- assertDescriptions(ear);
- assertDisplayName(ear);
- assertIcon(ear);
assertSecurityRoles(ear);
assertLibraryDirectory(ear);
assertModules(ear);
}
- protected void assertDescriptions(JBossAppMetaData ear)
- throws Exception
- {
- DescriptionGroupMetaData group = ear.getDescriptionGroup();
- assertNotNull(group);
- Descriptions descriptions = group.getDescriptions();
- assertNotNull(descriptions);
-
- 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());
- }
-
- protected void assertDisplayName(JBossAppMetaData ear)
- throws Exception
- {
- DescriptionGroupMetaData group = ear.getDescriptionGroup();
- assertNotNull(group);
- DisplayNames displayNames = group.getDisplayNames();
- assertNotNull(displayNames);
-
- 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());
- }
-
- protected void assertIcon(JBossAppMetaData ear)
- throws Exception
- {
- DescriptionGroupMetaData group = ear.getDescriptionGroup();
- assertNotNull(group);
- Icons icons = group.getIcons();
- assertNotNull(icons);
-
- 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());
- }
-
protected void assertSecurityRoles(JBossAppMetaData ear)
{
SecurityRolesMetaData roles = ear.getMergedSecurityRoles();
@@ -190,12 +143,18 @@
}
protected void assertLibraryDirectory(JBossAppMetaData ear)
{
- assertEquals("lib0", ear.getLibraryDirectory());
+ if(hasJBossAppOverride)
+ assertEquals("jboss-app-lib0", ear.getLibraryDirectory());
+ else
+ assertEquals("lib0", ear.getLibraryDirectory());
}
protected void assertModules(JBossAppMetaData ear)
{
- List<ModuleMetaData> modules = ear.getMergedModules();
- assertEquals(6, modules.size());
+ ModulesMetaData modules = ear.getMergedModules();
+ if(hasJBossAppOverride)
+ assertEquals(9, modules.size());
+ else
+ assertEquals(6, modules.size());
ModuleMetaData connector = modules.get(0);
assertEquals("connector0", connector.getId());
ConnectorModuleMetaData connectorMD = (ConnectorModuleMetaData) connector.getValue();
@@ -220,7 +179,34 @@
ModuleMetaData web1 = modules.get(5);
assertEquals("web1", web1.getId());
WebModuleMetaData web1MD = (WebModuleMetaData) web1.getValue();
- assertEquals("/web1", web1MD.getContextRoot());
+ if(hasJBossAppOverride)
+ assertEquals("/web1-override", web1MD.getContextRoot());
+ else
+ assertEquals("/web1", web1MD.getContextRoot());
assertEquals("web-app1.war", web1MD.getWebURI());
+ if(hasJBossAppOverride)
+ {
+ // Validate the sar, web2, har added in jboss-app.xml
+ ModuleMetaData sar = modules.get(6);
+ assertEquals("sar0", sar.getId());
+ ServiceModuleMetaData sarMD = (ServiceModuleMetaData) sar.getValue();
+ assertEquals("sar0.sar", sarMD.getSar());
+ ModuleMetaData web2 = modules.get(7);
+ assertEquals("web2", web2.getId());
+ WebModuleMetaData web2MD = (WebModuleMetaData) web2.getValue();
+ assertEquals("/web2", web2MD.getContextRoot());
+ assertEquals("web-app2.war", web2MD.getWebURI());
+ ModuleMetaData har = modules.get(8);
+ assertEquals("har0", har.getId());
+ ServiceModuleMetaData harMD = (ServiceModuleMetaData) har.getValue();
+ assertEquals("har0.har", harMD.getSar());
+ }
+ // Validate lookup by module file name
+ ModuleMetaData mmd = modules.get("rar0.rar");
+ assertEquals(connector, mmd);
+ mmd = modules.get("ejb-jar1.jar");
+ assertEquals(ejb1, mmd);
+ mmd = modules.get("web-app0.war");
+ assertEquals(web0, mmd);
}
}
Modified: projects/metadata/trunk/src/test/resources/log4j.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/log4j.xml 2007-10-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/test/resources/log4j.xml 2007-10-16 17:45:14 UTC (rev 66189)
@@ -61,7 +61,7 @@
<!-- ============================== -->
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="INFO"/>
+ <param name="Threshold" value="TRACE"/>
<param name="Target" value="System.out"/>
<layout class="org.apache.log4j.PatternLayout">
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2007-10-16 16:12:36 UTC (rev 66188)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2007-10-16 17:45:14 UTC (rev 66189)
@@ -5,22 +5,34 @@
xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-app_5_0.xsd"
version="5.0"
id="jboss-app-id">
-
+
+ <!-- Add a sar0 module -->
<module id="sar0">
- <connector>sar0.sar</connector>
+ <service>sar0.sar</service>
</module>
- <module id="web2">
+ <!-- Override the web1 context-root -->
+ <module id="web1">
<web>
<web-uri>web-app1.war</web-uri>
- <context-root>/web1</context-root>
+ <context-root>/web1-override</context-root>
</web>
</module>
+ <!-- Add a web2 module -->
+ <module id="web2">
+ <web>
+ <web-uri>web-app2.war</web-uri>
+ <context-root>/web2</context-root>
+ </web>
+ </module>
+ <module id="har0">
+ <har>har0.har</har>
+ </module>
<security-role id="security-role0">
- <description>The 0 security role</description>
+ <jee:description>The 0 security role</jee:description>
<role-name>role0</role-name>
</security-role>
<security-role id="security-role1">
- <description>The 1 security role</description>
+ <jee:description>The 1 security role</jee:description>
<role-name>role1</role-name>
</security-role>
<library-directory>jboss-app-lib0</library-directory>
More information about the jboss-cvs-commits
mailing list