geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r156568 - 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/
Date Tue, 08 Mar 2005 21:18:01 GMT
Author: adc
Date: Tue Mar  8 13:17:58 2005
New Revision: 156568

URL: http://svn.apache.org/viewcvs?view=rev&rev=156568
Log:
Changed type of container name from String to ObjectName.

Modified:
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    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/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/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/naming/deployment/ENCConfigBuilder.java

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?view=diff&r1=156567&r2=156568
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Tue Mar  8 13:17:58 2005
@@ -109,7 +109,7 @@
             return null;
         }
 
-        public Reference createCORBAReference(URI corbaURL, String objectName, String containerName,
String home) throws DeploymentException {
+        public Reference createCORBAReference(URI corbaURL, String objectName, ObjectName
containerName, String home) throws DeploymentException {
             return null;
         }
 

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=156567&r2=156568
==============================================================================
--- 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
Tue Mar  8 13:17:58 2005
@@ -17,10 +17,12 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import java.net.URI;
+import javax.management.ObjectName;
 import javax.naming.Reference;
 
 import org.apache.geronimo.common.DeploymentException;
 
+
 /**
  * @version $Rev$ $Date$
  */
@@ -30,7 +32,7 @@
 
     Reference createEJBRemoteReference(String objectName, boolean isSession, String home,
String remote) throws DeploymentException;
 
-    Reference createCORBAReference(URI corbaURL, String objectName, String containerName,
String home) throws DeploymentException;
+    Reference createCORBAReference(URI corbaURL, String objectName, ObjectName 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=156567&r2=156568
==============================================================================
--- 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
Tue Mar  8 13:17:58 2005
@@ -218,7 +218,7 @@
         return ejbReferenceBuilder.createEJBRemoteReference(objectName, isSession, home,
remote);
     }
 
-    public Reference getCORBARemoteRef(URI corbaURL, String objectName, String containerName,
String home) throws DeploymentException {
+    public Reference getCORBARemoteRef(URI corbaURL, String objectName, ObjectName containerName,
String home) throws DeploymentException {
         return ejbReferenceBuilder.createCORBAReference(corbaURL, objectName, containerName,
home);
     }
 

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=diff&r1=156567&r2=156568
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
(original)
+++ geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
Tue Mar  8 13:17:58 2005
@@ -173,8 +173,8 @@
                 return new FakeReference(objectName);
             }
 
-            public Reference createCORBAReference(URI corbaURL, String objectName, String
containerName, String home) throws DeploymentException {
-                return new FakeReference(containerName);
+            public Reference createCORBAReference(URI corbaURL, String objectName, ObjectName
containerName, String home) throws DeploymentException {
+                return new FakeReference(objectName);
             }
 
             public Object createHandleDelegateReference() {

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=diff&r1=156567&r2=156568
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
(original)
+++ geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
Tue Mar  8 13:17:58 2005
@@ -17,15 +17,17 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import java.io.File;
-import java.net.URL;
 import java.net.URI;
+import java.net.URL;
 import java.util.jar.JarFile;
-
+import javax.management.ObjectName;
 import javax.naming.Reference;
 
 import junit.framework.Assert;
+
 import org.apache.geronimo.common.DeploymentException;
 
+
 /**
  * @version $Rev$ $Date$
  */
@@ -77,7 +79,7 @@
         return null;
     }
 
-    public Reference createCORBAReference(URI corbaURL, String objectName, String containerName,
String home) throws DeploymentException {
+    public Reference createCORBAReference(URI corbaURL, String objectName, ObjectName containerName,
String home) throws DeploymentException {
         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=diff&r1=156567&r2=156568
==============================================================================
--- 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
Tue Mar  8 13:17:58 2005
@@ -159,7 +159,7 @@
                         return null;
                     }
 
-                    public Reference createCORBAReference(URI corbaURL, String objectName,
String containerName, String home) throws DeploymentException {
+                    public Reference createCORBAReference(URI corbaURL, String objectName,
ObjectName containerName, String home) throws DeploymentException {
                         return null;
                     }
 

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=156567&r2=156568
==============================================================================
--- 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
Tue Mar  8 13:17:58 2005
@@ -352,10 +352,12 @@
                         try {
                             ejbReference = refContext.getCORBARemoteRef(new URI(getStringValue(remoteRef.getNsCorbaloc())),
                                                                         getStringValue(remoteRef.getName()),
-                                                                        getStringValue(remoteRef.getCssName()),
+                                                                        ObjectName.getInstance(getStringValue(remoteRef.getCssName())),
                                                                         home);
                         } catch (URISyntaxException e) {
                             throw new DeploymentException("Could not construct CORBA NameServer
URI: " + remoteRef.getNsCorbaloc(), e);
+                        } catch (MalformedObjectNameException e) {
+                            throw new DeploymentException("Could not construct CSS container
name: " + remoteRef.getCssName(), e);
                         }
                     } else {
                         String containerId = null;



Mime
View raw message