ammulder 2005/07/25 00:30:53
Modified: modules/openejb-builder/src/java/org/openejb/deployment Tag:
v2_0_G1M4 CMPEntityBuilder.java
Log:
Fix for GERONIMO-808 on the M4 branch
Revision Changes Path
No revision
No revision
1.36.4.1 +11 -11
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.36
retrieving revision 1.36.4.1
diff -u -r1.36 -r1.36.4.1
--- CMPEntityBuilder.java 8 Jul 2005 23:14:14 -0000 1.36
+++ CMPEntityBuilder.java 25 Jul 2005 04:30:53 -0000 1.36.4.1
@@ -279,7 +279,7 @@
CmpFieldMapping mappings[] =
openEjbEntity.getCmpFieldMappingArray();
for (int j = 0; j < mappings.length; j++) {
CmpFieldMapping mapping = mappings[j];
- cmpFieldToMapping.put(mapping.getCmpFieldName(), mapping);
+ cmpFieldToMapping.put(mapping.getCmpFieldName().trim(),
mapping);
}
// Handle "Unknown Primary Key Type" -- try to identify the PK
class
@@ -332,7 +332,7 @@
Set pkFieldNames;
if ( unknownPK && openEjbEntity.isSetPrimkeyField() ) {
pkFieldNames = new HashSet(1);
- pkFieldNames.add(openEjbEntity.getPrimkeyField());
+ pkFieldNames.add(openEjbEntity.getPrimkeyField().trim());
} else if ( false == entityBean.isSetPrimkeyField() ) {
// no field name specified, must be a compound pk so get the
field names from the public fields
Field[] fields = pkClass.getFields();
@@ -359,14 +359,14 @@
boolean isPKField = pkFieldNames.contains(fieldName);
CMPField cmpField = new CMPField(fieldName, fieldName,
fieldType, isPKField);
ejb.addCMPField(cmpField);
- Column column = new Column(fieldName,
mapping.getTableColumn(), fieldType, isPKField);
+ Column column = new Column(fieldName,
mapping.getTableColumn().trim(), fieldType, isPKField);
if (mapping.isSetSqlType()) {
-
column.setSQLType(SQLTypeLoader.getSQLType(mapping.getSqlType()));
+
column.setSQLType(SQLTypeLoader.getSQLType(mapping.getSqlType().trim()));
}
if (mapping.isSetTypeConverter()) {
TypeConverter typeConverter;
try {
- Class typeConverterClass =
cl.loadClass(mapping.getTypeConverter());
+ Class typeConverterClass =
cl.loadClass(mapping.getTypeConverter().trim());
typeConverter = (TypeConverter)
typeConverterClass.newInstance();
} catch (Exception e) {
throw new DeploymentException("Cannot create type
converter " + mapping.getTypeConverter(), e);
@@ -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);
}
@@ -863,13 +863,13 @@
if (value == null) {
return null;
}
- return value.getStringValue();
+ return value.getStringValue().trim();
}
private String getString(EjbNameType value) {
if (value == null) {
return null;
}
- return value.getStringValue();
+ return value.getStringValue().trim();
}
}
