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:24:05 UTC
svn commit: r1198599 -
/geronimo/server/branches/3.0-beta/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:24:05 2011
New Revision: 1198599
URL: http://svn.apache.org/viewvc?rev=1198599&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/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
Modified: geronimo/server/branches/3.0-beta/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/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=1198599&r1=1198598&r2=1198599&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Mon Nov 7 01:24:05 2011
@@ -635,5 +635,10 @@ public class AdminObjectRefBuilder exten
annotatedApp.getMessageDestinationRef().add(messageDestinationRef);
}
}
+
+ @Override
+ public int getPriority() {
+ return 45;
+ }
}