tomee git commit: add to beans.xml parsing

[struberg]

Repository: tomee
Updated Branches:
  refs/heads/fb_tomee8 4ac015d66 -> 99206eb8c


add <trim/> to beans.xml parsing


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/99206eb8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/99206eb8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/99206eb8

Branch: refs/heads/fb_tomee8
Commit: 99206eb8c7ec5a96eedebf99a085600c4298dda4
Parents: 4ac015d
Author: Mark Struberg <strub...@apache.org>
Authored: Wed Jan 31 12:21:06 2018 +0100
Committer: Mark Struberg <strub...@apache.org>
Committed: Wed Jan 31 12:21:06 2018 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/openejb/jee/Beans.java  | 15 +++++++++++++++
 .../java/org/apache/openejb/jee/cdi/BeansTest.java   | 11 ++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/99206eb8/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java 
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
index 843fdde..8d59bb5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
@@ -48,6 +48,7 @@ import java.util.Map;
  *         &lt;element ref="{http://java.sun.com/xml/ns/javaee}interceptors"; 
minOccurs="0"/>
  *         &lt;element ref="{http://java.sun.com/xml/ns/javaee}decorators"; 
minOccurs="0"/>
  *         &lt;element ref="{http://java.sun.com/xml/ns/javaee}alternatives"; 
minOccurs="0"/>
+ *         &lt;element ref="{http://java.sun.com/xml/ns/javaee}trim"; 
minOccurs="0" maxOccurs="1"/>
  *       &lt;/all>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -90,6 +91,9 @@ public class Beans {
 
     protected Alternatives alternatives;
 
+    @XmlElement(name = "trim")
+    protected String trim;
+
     @XmlAttribute(name = "version")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     protected String version;
@@ -241,6 +245,17 @@ public class Beans {
         return alternatives;
     }
 
+    public String getTrim() {
+        return trim;
+    }
+
+    public void setTrim(String trim) {
+        this.trim = trim;
+    }
+
+    public boolean isTrim() {
+        return trim != null;
+    }
 
     /**
      * <p>Java class for anonymous complex type.

http://git-wip-us.apache.org/repos/asf/tomee/blob/99206eb8/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java 
b/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java
index 00c05e2..c35bbd1 100644
--- 
a/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java
+++ 
b/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java
@@ -28,8 +28,10 @@ import java.util.Iterator;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class BeansTest {
     @Test
@@ -44,12 +46,12 @@ public class BeansTest {
     public void read10() throws Exception {
         final Beans b = read(
                 "<beans\n" +
-                "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"; +
+                "   xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\"\n"; +
                 "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; 
+
                 "   version=\"1.0\"\n" +
                 "   xsi:schemaLocation=\"\n" +
-                "      http://java.sun.com/xml/ns/javaee\n"; +
-                "      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\";>\n" +
+                "      http://xmlns.jcp.org/xml/ns/javaee\n"; +
+                "      http://xmlns.jcp.org/xml/ns/javaee 
http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd\";>\n" +
                 "   <interceptors>\n" +
                 "      
<class>org.mycompany.myapp.TransactionInterceptor</class>\n" +
                 "   </interceptors>\n" +
@@ -59,6 +61,7 @@ public class BeansTest {
                 "   <decorators>\n" +
                 "      <class>org.mycompany.myfwk.TimestampLogger</class>\n" +
                 "   </decorators>" +
+                "   <trim/>" +
                 "</beans>");
         assertNotNull(b);
         assertEquals(1, b.getInterceptors().size());
@@ -69,6 +72,7 @@ public class BeansTest {
         assertEquals(1, b.getDecorators().size());
         assertEquals("org.mycompany.myfwk.TimestampLogger", 
b.getDecorators().iterator().next());
         assertEquals("1.0", b.getVersion());
+        assertTrue(b.isTrim());
     }
 
     @Test
@@ -93,6 +97,7 @@ public class BeansTest {
         assertNotNull(b);
         assertEquals("1.1", b.getVersion());
         assertNotNull(b.getScan());
+        assertFalse(b.isTrim());
         final List<Beans.Scan.Exclude> excludeList = b.getScan().getExclude();
         assertNotNull(excludeList);
         assertEquals(4, excludeList.size());