[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment CMPEntityBuilder.java

[ammulder]

ammulder    2005/07/25 00:29:24

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        CMPEntityBuilder.java
  Log:

  Still more trimming
  
  Revision  Changes    Path
  1.38      +4 -4      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java
  
  Index: CMPEntityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- CMPEntityBuilder.java     25 Jul 2005 04:15:59 -0000      1.37
  +++ CMPEntityBuilder.java     25 Jul 2005 04:29:24 -0000      1.38
  @@ -382,11 +382,11 @@
               for (Iterator iter = cmpFieldToMapping.entrySet().iterator(); 
iter.hasNext();) {
                   Map.Entry entry = (Map.Entry) iter.next();
                   CmpFieldMapping mapping = (CmpFieldMapping) entry.getValue();
  -                String fieldName = mapping.getCmpFieldName();
  +                String fieldName = mapping.getCmpFieldName().trim();
                   if ( false == mapping.isSetCmpFieldClass() ) {
                       throw new DeploymentException("Class must be defined for 
an automatic primary key field: ejbName=" + ejbName + " field=" + fieldName);
                   }
  -                String fieldClass = mapping.getCmpFieldClass();
  +                String fieldClass = mapping.getCmpFieldClass().trim();
                   Class fieldType;
                   try {
                       fieldType = cl.loadClass(fieldClass);
  @@ -396,7 +396,7 @@
                   boolean isPKField = pkFieldNames.contains(fieldName);
                   CMPField cmpField = new CMPField(fieldName, fieldName, 
fieldType, isPKField);
                   ejb.addVirtualCMPField(cmpField);
  -                table.addColumn(new Column(fieldName, 
mapping.getTableColumn(), fieldType, isPKField));
  +                table.addColumn(new Column(fieldName, 
mapping.getTableColumn().trim(), fieldType, isPKField));
                   if (isPKField) {
                       pkFieldNames.remove(fieldName);
                   }