Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 14224 invoked from network); 3 May 2007 22:44:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 May 2007 22:44:29 -0000 Received: (qmail 10066 invoked by uid 500); 3 May 2007 22:44:34 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 9504 invoked by uid 500); 3 May 2007 22:44:33 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 9493 invoked by uid 99); 3 May 2007 22:44:33 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2007 15:44:33 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [68.142.206.241] (HELO smtp108.plus.mail.mud.yahoo.com) (68.142.206.241) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 03 May 2007 15:44:25 -0700 Received: (qmail 44555 invoked from network); 3 May 2007 22:44:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Received:X-YMail-OSG:Mime-Version:In-Reply-To:References:Content-Type:Message-Id:Content-Transfer-Encoding:From:Subject:Date:To:X-Mailer; b=u7Q3XKZZw46DK9XvdjYwV4l5I8GFHYTw8PAM4FLb6OHC3dCiwOR0e00OE33oTPdTvZf7EWI7f9/yaeFVNsEWjdTqNH3JJ3655rxwGHdiyfrYjFWX9i+NbPW7JLJ45YTl3MlrFg8p5xMADyEmr9u2xxMImZE7EKBNbVPBgXeCDCs= ; Received: from unknown (HELO ?10.11.55.8?) (david_jencks@63.105.20.225 with plain) by smtp108.plus.mail.mud.yahoo.com with SMTP; 3 May 2007 22:44:04 -0000 X-YMail-OSG: qTij4sMVM1mf65fVsR8P2RG3kMOl_7qdn0d00rI5LwZ8yYjpoW53FtWqHfkYdLcKW8a7jEa8Ij80L5bzRXeeru.Wr7EXip2wvYs32VZpkRUVFNtW8Kzz7z67jbPPzA-- Mime-Version: 1.0 (Apple Message framework v752.3) In-Reply-To: <79493090-44FF-4819-B81B-F4BB737E26FA@visi.com> References: <20070503202949.319501A9838@eris.apache.org> <79493090-44FF-4819-B81B-F4BB737E26FA@visi.com> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <1025B7F7-1B12-417F-A27D-BC94BEB15B2A@yahoo.com> Content-Transfer-Encoding: 7bit From: David Jencks Subject: Re: svn commit: r534984 - in /geronimo/server/trunk: configs/connector-deployer/src/plan/ modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ Date: Thu, 3 May 2007 15:43:58 -0700 To: dev@geronimo.apache.org X-Mailer: Apple Mail (2.752.3) X-Virus-Checked: Checked by ClamAV on apache.org sorry, should be fixed in rev 535002 david jencks On May 3, 2007, at 3:30 PM, David Blevins wrote: > I fear you may have broken the build. Do we simply need a version > number in that declaration or is something else not working? > > -David > > On May 3, 2007, at 1:29 PM, djencks@apache.org wrote: > >> Author: djencks >> Date: Thu May 3 13:29:47 2007 >> New Revision: 534984 >> >> URL: http://svn.apache.org/viewvc?view=rev&rev=534984 >> Log: >> GERONIMO-3138 ORB as resource-ref >> >> Modified: >> geronimo/server/trunk/configs/connector-deployer/src/plan/ >> plan.xml >> geronimo/server/trunk/modules/geronimo-connector-builder/src/ >> main/java/org/apache/geronimo/connector/deployment/ >> ResourceRefBuilder.java >> geronimo/server/trunk/modules/geronimo-naming/src/main/java/ >> org/apache/geronimo/naming/reference/ConfigurationAwareReference.java >> >> Modified: geronimo/server/trunk/configs/connector-deployer/src/ >> plan/plan.xml >> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ >> connector-deployer/src/plan/plan.xml? >> view=diff&rev=534984&r1=534983&r2=534984 >> ===================================================================== >> ========= >> --- geronimo/server/trunk/configs/connector-deployer/src/plan/ >> plan.xml (original) >> +++ geronimo/server/trunk/configs/connector-deployer/src/plan/ >> plan.xml Thu May 3 13:29:47 2007 >> @@ -50,6 +50,20 @@ >> >> > class="org.apache.geronimo.connector.deployment.ResourceRefBuilder"> >> http://java.sun.com/xml/ns/ >> j2ee,http://java.sun.com/xml/ns/javaee >> + >> + >> + >> + >> + org.apache.geronimo.configs> groupId> >> + j2ee-corba-yoko >> + car >> + >> + >> + >> + >> + >> + EARBuilder >> + >> >> > class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder >> "> >> http://java.sun.com/xml/ns/ >> j2ee,http://java.sun.com/xml/ns/javaee >> @@ -80,6 +94,20 @@ >> >> > class="org.apache.geronimo.connector.deployment.ResourceRefBuilder"> >> http://java.sun.com/xml/ns/ >> j2ee,http://java.sun.com/xml/ns/javaee >> + >> + >> + >> + >> + org.apache.geronimo.configs> groupId> >> + client-corba-yoko >> + car >> + >> + >> + >> + >> + >> + AppClientBuilder >> + >> >> > class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder >> "> >> http://java.sun.com/xml/ns/ >> j2ee,http://java.sun.com/xml/ns/javaee >> >> Modified: geronimo/server/trunk/modules/geronimo-connector-builder/ >> src/main/java/org/apache/geronimo/connector/deployment/ >> ResourceRefBuilder.java >> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ >> geronimo-connector-builder/src/main/java/org/apache/geronimo/ >> connector/deployment/ResourceRefBuilder.java? >> view=diff&rev=534984&r1=534983&r2=534984 >> ===================================================================== >> ========= >> --- geronimo/server/trunk/modules/geronimo-connector-builder/src/ >> main/java/org/apache/geronimo/connector/deployment/ >> ResourceRefBuilder.java (original) >> +++ geronimo/server/trunk/modules/geronimo-connector-builder/src/ >> main/java/org/apache/geronimo/connector/deployment/ >> ResourceRefBuilder.java Thu May 3 13:29:47 2007 >> @@ -22,6 +22,7 @@ >> import java.net.MalformedURLException; >> import java.net.URI; >> import java.net.URL; >> +import java.util.Collection; >> import java.util.HashMap; >> import java.util.HashSet; >> import java.util.List; >> @@ -39,17 +40,21 @@ >> import org.apache.geronimo.gbean.AbstractNameQuery; >> import org.apache.geronimo.gbean.GBeanInfo; >> import org.apache.geronimo.gbean.GBeanInfoBuilder; >> +import org.apache.geronimo.gbean.SingleElementCollection; >> +import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource; >> import org.apache.geronimo.j2ee.deployment.Module; >> import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp; >> import >> org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelp >> er; >> import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; >> import org.apache.geronimo.kernel.GBeanNotFoundException; >> import org.apache.geronimo.kernel.config.Configuration; >> -import org.apache.geronimo.kernel.repository.Environment; >> +import org.apache.geronimo.kernel.repository.Artifact; >> import org.apache.geronimo.kernel.repository.Dependency; >> +import org.apache.geronimo.kernel.repository.Environment; >> import org.apache.geronimo.naming.deployment.AbstractNamingBuilder; >> import >> org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder; >> import >> org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter; >> +import org.apache.geronimo.naming.reference.ORBReference; >> import org.apache.geronimo.naming.reference.ResourceReference; >> import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; >> import >> org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefDocument; >> @@ -64,6 +69,7 @@ >> import org.apache.geronimo.xbeans.javaee.XsdStringType; >> import org.apache.xmlbeans.QNameSet; >> import org.apache.xmlbeans.XmlObject; >> +import org.omg.CORBA.ORB; >> >> /** >> * @version $Rev$ $Date$ >> @@ -74,16 +80,18 @@ >> >> private static final QName GER_RESOURCE_REF_QNAME = >> GerResourceRefDocument.type.getDocumentElementName(); >> private static final QNameSet GER_RESOURCE_REF_QNAME_SET = >> QNameSet.singleton(GER_RESOURCE_REF_QNAME); >> - >> - private final QNameSet resourceRefQNameSet; >> - >> private static final String JAXR_CONNECTION_FACTORY_CLASS = >> "javax.xml.registry.ConnectionFactory"; >> private static final String JAVAX_MAIL_SESSION_CLASS = >> "javax.mail.Session"; >> >> - public ResourceRefBuilder(Environment defaultEnvironment, >> String[] eeNamespaces) { >> + >> + private final QNameSet resourceRefQNameSet; >> + private final SingleElementCollection >> corbaGBeanNameSourceCollection; >> + >> + public ResourceRefBuilder(Environment defaultEnvironment, >> String[] eeNamespaces, Collection corbaGBeanNameSourceCollection) { >> super(defaultEnvironment); >> >> resourceRefQNameSet = buildQNameSet(eeNamespaces, >> "resource-ref"); >> + this.corbaGBeanNameSourceCollection = new >> SingleElementCollection(corbaGBeanNameSourceCollection); >> } >> >> protected boolean willMergeEnvironment(XmlObject specDD, >> XmlObject plan) { >> @@ -130,6 +138,17 @@ >> } catch (MalformedURLException e) { >> throw new DeploymentException("Could not >> convert " + gerResourceRef.getUrl() + " to URL", e); >> } >> + } else if (iface == ORB.class) { >> + CorbaGBeanNameSource corbaGBeanNameSource = >> (CorbaGBeanNameSource) corbaGBeanNameSourceCollection.getElement(); >> + if (corbaGBeanNameSource == null) { >> + throw new DeploymentException("No orb setup >> but there is a orb reference"); >> + } >> + AbstractNameQuery corbaName = >> corbaGBeanNameSource.getCorbaGBeanName(); >> + if (corbaName != null) { >> + Artifact[] moduleId = getConfigId >> (localConfiguration, remoteConfiguration); >> + Map context = getJndiContextMap >> (componentContext); >> + context.put(ENV + name, new ORBReference >> (moduleId, corbaName)); >> + } >> } else { >> //determine jsr-77 type from interface >> String j2eeType; >> @@ -170,7 +189,7 @@ >> errorMessage.append >> (gerResourceRef.getPattern()); >> } >> errorMessage.append("\nSearch conducted in >> current module and dependencies:\n"); >> - for (Dependency dependency: >> localConfiguration.getEnvironment().getDependencies()) { >> + for (Dependency dependency : >> localConfiguration.getEnvironment().getDependencies()) { >> errorMessage.append(dependency).append >> ("\n"); >> } >> errorMessage.append(")"); >> @@ -261,7 +280,7 @@ >> >> String resourceName = getResourceName(annotation, >> method, field); >> String resourceType = getResourceType(annotation, >> method, field); >> - >> + >> if (resourceType.equals("javax.sql.DataSource") || >> resourceType.equals >> ("javax.jms.ConnectionFactory") || >> resourceType.equals >> ("javax.jms.QueueConnectionFactory") || >> @@ -368,8 +387,9 @@ >> GBeanInfoBuilder infoBuilder = >> GBeanInfoBuilder.createStatic(ResourceRefBuilder.class, >> NameFactory.MODULE_BUILDER); >> infoBuilder.addAttribute("eeNamespaces", String[].class, >> true, true); >> infoBuilder.addAttribute("defaultEnvironment", >> Environment.class, true, true); >> + infoBuilder.addReference("CorbaGBeanNameSource", >> CorbaGBeanNameSource.class); >> >> - infoBuilder.setConstructor(new String[] >> {"defaultEnvironment", "eeNamespaces"}); >> + infoBuilder.setConstructor(new String[] >> {"defaultEnvironment", "eeNamespaces", "CorbaGBeanNameSource"}); >> >> GBEAN_INFO = infoBuilder.getBeanInfo(); >> } >> >> Modified: geronimo/server/trunk/modules/geronimo-naming/src/main/ >> java/org/apache/geronimo/naming/reference/ >> ConfigurationAwareReference.java >> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ >> geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ >> ConfigurationAwareReference.java? >> view=diff&rev=534984&r1=534983&r2=534984 >> ===================================================================== >> ========= >> --- geronimo/server/trunk/modules/geronimo-naming/src/main/java/ >> org/apache/geronimo/naming/reference/ >> ConfigurationAwareReference.java (original) >> +++ geronimo/server/trunk/modules/geronimo-naming/src/main/java/ >> org/apache/geronimo/naming/reference/ >> ConfigurationAwareReference.java Thu May 3 13:29:47 2007 >> @@ -59,6 +59,9 @@ >> Kernel kernel = getKernel(); >> ConfigurationManager configurationManager = >> ConfigurationUtil.getConfigurationManager(kernel); >> Configuration configuration = >> configurationManager.getConfiguration(configId[0]); >> + if (configuration == null) { >> + throw new IllegalStateException("No configuration >> found for id: " + configId[0]); >> + } >> next: for (int i = 1; i < configId.length; i++) { >> List children = >> configuration.getChildren(); >> for (Configuration child: children) { >> >> >