From scm-return-6280-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri Mar 04 21:14:20 2005
Return-Path: <scm-return-6280-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 76925 invoked from network); 4 Mar 2005 21:14:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 4 Mar 2005 21:14:20 -0000
Received: (qmail 8295 invoked by uid 500); 4 Mar 2005 21:14:20 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 8267 invoked by uid 500); 4 Mar 2005 21:14:19 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 8253 invoked by uid 99); 4 Mar 2005 21:14:19 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 04 Mar 2005 13:14:18 -0800
Received: (qmail 76911 invoked by uid 65534); 4 Mar 2005 21:14:17 -0000
Message-ID: <20050304211417.76910.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Fri, 04 Mar 2005 21:14:17 -0000
Subject: svn commit: r156198 - in geronimo/trunk/modules:
 connector-builder/src/test/org/apache/geronimo/connector/deployment/
 j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/
 j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/
 jetty-builder/src/test/org/apache/geronimo/jetty/deployment/
 naming-builder/src/java/org/apache/geronimo/naming/deployment/
 naming/src/java/org/apache/geronimo/naming/java/
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: djencks
Date: Fri Mar  4 13:14:13 2005
New Revision: 156198

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D156198
Log:
Bind HandleDelegate in java:comp

Modified:
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/c=
onnector/deployment/ConnectorModuleBuilderTest.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d=
eployment/EJBReferenceBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d=
eployment/RefContext.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/d=
eployment/EJBRefContextTest.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/d=
eployment/MockEJBConfigBuilder.java
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty=
/deployment/JettyModuleBuilderTest.java
    geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami=
ng/deployment/ENCConfigBuilder.java
    geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/=
ComponentContextBuilder.java

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/gero=
nimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder=
/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTe=
st.java?view=3Ddiff&r1=3D156197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/c=
onnector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/c=
onnector/deployment/ConnectorModuleBuilderTest.java Fri Mar  4 13:14:13 2005
@@ -108,6 +108,10 @@
         public Reference createEJBRemoteReference(String objectName, boole=
an isSession, String home, String remote) throws DeploymentException {
             return null;
         }
+
+        public Object createHandleDelegateReference() {
+            return null;
+        }
     };
=20
     private ResourceReferenceBuilder resourceReferenceBuilder =3D new Reso=
urceReferenceBuilder() {

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/=
j2ee/deployment/EJBReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/=
java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java?view=3Ddi=
ff&r1=3D156197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d=
eployment/EJBReferenceBuilder.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d=
eployment/EJBReferenceBuilder.java Fri Mar  4 13:14:13 2005
@@ -29,4 +29,6 @@
=20
     Reference createEJBRemoteReference(String objectName, boolean isSessio=
n, String home, String remote) throws DeploymentException;
=20
+    Object createHandleDelegateReference();
+
 }

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/=
j2ee/deployment/RefContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/=
java/org/apache/geronimo/j2ee/deployment/RefContext.java?view=3Ddiff&r1=3D1=
56197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d=
eployment/RefContext.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d=
eployment/RefContext.java Fri Mar  4 13:14:13 2005
@@ -221,6 +221,10 @@
         return ejbReferenceBuilder.createEJBLocalReference(objectName, isS=
ession, localHome, local);
     }
=20
+    public Object getHandleDelegateReference() {
+        return ejbReferenceBuilder.createHandleDelegateReference();
+    }
+
     public Reference getEJBRemoteRef(URI module, String ejbLink, boolean i=
sSession, String home, String remote) throws DeploymentException {
         String name =3D ejbLink.substring(ejbLink.lastIndexOf('#') + 1);
         String containerId =3D getContainerId(module, ejbLink, (Map) ejbRe=
moteIndex.get(name));

Modified: geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/=
j2ee/deployment/EJBRefContextTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/=
test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java?view=3Ddiff=
&r1=3D156197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/d=
eployment/EJBRefContextTest.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/d=
eployment/EJBRefContextTest.java Fri Mar  4 13:14:13 2005
@@ -172,6 +172,10 @@
             public Reference createEJBRemoteReference(String objectName, b=
oolean isSession, String home, String remote) {
                 return new FakeReference(objectName);
             }
+
+            public Object createHandleDelegateReference() {
+                return null;
+            }
         }, new ResourceReferenceBuilder() {
=20
             public Reference createResourceRef(String containerId, Class i=
face) {

Modified: geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/=
j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/=
test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?view=3Dd=
iff&r1=3D156197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/d=
eployment/MockEJBConfigBuilder.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/d=
eployment/MockEJBConfigBuilder.java Fri Mar  4 13:14:13 2005
@@ -76,4 +76,8 @@
     public Reference createEJBRemoteReference(String objectName, boolean i=
sSession, String home, String remote) throws DeploymentException {
         return null;
     }
+
+    public Object createHandleDelegateReference() {
+        return null;
+    }
 }

Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo=
/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src=
/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?view=
=3Ddiff&r1=3D156197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty=
/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty=
/deployment/JettyModuleBuilderTest.java Fri Mar  4 13:14:13 2005
@@ -158,6 +158,10 @@
                     public Reference createEJBRemoteReference(String objec=
tName, boolean isSession, String home, String remote) throws DeploymentExce=
ption {
                         return null;
                     }
+
+                    public Object createHandleDelegateReference() {
+                        return null;
+                    }
                 },
                 new ResourceReferenceBuilder() {
=20

Modified: geronimo/trunk/modules/naming-builder/src/java/org/apache/geronim=
o/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/sr=
c/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?view=3Dd=
iff&r1=3D156197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami=
ng/deployment/ENCConfigBuilder.java (original)
+++ geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami=
ng/deployment/ENCConfigBuilder.java Fri Mar  4 13:14:13 2005
@@ -183,8 +183,6 @@
                     builder.bind(name, new URL(gerResourceRef.getUrl()));
                 } catch (MalformedURLException e) {
                     throw  new DeploymentException("Could not convert " + =
gerResourceRef.getUrl() + " to URL", e);
-                } catch (NamingException e) {
-                    throw  new DeploymentException("Could not bind " + nam=
e, e);
                 }
             } else {
                 //determine jsr-77 type from interface
@@ -201,11 +199,7 @@
                 String containerId =3D getResourceContainerId(name, j2eeTy=
pe, uri, gerResourceRef, refContext, j2eeContext, earContext);
=20
                 ref =3D refContext.getConnectionFactoryRef(containerId, if=
ace);
-                try {
-                    builder.bind(name, ref);
-                } catch (NamingException e) {
-                    throw new DeploymentException("Invalid resource-ref de=
finition for name: " + name, e);
-                }
+                builder.bind(name, ref);
             }
         }
=20
@@ -260,11 +254,7 @@
             String containerId =3D getAdminObjectContainerId(name, uri, ge=
rResourceEnvRef, refContext, j2eeContext);
             Reference ref =3D refContext.getAdminObjectRef(containerId, if=
ace);
=20
-            try {
-                builder.bind(name, ref);
-            } catch (NamingException e) {
-                throw new DeploymentException("Invalid resource-ref defini=
tion for name: " + name, e);
-            }
+            builder.bind(name, ref);
         }
     }
=20
@@ -314,11 +304,7 @@
             //throws exception if it can't locate ref.
             String containerId =3D refContext.getAdminObjectContainerId(ur=
i, linkName, earContext.getJ2eeContext());
             Reference ref =3D refContext.getAdminObjectRef(containerId, if=
ace);
-            try {
-                builder.bind(name, ref);
-            } catch (NamingException e) {
-                throw new DeploymentException("Invalid message-destination=
-ref definition for name: " + name, e);
-            }
+            builder.bind(name, ref);
=20
         }
=20
@@ -379,11 +365,7 @@
                     ejbReference =3D refContext.getImplicitEJBRemoteRef(ur=
i, ejbRefName, isSession, home, remote);
                 }
             }
-            try {
-                builder.bind(ejbRefName, ejbReference);
-            } catch (NamingException e) {
-                throw new DeploymentException("Unable to to bind ejb-ref: =
ejb-ref-name=3D" + ejbRefName);
-            }
+            builder.bind(ejbRefName, ejbReference);
         }
     }
=20
@@ -436,11 +418,7 @@
             } else {
                 ejbReference =3D refContext.getImplicitEJBLocalRef(uri, ej=
bLink, isSession, localHome, local);
             }
-            try {
-                builder.bind(ejbRefName, ejbReference);
-            } catch (NamingException e) {
-                throw new DeploymentException("Unable to to bind ejb-local=
-ref: ejb-ref-name=3D" + ejbRefName);
-            }
+            builder.bind(ejbRefName, ejbReference);
         }
     }
=20
@@ -503,11 +481,7 @@
=20
             //we could get a Reference or the actual serializable Service =
back.
             Object ref =3D refContext.getServiceReference(serviceInterface=
, wsdlURI, jaxrpcMappingURI, serviceQName, portComponentRefMap, handlerInfo=
s, portLocationMap, earContext, module, cl);
-            try {
-                builder.bind(name, ref);
-            } catch (NamingException e) {
-                throw new DeploymentException("Invalid resource-ref defini=
tion for name: " + name, e);
-            }
+            builder.bind(name, ref);
         }
=20
     }
@@ -656,11 +630,12 @@
         ComponentContextBuilder builder =3D new ComponentContextBuilder();
=20
         if (userTransaction !=3D null) {
-            try {
-                builder.addUserTransaction(userTransaction);
-            } catch (NamingException e) {
-                throw new DeploymentException("Could not bind UserTransact=
ion", e);
-            }
+            builder.addUserTransaction(userTransaction);
+        }
+
+        Object handleDelegateReference =3D earContext.getRefContext().getH=
andleDelegateReference();
+        if (handleDelegateReference !=3D null) {
+            builder.addHandleDelegateReference(handleDelegateReference);
         }
=20
         URI uri =3D module.getConfigId();

Modified: geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming=
/java/ComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming/src/java/o=
rg/apache/geronimo/naming/java/ComponentContextBuilder.java?view=3Ddiff&r1=
=3D156197&r2=3D156198
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/=
ComponentContextBuilder.java (original)
+++ geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/=
ComponentContextBuilder.java Fri Mar  4 13:14:13 2005
@@ -41,11 +41,15 @@
         return context;
     }
=20
-    public void addUserTransaction(UserTransaction userTransaction) throws=
 NamingException {
+    public void addUserTransaction(UserTransaction userTransaction) {
         context.put("UserTransaction", userTransaction);
     }
=20
-    public void bind(String name, Object value) throws NamingException {
+    public void addHandleDelegateReference(Object handleDelegateReference)=
 {
+        context.put("HandleDelegate", handleDelegateReference);
+    }
+
+    public void bind(String name, Object value) {
         context.put(ENV + name, value);
     }
=20
@@ -97,4 +101,5 @@
         }
         context.put(ENV + name, value);
     }
+
 }