Author: rmannibucau
Date: Fri Nov 30 09:47:35 2012
New Revision: 1415560
URL: http://svn.apache.org/viewvc?rev=1415560&view=rev
Log:
TOMEE-615 we already have the right info for the throw or not test for cdi and
ear/war/jar packaging
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java?rev=1415560&r1=1415559&r2=1415560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/BeansInfo.java
Fri Nov 30 09:47:35 2012
@@ -38,5 +38,4 @@ public class BeansInfo extends InfoObjec
public final List<String> duplicatedDecorators = new ArrayList<String>();
public final List<String> duplicatedAlternativeClasses = new
ArrayList<String>();
public final List<String> duplicatedAlternativeStereotypes = new
ArrayList<String>();
- public boolean webapp = false;
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1415560&r1=1415559&r2=1415560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Fri Nov 30 09:47:35 2012
@@ -124,7 +124,7 @@ public class CdiScanner implements Scann
} /* else { don't do it, check is done when we know the
beans.xml path --> org.apache.openejb.config.DeploymentLoader.addBeansXmls
throw new WebBeansConfigurationException("Interceptor
class : " + clazz.getName() + " is already defined");
}*/
- } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
+ } else if (shouldThrowCouldNotLoadException(startupObject)) {
throw new WebBeansConfigurationException("Could not load
interceptor class: " + className);
}
}
@@ -137,7 +137,7 @@ public class CdiScanner implements Scann
decoratorsManager.addNewDecorator(clazz);
classes.add(clazz);
} // same than interceptors regarding throw new
WebBeansConfigurationException("Decorator class : " + clazz.getName() + " is
already defined");
- } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
+ } else if (shouldThrowCouldNotLoadException(startupObject)) {
throw new WebBeansConfigurationException("Could not load
decorator class: " + className);
}
}
@@ -148,7 +148,7 @@ public class CdiScanner implements Scann
if (clazz != null) {
alternativesManager.addStereoTypeAlternative(clazz, null,
null);
classes.add(clazz);
- } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
+ } else if (shouldThrowCouldNotLoadException(startupObject)) {
throw new WebBeansConfigurationException("Could not load
alternativeStereotype class: " + className);
}
}
@@ -158,7 +158,7 @@ public class CdiScanner implements Scann
if (clazz != null) {
alternativesManager.addClazzAlternative(clazz, null, null);
classes.add(clazz);
- } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
+ } else if (shouldThrowCouldNotLoadException(startupObject)) {
throw new WebBeansConfigurationException("Could not load
alternative class: " + className);
}
}
@@ -183,8 +183,9 @@ public class CdiScanner implements Scann
}
- private static boolean shouldThrowCouldNotLoadException(final BeansInfo
beans, final StartupObject startupObject) {
- return (beans.webapp && startupObject.isFromWebApp()) || !beans.webapp;
+ private static boolean shouldThrowCouldNotLoadException(final
StartupObject startupObject) {
+ final AppInfo appInfo = startupObject.getAppInfo();
+ return appInfo.webAppAlone || appInfo.webApps.size() == 0 ||
startupObject.isFromWebApp();
}
private void process(final ClassLoader classLoader, final Set<String>
ejbClasses, final Iterator<String> it, final StartupObject startupObject, final
ClassLoaderComparator comparator, final ClassLoader scl, final boolean
filterByClassLoader) {
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1415560&r1=1415559&r2=1415560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Fri Nov 30 09:47:35 2012
@@ -95,7 +95,6 @@ import static org.apache.openejb.util.UR
public class DeploymentLoader implements DeploymentFilterable {
public static final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG,
"org.apache.openejb.util.resources");
public static final String OPENEJB_ALTDD_PREFIX = "openejb.altdd.prefix";
- public static final String OPENEJB_ORIGIN_WEBAPP = "openejb.webapp.origin";
private static final String ddDir = "META-INF/";
private boolean scanManagedBeans = true;
@@ -670,7 +669,6 @@ public class DeploymentLoader implements
// than an ear file, so the ear-style code we were previously
// using doesn't exactly work anymore.
final EjbModule webEjbModule = new
EjbModule(webModule.getClassLoader(), webModule.getModuleId(),
webModule.getJarLocation(), null, null);
- webEjbModule.getProperties().put(OPENEJB_ORIGIN_WEBAPP, "true");
webEjbModule.getAltDDs().putAll(webModule.getAltDDs());
appModule.getEjbModules().add(webEjbModule);
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=1415560&r1=1415559&r2=1415560&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
Fri Nov 30 09:47:35 2012
@@ -206,7 +206,6 @@ public class EjbJarInfoBuilder {
if (jar.getBeans() != null) {
ejbJar.beans = new BeansInfo();
- ejbJar.beans.webapp =
Boolean.TRUE.toString().equals(jar.getProperties().getProperty(DeploymentLoader.OPENEJB_ORIGIN_WEBAPP,
Boolean.FALSE.toString()));
ejbJar.beans.interceptors.addAll(jar.getBeans().getInterceptors());
ejbJar.beans.decorators.addAll(jar.getBeans().getDecorators());
