geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r156446 - in geronimo/trunk/modules: j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ naming-builder/ naming-builder/src/java/org/apache/geronimo/naming/deployment/ naming-builder/src/schema/
Date Mon, 07 Mar 2005 20:41:19 GMT
Author: adc
Date: Mon Mar  7 12:41:15 2005
New Revision: 156446

URL: http://svn.apache.org/viewcvs?view=rev&rev=156446
Log:
Added CORBA references.

Modified:
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
    geronimo/trunk/modules/naming-builder/project.xml
    geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd

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=diff&r1=156445&r2=156446
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
(original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
Mon Mar  7 12:41:15 2005
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2004 The Apache Software Foundation
+ * Copyright 2004-2005 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.j2ee.deployment;
 
+import java.net.URI;
 import javax.naming.Reference;
 
 import org.apache.geronimo.common.DeploymentException;
@@ -28,6 +29,8 @@
     Reference createEJBLocalReference(String objectName, boolean isSession, String localHome,
String local) throws DeploymentException;
 
     Reference createEJBRemoteReference(String objectName, boolean isSession, String home,
String remote) throws DeploymentException;
+
+    Reference createCORBAReference(URI corbaURL, String objectName, String containerName,
String home) throws DeploymentException;
 
     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=diff&r1=156445&r2=156446
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
(original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
Mon Mar  7 12:41:15 2005
@@ -37,6 +37,7 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 
+
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
  */
@@ -217,6 +218,10 @@
         return ejbReferenceBuilder.createEJBRemoteReference(objectName, isSession, home,
remote);
     }
 
+    public Reference getCORBARemoteRef(URI corbaURL, String objectName, String containerName,
String home) throws DeploymentException {
+        return ejbReferenceBuilder.createCORBAReference(corbaURL, objectName, containerName,
home);
+    }
+
     public Reference getEJBLocalRef(String objectName, boolean isSession, String localHome,
String local) throws DeploymentException {
         return ejbReferenceBuilder.createEJBLocalReference(objectName, isSession, localHome,
local);
     }
@@ -274,7 +279,7 @@
                 throw new DeploymentException("More than one match for query " + matches);
             }
             if (matches.size() == 1) {
-                return ((ObjectName)matches.iterator().next()).getCanonicalName();
+                return ((ObjectName) matches.iterator().next()).getCanonicalName();
             }
             try {
                 query = NameFactory.getComponentRestrictedQueryName(null, null, name, type,
j2eeContext);
@@ -391,7 +396,7 @@
             throw new DeploymentException("Duplicate resource adapter module name: " + resourceModuleName);
         }
     }
-    
+
     public GBeanData getResourceAdapterGBeanData(ObjectName resourceAdapterModuleName) throws
DeploymentException {
         GBeanData resourceModuleData = (GBeanData) resourceModuleDataMap.get(resourceAdapterModuleName);
         if (resourceModuleData != null) {

Modified: geronimo/trunk/modules/naming-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/project.xml?view=diff&r1=156445&r2=156446
==============================================================================
--- geronimo/trunk/modules/naming-builder/project.xml (original)
+++ geronimo/trunk/modules/naming-builder/project.xml Mon Mar  7 12:41:15 2005
@@ -50,6 +50,13 @@
 
         <!-- Module Dependencies -->
 
+           <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+            <url>http://jakarta.apache.org/commons/logging/</url>
+        </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-common</artifactId>

Modified: geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?view=diff&r1=156445&r2=156446
==============================================================================
--- geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
(original)
+++ geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Mon Mar  7 12:41:15 2005
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2004 The Apache Software Foundation
+ * Copyright 2004-2005 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -36,6 +36,9 @@
 import javax.transaction.UserTransaction;
 import javax.xml.namespace.QName;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -345,6 +348,15 @@
                 } else if (remoteRef != null) {
                     if (remoteRef.isSetTargetName()) {
                         ejbReference = refContext.getEJBRemoteRef(getStringValue(remoteRef.getTargetName()),
isSession, home, remote);
+                    } else if (remoteRef.isSetNsCorbaloc()) {
+                        try {
+                            ejbReference = refContext.getCORBARemoteRef(new URI(getStringValue(remoteRef.getNsCorbaloc())),
+                                                                        getStringValue(remoteRef.getName()),
+                                                                        getStringValue(remoteRef.getCssName()),
+                                                                        home);
+                        } catch (URISyntaxException e) {
+                            throw new DeploymentException("Could not construct CORBA NameServer
URI: " + remoteRef.getNsCorbaloc(), e);
+                        }
                     } else {
                         String containerId = null;
                         try {

Modified: geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd?view=diff&r1=156445&r2=156446
==============================================================================
--- geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd (original)
+++ geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd Mon Mar  7 12:41:15
2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+    Copyright 2004-2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@
             <xsd:element name="ref-name" type="xsd:string"/>
             <xsd:choice>
                 <xsd:group ref="gernaming:objectNameGroup"/>
+                <xsd:group ref="gernaming:corbaNameGroup"/>
                 <xsd:element name="ejb-link" type="xsd:string"/>
                 <xsd:element name="target-name" type="xsd:string"/>
             </xsd:choice>
@@ -197,5 +198,37 @@
             <xsd:element name="port" type="gernaming:portType" maxOccurs="unbounded"/>
         </xsd:sequence>
     </xsd:complexType>
+
+    <xsd:group name="corbaNameGroup">
+        <xsd:annotation>
+            <xsd:documentation>
+                This group contains the location of the CORBA name server, the
+                name, and the client security server used to make interop calls.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="ns-corbaloc" type="xsd:anyURI">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The corbaloc used to access the CORBA name server.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="name" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The name of the object in the name server.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="css-name" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The GBean name of the client security server used to make interop
calls.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:group>
 
 </xsd:schema>



Mime
View raw message