commit it to tag for now because there's existing AHP tck workflow againt tag. Will port it to beta-1 branch and trunk after the tck is done.
On Thu, Nov 3, 2011 at 11:44 PM, <genspr...@apache.org> wrote: > Author: genspring > Date: Thu Nov 3 15:44:29 2011 > New Revision: 1197190 > > URL: http://svn.apache.org/viewvc?rev=1197190&view=rev > Log: > Ensure AdminObjectRefBuilder executes before ResourceRefBuilder so that > resource-env-ref via @Resource annotation has been handled before > ResourceRefBuilder handle that @Resource as resource-ref. > > Modified: > > > geronimo/server/tags/geronimo-3.0-beta-1/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java > > Modified: > geronimo/server/tags/geronimo-3.0-beta-1/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/tags/geronimo-3.0-beta-1/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=1197190&r1=1197189&r2=1197190&view=diff > > ============================================================================== > --- > geronimo/server/tags/geronimo-3.0-beta-1/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java > (original) > +++ > geronimo/server/tags/geronimo-3.0-beta-1/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java > Thu Nov 3 15:44:29 2011 > @@ -636,4 +636,10 @@ public class AdminObjectRefBuilder exten > } > } > > + @Override > + public int getPriority() { > + return 45; > + } > + > + > } > > > -- Shawn
