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/30 01:00:41 UTC

svn commit: r1307156 - /openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java

Author: rmannibucau
Date: Thu Mar 29 23:00:41 2012
New Revision: 1307156

URL: http://svn.apache.org/viewvc?rev=1307156&view=rev
Log:
when no application is defined merging rest ejb and pojo ejbs

Modified:
    openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java

Modified: openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1307156&r1=1307155&r2=1307156&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java (original)
+++ openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java Thu Mar 29 23:00:41 2012
@@ -161,7 +161,10 @@ public abstract class RESTService implem
         }
 
         if (!useApp) {
-            for (String clazz : webApp.restClass) {
+            final Set<String> restClasses = new HashSet<String>(webApp.restClass);
+            restClasses.addAll(webApp.ejbRestServices);
+
+            for (String clazz : restClasses) {
                 if (restEjbs.containsKey(clazz)) {
                     deployEJB(appPrefix, restEjbs.get(clazz).context);
                 } else {