User: dsundstrom
Date: 02/01/31 17:39:30
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata
JDBCEntityMetaData.java
Log:
Changed type-mapping to datasource-mapping as is required by new dtd.
Revision Changes Path
1.16 +14 -12
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCEntityMetaData.java
Index: JDBCEntityMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCEntityMetaData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JDBCEntityMetaData.java 2002/01/16 21:09:06 1.15
+++ JDBCEntityMetaData.java 2002/02/01 01:39:30 1.16
@@ -29,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public final class JDBCEntityMetaData {
/**
@@ -45,7 +45,7 @@
/**
* type mapping used for this entity
*/
- private final JDBCTypeMappingMetaData typeMapping;
+ private final JDBCTypeMappingMetaData datasourceMapping;
/**
* the name of this entity
@@ -300,7 +300,7 @@
// other default values
dataSourceName = null;
- typeMapping = null;
+ datasourceMapping = null;
createTable = false;
removeTable = false;
rowLocking = false;
@@ -353,19 +353,21 @@
dataSourceName = defaultValues.getDataSourceName();
}
- // get the type mapping for this datasource (optional, but always
+ // get the datasource mapping for this datasource (optional, but always
// set in standardjbosscmp-jdbc.xml)
- String typeMappingString =
- MetaData.getOptionalChildContent(element, "type-mapping");
- if(typeMappingString != null) {
- typeMapping = jdbcApplication.getTypeMappingByName(typeMappingString);
+ String datasourceMappingString =
+ MetaData.getOptionalChildContent(element, "datasource-mapping");
+ if(datasourceMappingString != null) {
+ datasourceMapping =
+ jdbcApplication.getTypeMappingByName(datasourceMappingString);
- if(typeMapping == null) {
+ if(datasourceMapping == null) {
throw new DeploymentException("Error in jbosscmp-jdbc.xml : " +
- "type-mapping " + typeMappingString + " not found");
+ "datasource-mapping " + datasourceMappingString +
+ " not found");
}
} else {
- typeMapping = defaultValues.getTypeMapping();
+ datasourceMapping = defaultValues.getTypeMapping();
}
// get table name
@@ -651,7 +653,7 @@
* @return the jdbc type mapping for this entity
*/
public JDBCTypeMappingMetaData getTypeMapping() {
- return typeMapping;
+ return datasourceMapping;
}
/**
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
