Repository: tomee Updated Branches: refs/heads/master 15d30a483 -> c16de305f
fixing test Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c16de305 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c16de305 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c16de305 Branch: refs/heads/master Commit: c16de305f2ec6eaef5b0913f227a1897a54766ae Parents: 15d30a4 Author: Romain manni-Bucau <[email protected]> Authored: Fri May 20 15:32:55 2016 +0200 Committer: Romain manni-Bucau <[email protected]> Committed: Fri May 20 15:32:55 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/config/sys/Resource.java | 1 - .../src/main/java/org/apache/openejb/config/sys/StackHandler.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/c16de305/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java index 8b6f232..3f0ea4a 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/Resource.java @@ -20,7 +20,6 @@ package org.apache.openejb.config.sys; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; http://git-wip-us.apache.org/repos/asf/tomee/blob/c16de305/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java index 0637221..965c2b5 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/StackHandler.java @@ -251,6 +251,8 @@ public class StackHandler extends DefaultHandler { attributes.add("jndi"); attributes.add("aliases"); attributes.add("properties-provider"); + attributes.add("property-provider"); + attributes.add("depends-on"); return attributes; } }
