User: tobyallsopp
  Date: 01/04/20 01:27:02

  Modified:    src/main/org/jboss/resource ConnectionFactoryLoader.java
                        ConnectionManagerFactoryLoader.java
  Log:
  Merged whitespace trimming from 2.2 branch.
  
  Revision  Changes    Path
  1.3       +7 -7      jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java
  
  Index: ConnectionFactoryLoader.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConnectionFactoryLoader.java      2001/03/07 07:21:09     1.2
  +++ ConnectionFactoryLoader.java      2001/04/20 08:27:02     1.3
  @@ -58,7 +58,7 @@
    *      
    *   @see RARDeployer
    *   @author Toby Allsopp ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public class ConnectionFactoryLoader
      extends ServiceMBeanSupport
  @@ -103,11 +103,11 @@
   
      public String getResourceAdapterName() { return resourceAdapterName; }
      public void setResourceAdapterName(String resourceAdapterName) {
  -      this.resourceAdapterName = resourceAdapterName;
  +      this.resourceAdapterName = resourceAdapterName.trim();
      }
   
      public String getFactoryName() { return factoryName; }
  -   public void setFactoryName(String name) { this.factoryName = name; }
  +   public void setFactoryName(String name) { this.factoryName = name.trim(); }
   
      public String getProperties() { return properties; }
      public void setProperties(String p) { this.properties = p; }
  @@ -115,14 +115,14 @@
      public String getRARDeployerName() { return rarDeployerName; }
      public void setRARDeployerName(String rarDeployerName)
      {
  -      this.rarDeployerName = rarDeployerName;
  +      this.rarDeployerName = rarDeployerName.trim();
      }
   
      public String getTransactionManagerName() { return tmName; }
  -   public void setTransactionManagerName(String n) { tmName = n; }
  +   public void setTransactionManagerName(String n) { tmName = n.trim(); }
   
      public String getConnectionManagerFactoryName() { return cmfName; }
  -   public void setConnectionManagerFactoryName(String c) { cmfName = c; }
  +   public void setConnectionManagerFactoryName(String c) { cmfName = c.trim(); }
   
      public String getConnectionManagerProperties() { return cmProps; }
      public void setConnectionManagerProperties(String p) { cmProps = p; }
  @@ -130,7 +130,7 @@
      // Pincipal mapping settings
   
      public String getPrincipalMappingClass() { return princMapClass; }
  -   public void setPrincipalMappingClass(String c) { princMapClass = c; }
  +   public void setPrincipalMappingClass(String c) { princMapClass = c.trim(); }
   
      public String getPrincipalMappingProperties() { return princMapProps; }
      public void setPrincipalMappingProperties(String p) { princMapProps = p; }
  
  
  
  1.2       +4 -4      
jbosscx/src/main/org/jboss/resource/ConnectionManagerFactoryLoader.java
  
  Index: ConnectionManagerFactoryLoader.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/ConnectionManagerFactoryLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConnectionManagerFactoryLoader.java       2001/02/06 06:54:40     1.1
  +++ ConnectionManagerFactoryLoader.java       2001/04/20 08:27:02     1.2
  @@ -36,7 +36,7 @@
    *   so that <code>ConnectionFactoryLoader</code>s can get at it.
    *
    *   @author Toby Allsopp ([EMAIL PROTECTED])
  - *   @version $Revision: 1.1 $
  + *   @version $Revision: 1.2 $
    */
   public class ConnectionManagerFactoryLoader
      extends ServiceMBeanSupport
  @@ -69,16 +69,16 @@
      // ConnectionManagerFactoryLoaderMBean implementation ------------
   
      public String getFactoryName() { return factoryName; }
  -   public void setFactoryName(String name) { this.factoryName = name; }
  +   public void setFactoryName(String name) { this.factoryName = name.trim(); }
   
      public String getProperties() { return properties; }
      public void setProperties(String p) { this.properties = p; }
   
      public String getTransactionManagerName() { return tmName; }
  -   public void setTransactionManagerName(String n) { tmName = n; }
  +   public void setTransactionManagerName(String n) { tmName = n.trim(); }
   
      public String getFactoryClass() { return factoryClass; }
  -   public void setFactoryClass(String c) { factoryClass = c; }
  +   public void setFactoryClass(String c) { factoryClass = c.trim(); }
   
      // ServiceMBeanSupport overrides ---------------------------------
   
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to