svn commit: r1431942 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: cdi/CdiScanner.java config/AnnotationDeployer.java config/rules/CheckRestMethodArePublic.java

[rmannibucau]

Author: rmannibucau
Date: Fri Jan 11 08:59:38 2013
New Revision: 1431942

URL: http://svn.apache.org/viewvc?rev=1431942&view=rev
Log:
not ear case

Modified:
    
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/AnnotationDeployer.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java

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=1431942&r1=1431941&r2=1431942&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 Jan 11 08:59:38 2013
@@ -98,7 +98,7 @@ public class CdiScanner implements Scann
                 if 
(!ejbJar.moduleId.equals(startupObject.getWebContext().getId())) {
                     continue;
                 }
-            } else if (ejbJar.webapp) {
+            } else if (ejbJar.webapp && !appInfo.webAppAlone) {
                 continue;
             }
 

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1431942&r1=1431941&r2=1431942&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 Fri Jan 11 08:59:38 2013
@@ -1945,7 +1945,7 @@ public class AnnotationDeployer implemen
                                 } else {
                                     addRestClassesToScannedClasses(webModule, 
classes, classLoader);
                                 }
-                            } catch (NullPointerException npe) {
+                            } catch (RuntimeException npe) {
                                 if (app == null) {
                                     throw npe;
                                 }

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java?rev=1431942&r1=1431941&r2=1431942&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java
 Fri Jan 11 08:59:38 2013
@@ -81,7 +81,7 @@ public class CheckRestMethodArePublic im
                         for (Object rsSingleton : appInstance.getSingletons()) 
{
                             classes.add(rsSingleton.getClass().getName());
                         }
-                    } catch (NullPointerException npe) {
+                    } catch (RuntimeException npe) {
                         if (appInstance == null) {
                             throw npe;
                         }