[exo-jcr-commits] exo-jcr SVN: r3387 - ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl.

[do-not-reply at jboss.org]

Author: aparfonov
Date: 2010-11-03 08:31:56 -0400 (Wed, 03 Nov 2010)
New Revision: 3387

Modified:
   ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ApplicationRegistry.java
Log:
EXOJCR-1024

Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ApplicationRegistry.java
===================================================================
--- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ApplicationRegistry.java	2010-11-03 12:25:11 UTC (rev 3386)
+++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ApplicationRegistry.java	2010-11-03 12:31:56 UTC (rev 3387)
@@ -94,14 +94,8 @@
       for (Object obj : app.getSingletons())
       {
          Class clazz = obj.getClass();
-         if (clazz.getAnnotation(Path.class) != null)
+         if (clazz.getAnnotation(Provider.class) != null)
          {
-            AbstractResourceDescriptor descriptor = new ApplicationResource(applicationId, obj);
-            descriptor.accept(rdv);
-            resources.addResource(new SingletonObjectFactory<AbstractResourceDescriptor>(descriptor, obj));
-         }
-         else if (clazz.getAnnotation(Provider.class) != null)
-         {
             if (obj instanceof ContextResolver)
                appProviders.addContextResolver((ContextResolver)obj);
             if (obj instanceof ExceptionMapper)
@@ -120,6 +114,12 @@
             if (obj instanceof ResponseFilter)
                appProviders.addResponseFilter((ResponseFilter)obj);
          }
+         else if (clazz.getAnnotation(Path.class) != null)
+         {
+            AbstractResourceDescriptor descriptor = new ApplicationResource(applicationId, obj);
+            descriptor.accept(rdv);
+            resources.addResource(new SingletonObjectFactory<AbstractResourceDescriptor>(descriptor, obj));
+         }
          else
          {
             LOG.warn("Unknown class type: " + clazz.getName() + " found in " + applicationId);
@@ -127,14 +127,8 @@
       }
       for (Class clazz : app.getClasses())
       {
-         if (clazz.getAnnotation(Path.class) != null)
+         if (clazz.getAnnotation(Provider.class) != null)
          {
-            AbstractResourceDescriptor descriptor = new ApplicationResource(applicationId, clazz);
-            descriptor.accept(rdv);
-            resources.addResource(new PerRequestObjectFactory<AbstractResourceDescriptor>(descriptor));
-         }
-         else if (clazz.getAnnotation(Provider.class) != null)
-         {
             if (ContextResolver.class.isAssignableFrom(clazz))
                appProviders.addContextResolver(clazz);
             if (ExceptionMapper.class.isAssignableFrom(clazz))
@@ -153,6 +147,12 @@
             if (ResponseFilter.class.isAssignableFrom(clazz))
                appProviders.addResponseFilter(clazz);
          }
+         else if (clazz.getAnnotation(Path.class) != null)
+         {
+            AbstractResourceDescriptor descriptor = new ApplicationResource(applicationId, clazz);
+            descriptor.accept(rdv);
+            resources.addResource(new PerRequestObjectFactory<AbstractResourceDescriptor>(descriptor));
+         }
          else
          {
             LOG.warn("Unknown class type: " + clazz.getName() + " found in: " + applicationId);