[jboss-cvs] JBossAS SVN: r94189 - in projects/metadata/tags/1.0.1.SP1: src/main/java/org/jboss/metadata/ear/jboss and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 30 21:06:20 EDT 2009
Author: jason.greene at jboss.com
Date: 2009-09-30 21:06:20 -0400 (Wed, 30 Sep 2009)
New Revision: 94189
Modified:
projects/metadata/tags/1.0.1.SP1/pom.xml
projects/metadata/tags/1.0.1.SP1/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
projects/metadata/tags/1.0.1.SP1/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
Log:
JBMETA-221 - Add complete support for module-order
Prepare for release
Modified: projects/metadata/tags/1.0.1.SP1/pom.xml
===================================================================
--- projects/metadata/tags/1.0.1.SP1/pom.xml 2009-10-01 00:55:50 UTC (rev 94188)
+++ projects/metadata/tags/1.0.1.SP1/pom.xml 2009-10-01 01:06:20 UTC (rev 94189)
@@ -8,7 +8,7 @@
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
<packaging>jar</packaging>
- <version>1.0.1.GA</version>
+ <version>1.0.1.SP1</version>
<name>JBoss Metadata</name>
<url>http://www.jboss.org</url>
<description>The common JavaEE metadata classes</description>
Modified: projects/metadata/tags/1.0.1.SP1/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java
===================================================================
--- projects/metadata/tags/1.0.1.SP1/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java 2009-10-01 00:55:50 UTC (rev 94188)
+++ projects/metadata/tags/1.0.1.SP1/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java 2009-10-01 01:06:20 UTC (rev 94189)
@@ -39,7 +39,7 @@
*/
public class JBossAppMetaData extends IdMetaDataImplWithDescriptionGroup
{
- private static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 2;
private String dtdPublicId;
private String dtdSystemId;
/** jboss application version */
@@ -55,6 +55,12 @@
private SecurityRolesMetaData securityRoles;
private String libraryDirectory;
private String jmxName;
+ private ModuleOrder moduleOrder = ModuleOrder.IMPLICIT;
+
+ public enum ModuleOrder
+ {
+ STRICT, IMPLICIT;
+ }
/**
* Callback for the DTD information
@@ -191,15 +197,31 @@
}
/**
- * This element is from 4.x versions of jboss-app which is now not used in jboss-5
- * @param moduleOrder
+ * The order to deploy modules of an EARi in.
+ * If "strict" deploy in application.xml order.
+ * If "implicit" deploy according to the deployment sorter.
+ *
+ * @param moduleOrder how to order modules
*/
- @XmlElement
+ @XmlElement(name="module-order")
public void setModuleOrder(String moduleOrder)
{
+ if ("strict".equalsIgnoreCase(moduleOrder))
+ this.moduleOrder = ModuleOrder.STRICT;
}
+
+ public String getModuleOrder()
+ {
+ return moduleOrder.toString();
+ }
@XmlTransient
+ public ModuleOrder getModuleOrderEnum()
+ {
+ return this.moduleOrder;
+ }
+
+ @XmlTransient
public synchronized ModuleMetaData getModule(String name)
{
return modules.get(name);
Modified: projects/metadata/tags/1.0.1.SP1/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
===================================================================
--- projects/metadata/tags/1.0.1.SP1/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2009-10-01 00:55:50 UTC (rev 94188)
+++ projects/metadata/tags/1.0.1.SP1/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2009-10-01 01:06:20 UTC (rev 94189)
@@ -85,5 +85,6 @@
{
JBossAppMetaData result = unmarshal();
assertEquals("4.0", result.getVersion());
+ assertEquals(JBossAppMetaData.ModuleOrder.STRICT, result.getModuleOrderEnum());
}
}
More information about the jboss-cvs-commits
mailing list