geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment RAR_1_5ConfigBuilderTest.java
Date Tue, 15 Jun 2004 23:33:00 GMT
dain        2004/06/15 16:33:00

  Modified:    modules/connector/src/java/org/apache/geronimo/connector/deployment
                        ConnectorModuleBuilder.java
               modules/connector/src/test/org/apache/geronimo/connector/deployment
                        RAR_1_5ConfigBuilderTest.java
  Log:
  Builder was assuming that 1.5 connectors always had a resourceadapter class
  
  Revision  Changes    Path
  1.2       +3 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
  
  Index: ConnectorModuleBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConnectorModuleBuilder.java	15 Jun 2004 03:00:37 -0000	1.1
  +++ ConnectorModuleBuilder.java	15 Jun 2004 23:33:00 -0000	1.2
  @@ -323,9 +323,10 @@
           // Resource Adapter
           //
   
  -        String resourceAdapterName = geronimoResourceAdapter.getResourceadapterInstance().getResourceadapterName();
           ObjectName resourceAdapterObjectName = null;
           if (resourceadapter.isSetResourceadapterClass()) {
  +            String resourceAdapterName = geronimoResourceAdapter.getResourceadapterInstance().getResourceadapterName();
  +
               // Create the resource adapter gbean
               GBeanInfoFactory resourceAdapterInfoFactory = new GBeanInfoFactory(ResourceAdapterWrapper.class,
ResourceAdapterWrapper.getGBeanInfo());
               ConfigProperty[] configProperties = getConfigProperties(resourceadapter.getConfigPropertyArray(),
geronimoResourceAdapter.getResourceadapterInstance().getConfigPropertySettingArray());
  @@ -439,7 +440,6 @@
                       Properties nameProps = new Properties();
                       nameProps.put("j2eeType", "JCAAdminObject");
                       nameProps.put("name", gerAdminObjectInstance.getAdminobjectName());
  -                    nameProps.put("JCAResource", resourceAdapterName);
                       nameProps.put("J2EEServer", earContext.getJ2EEServerName());
   
                       ObjectName adminObjectObjectName = new ObjectName(earContext.getJ2EEDomainName(),
nameProps);
  
  
  
  1.11      +18 -21    incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilderTest.java
  
  Index: RAR_1_5ConfigBuilderTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilderTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- RAR_1_5ConfigBuilderTest.java	15 Jun 2004 03:00:37 -0000	1.10
  +++ RAR_1_5ConfigBuilderTest.java	15 Jun 2004 23:33:00 -0000	1.11
  @@ -17,43 +17,42 @@
   
   package org.apache.geronimo.connector.deployment;
   
  +import java.io.BufferedInputStream;
   import java.io.File;
  -import java.io.InputStream;
  -import java.io.FileOutputStream;
   import java.io.FileInputStream;
  +import java.io.FileOutputStream;
  +import java.io.InputStream;
   import java.io.ObjectInputStream;
  -import java.io.BufferedInputStream;
  +import java.net.URI;
   import java.net.URL;
   import java.net.URLClassLoader;
  -import java.net.URI;
  +import java.sql.Connection;
  +import java.sql.Statement;
   import java.util.ArrayList;
  -import java.util.List;
   import java.util.Collections;
  +import java.util.List;
   import java.util.Set;
  -import java.util.jar.JarOutputStream;
   import java.util.jar.JarFile;
  -import java.sql.Connection;
  -import java.sql.Statement;
  -
  +import java.util.jar.JarOutputStream;
   import javax.management.ObjectName;
   import javax.sql.DataSource;
   
   import junit.framework.TestCase;
  -import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
  -import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
  -import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
  -import org.apache.geronimo.j2ee.deployment.Module;
  +import org.apache.geronimo.gbean.GBeanInfo;
  +import org.apache.geronimo.gbean.jmx.GBeanMBean;
   import org.apache.geronimo.j2ee.deployment.EARContext;
  +import org.apache.geronimo.j2ee.deployment.Module;
  +import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
   import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
  -import org.apache.geronimo.system.configuration.LocalConfigStore;
  -import org.apache.geronimo.system.serverinfo.ServerInfo;
   import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.kernel.config.Configuration;
   import org.apache.geronimo.kernel.management.State;
  -import org.apache.geronimo.gbean.jmx.GBeanMBean;
  -import org.apache.geronimo.gbean.GBeanInfo;
  -import org.apache.xmlbeans.XmlOptions;
  +import org.apache.geronimo.system.configuration.LocalConfigStore;
  +import org.apache.geronimo.system.serverinfo.ServerInfo;
  +import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
  +import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
   import org.apache.xmlbeans.XmlObject;
  +import org.apache.xmlbeans.XmlOptions;
   import org.tranql.sql.jdbc.JDBCUtil;
   
   /**
  @@ -259,14 +258,12 @@
               ObjectName tweedledeeAdminObject = new ObjectName(j2eeDomainName +
                       ":j2eeType=JCAAdminObject" +
                       ",J2EEServer=" + j2eeServerName +
  -                    ",JCAResource=" + resourceAdapterName +
                       ",name=tweedledee");
               assertRunning(kernel, tweedledeeAdminObject);
   
               ObjectName tweedledumAdminObject = new ObjectName(j2eeDomainName +
                       ":j2eeType=JCAAdminObject" +
                       ",J2EEServer=" + j2eeServerName +
  -                    ",JCAResource=" + resourceAdapterName +
                       ",name=tweedledum");
               assertRunning(kernel, tweedledumAdminObject);
   
  
  
  

Mime
View raw message