You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/12/29 19:25:54 UTC
svn commit: r1426800 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java
Author: dblevins
Date: Sat Dec 29 18:25:54 2012
New Revision: 1426800
URL: http://svn.apache.org/viewvc?rev=1426800&view=rev
Log:
Part of TOMEE-638 - Allow resources.xml to declare Container elements
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java?rev=1426800&r1=1426799&r2=1426800&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resources.java Sat Dec 29 18:25:54 2012
@@ -35,6 +35,7 @@ import java.util.List;
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
+ * <element ref="{http://www.openejb.org/System/Configuration}Container" maxOccurs="unbounded" minOccurs="0"/>
* <element ref="{http://www.openejb.org/System/Configuration}Resource" maxOccurs="unbounded" minOccurs="0"/>
* <element ref="{http://www.openejb.org/System/Configuration}Service" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
@@ -44,13 +45,16 @@ import java.util.List;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"resource", "service"})
+@XmlType(name = "", propOrder = {"container", "resource", "service"})
@XmlRootElement(name = "resources")
public class Resources {
@XmlElement(name = "Resource")
protected List<Resource> resource;
+ @XmlElement(name = "Container")
+ protected List<Container> container;
+
@XmlElement(name = "Service")
protected List<Service> service;
@@ -62,6 +66,14 @@ public class Resources {
return this.resource;
}
+ public List<Container> getContainer() {
+ if (container == null) {
+ container = new ArrayList<Container>();
+ }
+
+ return this.container;
+ }
+
public List<Service> getService() {
if (service == null) {
service = new ArrayList<Service>();