User: kimptoc
Date: 01/09/01 12:50:31
Modified: src/main/org/jboss/ejb/plugins/jaws/metadata
CMPFieldMetaData.java JawsEntityMetaData.java
MappingMetaData.java TypeMappingMetaData.java
Log:
remove deprecated logging import, where possible, otherwise comment as needing
replacement with log4j.... must find out how it is use.... would be good if the
deprecation message pointed to an example to use...
Revision Changes Path
1.10 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/CMPFieldMetaData.java
Index: CMPFieldMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/CMPFieldMetaData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CMPFieldMetaData.java 2001/08/03 17:15:49 1.9
+++ CMPFieldMetaData.java 2001/09/01 19:50:31 1.10
@@ -22,8 +22,8 @@
import java.util.*;
+//TODO replace logging with log4j stuff
import org.jboss.logging.Log;
-import org.jboss.logging.Logger;
/**
* This class holds all the information jaws needs to know about a CMP field.
@@ -34,7 +34,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Harcq</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*
* Revison:
* 20010621 danch: merged patch from David Jenks - null constraint on columns.
1.15 +1 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java
Index: JawsEntityMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JawsEntityMetaData.java 2001/08/03 17:15:49 1.14
+++ JawsEntityMetaData.java 2001/09/01 19:50:31 1.15
@@ -27,8 +27,6 @@
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlLoadable;
-// TODO
-import org.jboss.logging.Logger;
/**
* <description>
@@ -38,7 +36,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vinay Menon</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*
* Revisions:
* 20010621 Bill Burke: made read-ahead defaultable in standardjboss.xml and
jaws.xml
1.4 +59 -57
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/MappingMetaData.java
Index: MappingMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/MappingMetaData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MappingMetaData.java 2001/08/03 17:15:49 1.3
+++ MappingMetaData.java 2001/09/01 19:50:31 1.4
@@ -10,76 +10,78 @@
import org.w3c.dom.Element;
+// TODO this needs to be replaced with the log4j logging
import org.jboss.logging.Logger;
+
import org.jboss.ejb.DeploymentException;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlLoadable;
/**
- * <description>
- *
- * @see <related>
- * @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.3 $
+ * <description>
+ *
+ * @see <related>
+ * @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
+ * @version $Revision: 1.4 $
*/
public class MappingMetaData extends MetaData implements XmlLoadable {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
private String javaType;
-
- private int jdbcType;
-
- private String sqlType;
-
-
- // Static --------------------------------------------------------
-
- public static int getJdbcTypeFromName(String name) throws DeploymentException
{
- if (name == null) {
- throw new DeploymentException("jdbc-type cannot be null");
- }
-
- try {
- Integer constant =
(Integer)Types.class.getField(name).get(null);
- return constant.intValue();
-
- } catch (Exception e) {
- Logger.warning("Unrecognized jdbc-type: " + name + ", using
Types.OTHER");
- return Types.OTHER;
- }
- }
-
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- public String getJavaType() { return javaType; }
-
- public int getJdbcType() { return jdbcType; }
-
- public String getSqlType() { return sqlType; }
-
-
- // XmlLoadable implementation ------------------------------------
-
+
+ private int jdbcType;
+
+ private String sqlType;
+
+
+ // Static --------------------------------------------------------
+
+ public static int getJdbcTypeFromName(String name) throws DeploymentException {
+ if (name == null) {
+ throw new DeploymentException("jdbc-type cannot be null");
+ }
+
+ try {
+ Integer constant = (Integer)Types.class.getField(name).get(null);
+ return constant.intValue();
+
+ } catch (Exception e) {
+ Logger.warning("Unrecognized jdbc-type: " + name + ", using
Types.OTHER");
+ return Types.OTHER;
+ }
+ }
+
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public String getJavaType() { return javaType; }
+
+ public int getJdbcType() { return jdbcType; }
+
+ public String getSqlType() { return sqlType; }
+
+
+ // XmlLoadable implementation ------------------------------------
+
public void importXml(Element element) throws DeploymentException {
-
- javaType = getElementContent(getUniqueChild(element, "java-type"));
-
- jdbcType =
getJdbcTypeFromName(getElementContent(getUniqueChild(element, "jdbc-type")));
-
- sqlType = getElementContent(getUniqueChild(element, "sql-type"));
- }
-
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
+ javaType = getElementContent(getUniqueChild(element, "java-type"));
+
+ jdbcType = getJdbcTypeFromName(getElementContent(getUniqueChild(element,
"jdbc-type")));
+
+ sqlType = getElementContent(getUniqueChild(element, "sql-type"));
+ }
- // Private -------------------------------------------------------
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
+ // Inner classes -------------------------------------------------
}
1.4 +96 -97
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/TypeMappingMetaData.java
Index: TypeMappingMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/TypeMappingMetaData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeMappingMetaData.java 2001/08/03 17:15:49 1.3
+++ TypeMappingMetaData.java 2001/09/01 19:50:31 1.4
@@ -15,7 +15,6 @@
import org.w3c.dom.Element;
-import org.jboss.logging.Logger;
import org.jboss.ejb.DeploymentException;
import org.jboss.metadata.MetaData;
@@ -24,105 +23,105 @@
/**
- * <description>
- *
- * @see <related>
- * @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.3 $
+ * <description>
+ *
+ * @see <related>
+ * @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
+ * @version $Revision: 1.4 $
*/
public class TypeMappingMetaData extends MetaData implements XmlLoadable {
- // Constants -----------------------------------------------------
-
- public static final String[] PRIMITIVES =
{"boolean","byte","char","short","int","long","float","double"};
-
- public static final String[] PRIMITIVE_CLASSES =
{"java.lang.Boolean","java.lang.Byte","java.lang.Character","java.lang.Short","java.lang.Integer","java.lang.Long","java.lang.Float","java.lang.Double"};
-
-
- // Attributes ----------------------------------------------------
-
- private String name;
-
- private Hashtable mappings = new Hashtable();
-
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- public String getName() { return name; }
-
- public String getSqlTypeForJavaType(Class type) {
- String javaType = type.getName();
-
- // Check primitive first
- for (int i = 0; i < PRIMITIVES.length; i++) {
- if (javaType.equals(PRIMITIVES[i])) {
- // Translate into class
- javaType = PRIMITIVE_CLASSES[i];
- break;
- }
- }
-
- // Check other types
- MappingMetaData mapping = (MappingMetaData)mappings.get(javaType);
-
- // if not found, return mapping for java.lang.object
- if (mapping == null) mapping =
(MappingMetaData)mappings.get("java.lang.Object");
-
- return mapping.getSqlType();
- }
-
-
-
- public int getJdbcTypeForJavaType(Class type) {
- String javaType = type.getName();
-
- // Check primitive first
- for (int i = 0; i < PRIMITIVES.length; i++) {
- if (javaType.equals(PRIMITIVES[i])) {
- // Translate into class
- javaType = PRIMITIVE_CLASSES[i];
- break;
- }
- }
-
- // Check other types
- MappingMetaData mapping = (MappingMetaData)mappings.get(javaType);
-
- // if not found, return mapping for java.lang.object
- if (mapping == null) mapping =
(MappingMetaData)mappings.get("java.lang.Object");
-
- return mapping.getJdbcType();
- }
-
-
-
- // XmlLoadable implementation ------------------------------------
-
- public void importXml(Element element) throws DeploymentException {
-
- // get the name of this type-mapping
- name = getElementContent(getUniqueChild(element, "name"));
-
- // get the mappings
- Iterator iterator = getChildrenByTagName(element, "mapping");
-
- while (iterator.hasNext()) {
- Element mappingElement = (Element)iterator.next();
- MappingMetaData mapping = new MappingMetaData();
- mapping.importXml(mappingElement);
-
- mappings.put(mapping.getJavaType(), mapping);
- }
- }
-
- // Package protected ---------------------------------------------
+ // Constants -----------------------------------------------------
- // Protected -----------------------------------------------------
+ public static final String[] PRIMITIVES =
{"boolean","byte","char","short","int","long","float","double"};
- // Private -------------------------------------------------------
+ public static final String[] PRIMITIVE_CLASSES =
{"java.lang.Boolean","java.lang.Byte","java.lang.Character","java.lang.Short","java.lang.Integer","java.lang.Long","java.lang.Float","java.lang.Double"};
- // Inner classes -------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private String name;
+
+ private Hashtable mappings = new Hashtable();
+
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public String getName() { return name; }
+
+ public String getSqlTypeForJavaType(Class type) {
+ String javaType = type.getName();
+
+ // Check primitive first
+ for (int i = 0; i < PRIMITIVES.length; i++) {
+ if (javaType.equals(PRIMITIVES[i])) {
+ // Translate into class
+ javaType = PRIMITIVE_CLASSES[i];
+ break;
+ }
+ }
+
+ // Check other types
+ MappingMetaData mapping = (MappingMetaData)mappings.get(javaType);
+
+ // if not found, return mapping for java.lang.object
+ if (mapping == null) mapping =
(MappingMetaData)mappings.get("java.lang.Object");
+
+ return mapping.getSqlType();
+ }
+
+
+
+ public int getJdbcTypeForJavaType(Class type) {
+ String javaType = type.getName();
+
+ // Check primitive first
+ for (int i = 0; i < PRIMITIVES.length; i++) {
+ if (javaType.equals(PRIMITIVES[i])) {
+ // Translate into class
+ javaType = PRIMITIVE_CLASSES[i];
+ break;
+ }
+ }
+
+ // Check other types
+ MappingMetaData mapping = (MappingMetaData)mappings.get(javaType);
+
+ // if not found, return mapping for java.lang.object
+ if (mapping == null) mapping =
(MappingMetaData)mappings.get("java.lang.Object");
+
+ return mapping.getJdbcType();
+ }
+
+
+
+ // XmlLoadable implementation ------------------------------------
+
+ public void importXml(Element element) throws DeploymentException {
+
+ // get the name of this type-mapping
+ name = getElementContent(getUniqueChild(element, "name"));
+
+ // get the mappings
+ Iterator iterator = getChildrenByTagName(element, "mapping");
+
+ while (iterator.hasNext()) {
+ Element mappingElement = (Element)iterator.next();
+ MappingMetaData mapping = new MappingMetaData();
+ mapping.importXml(mappingElement);
+
+ mappings.put(mapping.getJavaType(), mapping);
+ }
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
