You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/04/11 09:51:44 UTC

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

Author: genspring
Date: Mon Apr 11 07:51:44 2011
New Revision: 1090959

URL: http://svn.apache.org/viewvc?rev=1090959&view=rev
Log:
@Resource should support String type env-entry injection as well.

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

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.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/ResourceRefBuilder.java?rev=1090959&r1=1090958&r2=1090959&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Mon Apr 11 07:51:44 2011
@@ -362,6 +362,7 @@ public class ResourceRefBuilder extends 
             if (resourceType.equals("javax.sql.DataSource") ||
                     resourceType.equals("javax.mail.Session") ||
                     resourceType.equals("java.net.URL") ||
+                    resourceType.equals("java.lang.String") ||
                     resourceType.equals("org.omg.CORBA.ORB") ||
                     resourceType.equals("org.omg.CORBA_2_3.ORB") ||
                     resourceType.equals("org.omg.CORBA_2_4.ORB") ||



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

Posted by Shawn Jiang <ge...@gmail.com>.
Thanks for the reminder !  the string env-entry does not work somehow.

Will check what's wrong with EnvironmentEntryBuilder and fix the issue
there.

On Wed, Apr 13, 2011 at 7:14 AM, Jarek Gawor <jg...@gmail.com> wrote:

> Are you sure this is correct? @Resource on a String is handled by
> EnvironmentEntryBuilder.java.
>
> Jarek
>
> On Mon, Apr 11, 2011 at 3:51 AM,  <ge...@apache.org> wrote:
> > Author: genspring
> > Date: Mon Apr 11 07:51:44 2011
> > New Revision: 1090959
> >
> > URL: http://svn.apache.org/viewvc?rev=1090959&view=rev
> > Log:
> > @Resource should support String type env-entry injection as well.
> >
> > Modified:
> >
>  geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
> >
> > Modified:
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.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/ResourceRefBuilder.java?rev=1090959&r1=1090958&r2=1090959&view=diff
> >
> ==============================================================================
> > ---
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
> (original)
> > +++
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
> Mon Apr 11 07:51:44 2011
> > @@ -362,6 +362,7 @@ public class ResourceRefBuilder extends
> >             if (resourceType.equals("javax.sql.DataSource") ||
> >                     resourceType.equals("javax.mail.Session") ||
> >                     resourceType.equals("java.net.URL") ||
> > +                    resourceType.equals("java.lang.String") ||
> >                     resourceType.equals("org.omg.CORBA.ORB") ||
> >                     resourceType.equals("org.omg.CORBA_2_3.ORB") ||
> >                     resourceType.equals("org.omg.CORBA_2_4.ORB") ||
> >
> >
> >
>



-- 
Shawn

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

Posted by Jarek Gawor <jg...@gmail.com>.
Are you sure this is correct? @Resource on a String is handled by
EnvironmentEntryBuilder.java.

Jarek

On Mon, Apr 11, 2011 at 3:51 AM,  <ge...@apache.org> wrote:
> Author: genspring
> Date: Mon Apr 11 07:51:44 2011
> New Revision: 1090959
>
> URL: http://svn.apache.org/viewvc?rev=1090959&view=rev
> Log:
> @Resource should support String type env-entry injection as well.
>
> Modified:
>    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.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/ResourceRefBuilder.java?rev=1090959&r1=1090958&r2=1090959&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Mon Apr 11 07:51:44 2011
> @@ -362,6 +362,7 @@ public class ResourceRefBuilder extends
>             if (resourceType.equals("javax.sql.DataSource") ||
>                     resourceType.equals("javax.mail.Session") ||
>                     resourceType.equals("java.net.URL") ||
> +                    resourceType.equals("java.lang.String") ||
>                     resourceType.equals("org.omg.CORBA.ORB") ||
>                     resourceType.equals("org.omg.CORBA_2_3.ORB") ||
>                     resourceType.equals("org.omg.CORBA_2_4.ORB") ||
>
>
>