[openejb-scm] openejb/modules/core/src/java/org/openejb/deployment OpenEJBModuleBuilder.java

[dain]

dain        2004/06/15 17:37:39

  Modified:    modules/core/src/java/org/openejb/deployment
                        OpenEJBModuleBuilder.java
  Log:

  Updated to 77 object name 
geronimo.server:j2eeType=JCAManagedConnectionFactory,name=MyName
  
  Revision  Changes    Path
  1.8       +5 -5      
openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OpenEJBModuleBuilder.java 15 Jun 2004 03:01:00 -0000      1.7
  +++ OpenEJBModuleBuilder.java 15 Jun 2004 21:37:38 -0000      1.8
  @@ -171,10 +171,10 @@
           if (id == null) {
               id = moduleBase.getFile();
               if (id.endsWith("!/")) {
  -                id = id.substring(0, id.length()-2);
  +                id = id.substring(0, id.length() - 2);
               }
               if (id.endsWith(".jar")) {
  -                id = id.substring(0, id.length()-4);
  +                id = id.substring(0, id.length() - 4);
               }
               id = id.substring(id.lastIndexOf('/') + 1);
           }
  @@ -393,7 +393,7 @@
               ejbModuleGBean.setAttribute("deploymentDescriptor", null);
               if (connectionFactoryName != null) {
                   ObjectName connectionFactoryObjectName = 
ObjectName.getInstance(JMXReferenceFactory.BASE_MANAGED_CONNECTION_FACTORY_NAME + 
connectionFactoryName);
  -                ejbModuleGBean.setReferencePatterns("ConnectionFactory", 
Collections.singleton(connectionFactoryObjectName));
  +                ejbModuleGBean.setReferencePattern("ConnectionFactory", 
connectionFactoryObjectName);
                   ejbModuleGBean.setAttribute("Delegate", delegate);
               }
           } catch (Exception e) {
  @@ -897,7 +897,7 @@
           Set applicationManagedSecurityResources = new HashSet();
           for (int i = 0; i < resourceRefArray.length; i++) {
               ResourceRefType resourceRefType = resourceRefArray[i];
  -            String name = 
(String)openejbNames.get(resourceRefType.getResRefName().getStringValue());
  +            String name = (String) 
openejbNames.get(resourceRefType.getResRefName().getStringValue());
               if 
("Unshareable".equals(getJ2eeStringValue(resourceRefType.getResSharingScope()))) {
                   unshareableResources.add(name);
               }