svn commit: r1446337 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config: AnnotationDeployer.java DeploymentLoader.java EmptyEjbJar.java

[rm...@apache.org]

Author: rmannibucau
Date: Thu Feb 14 21:27:32 2013
New Revision: 1446337

URL: http://svn.apache.org/r1446337
Log:
avoiding to create two finders for ear/lib

Added:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EmptyEjbJar.java
Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1446337&r1=1446336&r2=1446337&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Thu Feb 14 21:27:32 2013
@@ -409,7 +409,7 @@ public class AnnotationDeployer implemen
 
     public static class DiscoverAnnotatedBeans implements DynamicDeployer {
         public AppModule deploy(AppModule appModule) throws OpenEJBException {
-            if (!appModule.isWebapp()) {
+            if (!appModule.isWebapp() && appModule.getEjbModules() == null) {
                 try {
                     appModule.setEarLibFinder(FinderFactory.createFinder(appModule));
                 } catch (final Exception e) {

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1446337&r1=1446336&r2=1446337&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Thu Feb 14 21:27:32 2013
@@ -974,9 +974,18 @@ public class DeploymentLoader implements
 
         if (complete == null) return;
 
+        IAnnotationFinder finder;
+        try {
+            finder = FinderFactory.createFinder(appModule);
+        } catch (Exception e) {
+            finder = new FinderFactory.ModuleLimitedFinder(new org.apache.xbean.finder.AnnotationFinder(new WebappAggregatedArchive(appModule.getClassLoader(), appModule.getAltDDs(), xmls)));
+        }
+        appModule.setEarLibFinder(finder);
+
         final EjbModule ejbModule = new EjbModule(appModule.getClassLoader(), EAR_SCOPED_CDI_BEANS + appModule.getModuleId(), new EjbJar(), new OpenejbJar());
         ejbModule.setBeans(complete);
-        ejbModule.setFinder(new FinderFactory.ModuleLimitedFinder(new org.apache.xbean.finder.AnnotationFinder(new WebappAggregatedArchive(appModule.getClassLoader(), appModule.getAltDDs(), xmls))));
+        ejbModule.setFinder(finder);
+        ejbModule.setEjbJar(new EmptyEjbJar());
 
         appModule.getEjbModules().add(ejbModule);
     }

Added: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EmptyEjbJar.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EmptyEjbJar.java?rev=1446337&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EmptyEjbJar.java (added)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EmptyEjbJar.java Thu Feb 14 21:27:32 2013
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.config;
+
+import org.apache.openejb.jee.AssemblyDescriptor;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.Interceptor;
+
+public class EmptyEjbJar extends EjbJar {
+    private static final EnterpriseBean[] EMPTY_BEANS = new EnterpriseBean[0];
+
+    @Override
+    public void setAssemblyDescriptor(final AssemblyDescriptor value) {
+        // no-op
+    }
+
+    @Override
+    public void setEnterpriseBeans(final EnterpriseBean[] v) {
+        // no-op
+    }
+
+    @Override
+    public EnterpriseBean[] getEnterpriseBeans() {
+        return EMPTY_BEANS;
+    }
+
+    @Override
+    public <T extends EnterpriseBean> T addEnterpriseBean(final T bean){
+        return bean;
+    }
+
+    @Override
+    public <T extends EnterpriseBean> EjbJar enterpriseBean(final T bean) {
+        return this;
+    }
+
+    @Override
+    public Interceptor addInterceptor(final Interceptor interceptor) {
+        return interceptor;
+    }
+}