You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/11/07 02:26:14 UTC

svn commit: r1198600 - /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java

Author: rwonly
Date: Mon Nov  7 01:26:13 2011
New Revision: 1198600

URL: http://svn.apache.org/viewvc?rev=1198600&view=rev
Log:
merge in rev 1197190, Ensure AdminObjectRefBuilder executes before ResourceRefBuilder so that resource-env-ref via @Resource annotation has been handled before ResourceRefBuilder handle that @Resource as resource-ref. (thanks Shawn!)

Modified:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=1198600&r1=1198599&r2=1198600&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Mon Nov  7 01:26:13 2011
@@ -635,5 +635,10 @@ public class AdminObjectRefBuilder exten
             annotatedApp.getMessageDestinationRef().add(messageDestinationRef);
         }
     }
+    
+    @Override
+    public int getPriority() {
+        return 45;
+    }
 
 }