geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment ConnectorModuleBuilder.java
Date Tue, 29 Jun 2004 21:46:32 GMT
djencks     2004/06/29 14:46:32

  Modified:    modules/connector/src/java/org/apache/geronimo/connector/deployment
                        ConnectorModuleBuilder.java
  Log:
  This ought to restore inboundresourceadapter and messageadapter to optional.
  
  Revision  Changes    Path
  1.4       +6 -5      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConnectorModuleBuilder.java	25 Jun 2004 21:33:26 -0000	1.3
  +++ ConnectorModuleBuilder.java	29 Jun 2004 21:46:32 -0000	1.4
  @@ -337,13 +337,14 @@
               ConfigProperty[] configProperties = getConfigProperties(resourceadapter.getConfigPropertyArray(),
geronimoResourceAdapter.getResourceadapterInstance().getConfigPropertySettingArray());
               GBeanMBean resourceAdapterGBean = setUpDynamicGBean(resourceAdapterInfoFactory,
configProperties, cl);
   
  -            //get the ActivationSpec metadata as GBeanInfos
  -            Map activationSpecInfoMap = getActivationSpecInfoMap(resourceadapter.getInboundResourceadapter().getMessageadapter().getMessagelistenerArray(),
cl);
  -
               // set the resource adapter class and activationSpec info map
               try {
                   resourceAdapterGBean.setAttribute("resourceAdapterClass", cl.loadClass(resourceadapter.getResourceadapterClass().getStringValue()));
  -                resourceAdapterGBean.setAttribute("activationSpecInfoMap", activationSpecInfoMap);
  +                if (resourceadapter.isSetInboundResourceadapter() && resourceadapter.getInboundResourceadapter().isSetMessageadapter())
{
  +                    //get the ActivationSpec metadata as GBeanInfos
  +                    Map activationSpecInfoMap = getActivationSpecInfoMap(resourceadapter.getInboundResourceadapter().getMessageadapter().getMessagelistenerArray(),
cl);
  +                    resourceAdapterGBean.setAttribute("activationSpecInfoMap", activationSpecInfoMap);
  +                }
               } catch (Exception e) {
                   throw new DeploymentException("Could not set ResourceAdapterClass", e);
               }
  
  
  

Mime
View raw message