[jboss-cvs] JBossAS SVN: r65911 - in projects/metadata/trunk/src/main/java/org/jboss/metadata/ear: spec and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 8 09:04:08 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-08 09:04:08 -0400 (Mon, 08 Oct 2007)
New Revision: 65911
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/ServiceModuleMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.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
Log:
Move fileName to AbstractModule
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-08 12:29:22 UTC (rev 65910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBossAppMetaData.java 2007-10-08 13:04:08 UTC (rev 65911)
@@ -22,7 +22,9 @@
package org.jboss.metadata.ear.jboss;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
@@ -53,10 +55,12 @@
/** The unauthenticated principal */
private String unauthenticatedPrincipal;
private List<ModuleMetaData> modules;
+ private Map<String, ModuleMetaData> modulesMap;
/** The security roles */
private SecurityRolesMetaData securityRoles;
private String libraryDirectory;
-
+ private String jmxName;
+
public LoaderRepositoryMetaData getLoaderRepository()
{
return loaderRepository;
@@ -114,6 +118,16 @@
this.libraryDirectory = libraryDirectory;
}
+
+ public String getJmxName()
+ {
+ return jmxName;
+ }
+ public void setJmxName(String jmxName)
+ {
+ this.jmxName = jmxName;
+ }
+
@XmlTransient
public DescriptionGroupMetaData getDescriptionGroup()
{
@@ -143,6 +157,21 @@
}
@XmlTransient
+ public synchronized ModuleMetaData getModule(String name)
+ {
+ if (modulesMap == null)
+ {
+ modulesMap = new HashMap<String, ModuleMetaData>();
+ for (ModuleMetaData module : modules)
+ {
+ String file = module.getValue().getFileName();
+ modulesMap.put(file, module);
+ }
+ }
+ return modulesMap.get(name);
+ }
+
+ @XmlTransient
public List<ModuleMetaData> getMergedModules()
{
List<ModuleMetaData> merged = getOverridenMetaData().getModules();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java 2007-10-08 12:29:22 UTC (rev 65910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java 2007-10-08 13:04:08 UTC (rev 65911)
@@ -21,8 +21,8 @@
*/
package org.jboss.metadata.ear.jboss;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
import org.jboss.metadata.ear.spec.AbstractModule;
@@ -36,17 +36,11 @@
public class ServiceModuleMetaData extends AbstractModule
{
private static final long serialVersionUID = 1;
- private String sar;
+ @XmlTransient
public String getSar()
{
- return sar;
+ return getFileName();
}
- @XmlValue
- public void setSar(String sar)
- {
- this.sar = sar;
- }
-
}
Modified: 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 2007-10-08 12:29:22 UTC (rev 65910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java 2007-10-08 13:04:08 UTC (rev 65911)
@@ -21,6 +21,8 @@
*/
package org.jboss.metadata.ear.spec;
+import javax.xml.bind.annotation.XmlValue;
+
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
/**
@@ -29,5 +31,17 @@
*/
public class AbstractModule extends IdMetaDataImpl
{
+ private static final long serialVersionUID = 1;
+ private String fileName;
+ public String getFileName()
+ {
+ return fileName;
+ }
+ @XmlValue
+ public void setFileName(String fileName)
+ {
+ this.fileName = fileName;
+ }
+
}
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-08 12:29:22 UTC (rev 65910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java 2007-10-08 13:04:08 UTC (rev 65911)
@@ -21,8 +21,8 @@
*/
package org.jboss.metadata.ear.spec;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
/**
* @author Scott.Stark at jboss.org
@@ -32,16 +32,11 @@
public class ConnectorModuleMetaData extends AbstractModule
{
private static final long serialVersionUID = 1;
- private String connector;
+ @XmlTransient
public String getConnector()
{
- return connector;
+ return getFileName();
}
- @XmlValue
- public void setConnector(String connector)
- {
- this.connector = connector;
- }
}
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-08 12:29:22 UTC (rev 65910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java 2007-10-08 13:04:08 UTC (rev 65911)
@@ -21,9 +21,8 @@
*/
package org.jboss.metadata.ear.spec;
-import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
/**
* @author Scott.Stark at jboss.org
@@ -33,16 +32,10 @@
public class EjbModuleMetaData extends AbstractModule
{
private static final long serialVersionUID = 1;
- private String ejbJar;
+ @XmlTransient
public String getEjbJar()
{
- return ejbJar;
+ return getFileName();
}
- @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-08 12:29:22 UTC (rev 65910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java 2007-10-08 13:04:08 UTC (rev 65911)
@@ -22,6 +22,7 @@
package org.jboss.metadata.ear.spec;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
@@ -35,15 +36,11 @@
private static final long serialVersionUID = 1;
private String clientJar;
+ @XmlTransient
public String getClientJar()
{
- return clientJar;
+ return getFileName();
}
- @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-08 12:29:22 UTC (rev 65910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2007-10-08 13:04:08 UTC (rev 65911)
@@ -40,7 +40,7 @@
@JBossXmlChild(name="java", type=JavaModuleMetaData.class),
@JBossXmlChild(name="web", type=WebModuleMetaData.class),
@JBossXmlChild(name="service", type=ServiceModuleMetaData.class),
- @JBossXmlChild(name="har", type=ServiceModuleMetaData.class),
+ @JBossXmlChild(name="har", type=ServiceModuleMetaData.class)
})
public class ModuleMetaData extends IdMetaDataImpl
{
More information about the jboss-cvs-commits
mailing list