You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/03/23 10:25:49 UTC
svn commit: r1304243 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/java/org/apache/openejb/config/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
Author: rmannibucau
Date: Fri Mar 23 09:25:48 2012
New Revision: 1304243
URL: http://svn.apache.org/viewvc?rev=1304243&view=rev
Log:
using ClassListInfo to respect AST
Added:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Added: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java?rev=1304243&view=auto
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java (added)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java Fri Mar 23 09:25:48 2012
@@ -0,0 +1,9 @@
+package org.apache.openejb.assembler.classic;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ClassListInfo extends InfoObject {
+ public String name;
+ public final Set<String> list = new HashSet<String>();
+}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java?rev=1304243&r1=1304242&r2=1304243&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java Fri Mar 23 09:25:48 2012
@@ -16,12 +16,10 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import java.util.List;
-import java.util.ArrayList;
public class WebAppInfo extends CommonInfoObject {
public String path;
@@ -40,5 +38,5 @@ public class WebAppInfo extends CommonIn
public final List<PortInfo> portInfos = new ArrayList<PortInfo>();
public final JndiEncInfo jndiEnc = new JndiEncInfo();
public final List<ServletInfo> servlets = new ArrayList<ServletInfo>();
- public final Map<String, Set<String>> jsfAnnotatedClasses = new HashMap<String, Set<String>>();
+ public final List<ClassListInfo> jsfAnnotatedClasses = new ArrayList<ClassListInfo>();
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1304243&r1=1304242&r2=1304243&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Fri Mar 23 09:25:48 2012
@@ -18,6 +18,7 @@ package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.ClassListInfo;
import org.apache.openejb.assembler.classic.ClientInfo;
import org.apache.openejb.assembler.classic.ConnectorInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
@@ -318,7 +319,13 @@ class AppInfoBuilder {
webAppInfo.restClass.addAll(webModule.getRestClasses());
webAppInfo.ejbWebServices.addAll(webModule.getEjbWebServices());
webAppInfo.ejbRestServices.addAll(webModule.getEjbRestServices());
- webAppInfo.jsfAnnotatedClasses.putAll(webModule.getJsfAnnotatedClasses());
+
+ for (Map.Entry<String, Set<String>> entry : webModule.getJsfAnnotatedClasses().entrySet()) {
+ final ClassListInfo info = new ClassListInfo();
+ info.name = entry.getKey();
+ info.list.addAll(entry.getValue());
+ webAppInfo.jsfAnnotatedClasses.add(info);
+ }
webAppInfo.host = webModule.getHost();
webAppInfo.contextRoot = webModule.getContextRoot();
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1304243&r1=1304242&r2=1304243&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Fri Mar 23 09:25:48 2012
@@ -46,6 +46,7 @@ import org.apache.openejb.Injection;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ClassListInfo;
import org.apache.openejb.assembler.classic.ConnectorInfo;
import org.apache.openejb.assembler.classic.DeploymentExceptionManager;
import org.apache.openejb.assembler.classic.EjbJarInfo;
@@ -625,7 +626,11 @@ public class TomcatWebAppBuilder impleme
}
// save jsf stuff
- jsfClasses.put(standardContext.getLoader().getClassLoader(), webAppInfo.jsfAnnotatedClasses);
+ final Map<String, Set<String>> scannedJsfClasses = new HashMap<String, Set<String>>();
+ for (ClassListInfo info : webAppInfo.jsfAnnotatedClasses) {
+ scannedJsfClasses.put(info.name, info.list);
+ }
+ jsfClasses.put(standardContext.getLoader().getClassLoader(), scannedJsfClasses);
try {