[jboss-cvs] JBossAS SVN: r95477 - in projects/jboss-osgi/trunk/reactor/deployment/src: test/java/org/jboss/test/osgi/deployment/interceptor and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-10-23 07:09:40 -0400 (Fri, 23 Oct 2009)
New Revision: 95477

Modified:
   projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptor.java
   projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptor.java
   projects/jboss-osgi/trunk/reactor/deployment/src/test/java/org/jboss/test/osgi/deployment/interceptor/InterceptorOrderTestCase.java
Log:
Move RELATIVE_ORDER_DEFAULT

Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptor.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptor.java	2009-10-23 11:08:37 UTC (rev 95476)
+++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptor.java	2009-10-23 11:09:40 UTC (rev 95477)
@@ -34,9 +34,6 @@
  */
 public abstract class AbstractLifecycleInterceptor implements LifecycleInterceptor 
 {
-   /** The default relative order: 1000 */
-   public static final int RELATIVE_ORDER_DEFAULT = 1000;
-   
    private Set<Class<?>> input;
    private Set<Class<?>> output;
    
@@ -46,7 +43,7 @@
     */
    public int getRelativeOrder()
    {
-      return RELATIVE_ORDER_DEFAULT;
+      return LifecycleInterceptor.RELATIVE_ORDER_DEFAULT;
    }
 
    /**

Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptor.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptor.java	2009-10-23 11:08:37 UTC (rev 95476)
+++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptor.java	2009-10-23 11:09:40 UTC (rev 95477)
@@ -36,6 +36,9 @@
  */
 public interface LifecycleInterceptor
 {
+   /** The default relative order: 1000 */
+   public static final int RELATIVE_ORDER_DEFAULT = 1000;
+
    /**
     * Get the relative order of this interceptor
     */

Modified: projects/jboss-osgi/trunk/reactor/deployment/src/test/java/org/jboss/test/osgi/deployment/interceptor/InterceptorOrderTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/src/test/java/org/jboss/test/osgi/deployment/interceptor/InterceptorOrderTestCase.java	2009-10-23 11:08:37 UTC (rev 95476)
+++ projects/jboss-osgi/trunk/reactor/deployment/src/test/java/org/jboss/test/osgi/deployment/interceptor/InterceptorOrderTestCase.java	2009-10-23 11:09:40 UTC (rev 95477)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import static org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor.RELATIVE_ORDER_DEFAULT;
+import static org.jboss.osgi.deployment.interceptor.LifecycleInterceptor.RELATIVE_ORDER_DEFAULT;
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;