Author: rmannibucau Date: Wed Nov 6 10:42:28 2013 New Revision: 1539303 URL: http://svn.apache.org/r1539303 Log: now we scan with linkage we can get rest applications which are abstract
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.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=1539303&r1=1539302&r2=1539303&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 Wed Nov 6 10:42:28 2013 @@ -1232,6 +1232,10 @@ public class AnnotationDeployer implemen } private static void addRestApplicationIfPossible(final WebModule webModule, final Class<? extends Application> app) { + if (Modifier.isAbstract(app.getModifiers())) { + return; + } + if (app.getConstructors().length == 0) { webModule.getRestApplications().add(app.getName()); } else { @@ -2007,6 +2011,10 @@ public class AnnotationDeployer implemen } catch (ClassNotFoundException e) { throw new OpenEJBException("Unable to load Application class: " + application, e); } + if (Modifier.isAbstract(clazz.getModifiers())) { + continue; + } + try { Application app = Application.class.cast(clazz.newInstance()); try { @@ -2021,9 +2029,9 @@ public class AnnotationDeployer implemen } // if app depends on cdi no need to do it } - } catch (InstantiationException e) { + } catch (final InstantiationException e) { throw new OpenEJBException("Unable to instantiate Application class: " + application, e); - } catch (IllegalAccessException e) { + } catch (final IllegalAccessException e) { throw new OpenEJBException("Unable to access Application class: " + application, e); } }