svn commit: r1617167 - in /tomee/tomee/trunk/container/openejb-core/src: main/java/org/apache/openejb/assembler/classic/BeansInfo.java test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Aug 10 21:52:38 2014
New Revision: 1617167

URL: http://svn.apache.org/r1617167
Log:
ignore XmlTransient fields in info tree, this is mainly a wait we do it better solution

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java?rev=1617167&r1=1617166&r2=1617167&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java Sun Aug 10 21:52:38 2014
@@ -19,6 +19,7 @@ package org.apache.openejb.assembler.cla
 
 import org.apache.openejb.assembler.ExclusionInfo;
 
+import javax.xml.bind.annotation.XmlTransient;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36,8 +37,6 @@ public class BeansInfo extends InfoObjec
     public final List<String> alternativeClasses = new ArrayList<String>();
     public final List<String> alternativeStereotypes = new ArrayList<String>();
 
-    public final Map<URL, List<String>> managedClasses = new HashMap<>();
-
     public final List<String> duplicatedInterceptors = new ArrayList<String>();
     public final List<String> duplicatedDecorators = new ArrayList<String>();
     public final List<String> duplicatedAlternativeClasses = new ArrayList<String>();
@@ -46,5 +45,15 @@ public class BeansInfo extends InfoObjec
     public String version = "1.1";
     public String discoveryMode;
     public final Map<String, ExclusionInfo> excludes = new HashMap<>();
+
+    // TODO: rework these two maps to make then more adapted to info tree
+    // Tip: get a real CompositeBeansInfo and each BeansInfo has a List<String> classes and a discovery mode
+    //      to remove these maps
+    //      NB: doesn't only need to change it here but also in DeploymentLoader and AnnotationDeployer
+
+    @XmlTransient // ClassListInfo instead of transient?
+    public final Map<URL, List<String>> managedClasses = new HashMap<>();
+
+    @XmlTransient // ClassListInfo wouldn't work since we need a key for this field + this is mainly a built info, not a tree info
     public final Map<URL, String> discoveryModeByUrl = new HashMap<>();
 }

Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java?rev=1617167&r1=1617166&r2=1617167&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java Sun Aug 10 21:52:38 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.assembler.cla
 
 import junit.framework.TestCase;
 
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.namespace.QName;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
@@ -151,6 +152,10 @@ public class OpenEjbConfigurationValidat
                 continue;
             }
 
+            if (field.getAnnotation(XmlTransient.class) != null) {
+                continue;
+            }
+
             //  All else is NOT allowed
             //  Referrences to java.lang.Class or ClassLoaders, or URLs or anything else is all bad
             fail("Field is not of an allowed type: " + simpleName + "." + field.getName());