User: starksm 
  Date: 01/11/02 00:42:34

  Modified:    src/main/org/jboss/ejb/plugins/jaws/metadata Tag: Branch_2_4
                        CMPFieldMetaData.java FinderMetaData.java
                        JawsApplicationMetaData.java
                        JawsEntityMetaData.java JawsXmlFileLoader.java
                        MappingMetaData.java TypeMappingMetaData.java
  Log:
  Remove org.jboss.ejb.DeploymentException in favor of 
org.jboss.deploymen.DeploymentException
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.4.1   +3 -6      
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.6
  retrieving revision 1.6.4.1
  diff -u -r1.6 -r1.6.4.1
  --- CMPFieldMetaData.java     2001/05/03 12:36:03     1.6
  +++ CMPFieldMetaData.java     2001/11/02 08:42:34     1.6.4.1
  @@ -11,17 +11,14 @@
   import java.sql.Types;
   import java.util.ArrayList;
   import java.util.Iterator;
  -
  +import java.util.StringTokenizer;
   import org.w3c.dom.Element;
  -
  -import org.jboss.ejb.DeploymentException;
   
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.XmlLoadable;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.EjbRefMetaData;
   
  -import java.util.*;
  -
   import org.jboss.logging.Log;
   import org.jboss.logging.Logger;
   
  @@ -33,7 +30,7 @@
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Harcq</a>
  - *   @version $Revision: 1.6 $
  + *   @version $Revision: 1.6.4.1 $
    */
   public class CMPFieldMetaData extends MetaData implements XmlLoadable {
        // Constants -----------------------------------------------------
  
  
  
  1.3.4.1   +2 -3      
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/FinderMetaData.java
  
  Index: FinderMetaData.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/FinderMetaData.java,v
  retrieving revision 1.3
  retrieving revision 1.3.4.1
  diff -u -r1.3 -r1.3.4.1
  --- FinderMetaData.java       2001/05/27 00:49:16     1.3
  +++ FinderMetaData.java       2001/11/02 08:42:34     1.3.4.1
  @@ -8,8 +8,7 @@
   
   import org.w3c.dom.Element;
   
  -import org.jboss.ejb.DeploymentException;
  -
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.XmlLoadable;
   
  @@ -20,7 +19,7 @@
    *   @see <related>
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
    *   @author <a href="[EMAIL PROTECTED]">danch</a>
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.3.4.1 $
    */
   public class FinderMetaData extends MetaData implements XmlLoadable {
        // Constants -----------------------------------------------------
  
  
  
  1.5.6.3   +2 -3      
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsApplicationMetaData.java
  
  Index: JawsApplicationMetaData.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsApplicationMetaData.java,v
  retrieving revision 1.5.6.2
  retrieving revision 1.5.6.3
  diff -u -r1.5.6.2 -r1.5.6.3
  --- JawsApplicationMetaData.java      2001/07/17 02:29:54     1.5.6.2
  +++ JawsApplicationMetaData.java      2001/11/02 08:42:34     1.5.6.3
  @@ -16,8 +16,7 @@
   import org.w3c.dom.Element;
   
   import org.jboss.logging.Logger;
  -import org.jboss.ejb.DeploymentException;
  -
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.XmlLoadable;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.BeanMetaData;
  @@ -30,7 +29,7 @@
    *      
    *   @see <related>
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.5.6.2 $
  + *   @version $Revision: 1.5.6.3 $
    */
   public class JawsApplicationMetaData extends MetaData implements XmlLoadable {
        // Constants -----------------------------------------------------
  
  
  
  1.9.4.4   +2 -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.9.4.3
  retrieving revision 1.9.4.4
  diff -u -r1.9.4.3 -r1.9.4.4
  --- JawsEntityMetaData.java   2001/07/14 21:43:25     1.9.4.3
  +++ JawsEntityMetaData.java   2001/11/02 08:42:34     1.9.4.4
  @@ -20,8 +20,7 @@
   
   import org.w3c.dom.Element;
   
  -import org.jboss.ejb.DeploymentException;
  -
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.EntityMetaData;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.XmlLoadable;
  @@ -36,7 +35,7 @@
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]";>Vinay Menon</a>
  - *   @version $Revision: 1.9.4.3 $
  + *   @version $Revision: 1.9.4.4 $
    */
   public class JawsEntityMetaData extends MetaData implements XmlLoadable {
        // Constants -----------------------------------------------------
  
  
  
  1.5.6.1   +2 -4      
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsXmlFileLoader.java
  
  Index: JawsXmlFileLoader.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsXmlFileLoader.java,v
  retrieving revision 1.5
  retrieving revision 1.5.6.1
  diff -u -r1.5 -r1.5.6.1
  --- JawsXmlFileLoader.java    2001/02/21 06:20:11     1.5
  +++ JawsXmlFileLoader.java    2001/11/02 08:42:34     1.5.6.1
  @@ -14,9 +14,7 @@
   import org.w3c.dom.Element;
   
   import org.jboss.logging.Log;
  -
  -import org.jboss.ejb.DeploymentException;
  -
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.ApplicationMetaData;
   import org.jboss.metadata.XmlFileLoader;
   
  @@ -26,7 +24,7 @@
    *
    *   @see <related>
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.5 $
  + *   @version $Revision: 1.5.6.1 $
    */
   public class JawsXmlFileLoader {
   
  
  
  
  1.2.6.1   +72 -64    
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.2
  retrieving revision 1.2.6.1
  diff -u -r1.2 -r1.2.6.1
  --- MappingMetaData.java      2000/12/07 15:44:40     1.2
  +++ MappingMetaData.java      2001/11/02 08:42:34     1.2.6.1
  @@ -11,75 +11,83 @@
   import org.w3c.dom.Element;
   
   import org.jboss.logging.Logger;
  -import org.jboss.ejb.DeploymentException;
  -
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.XmlLoadable;
   
   /**
  - *   <description> 
  - *      
  + *   <description>
  + *
    *   @see <related>
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.2.6.1 $
    */
  -public class MappingMetaData extends MetaData implements XmlLoadable {
  -     // 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 ------------------------------------
  -     
  -    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 -----------------------------------------------------
  -    
  -     // Private -------------------------------------------------------
  -
  -     // Inner classes -------------------------------------------------
  +public class MappingMetaData extends MetaData implements XmlLoadable
  +{
  +   // 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 ------------------------------------
  +   
  +   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 -----------------------------------------------------
  +   
  +   // Private -------------------------------------------------------
  +   
  +   // Inner classes -------------------------------------------------
   }
  
  
  
  1.2.6.1   +2 -3      
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.2
  retrieving revision 1.2.6.1
  diff -u -r1.2 -r1.2.6.1
  --- TypeMappingMetaData.java  2000/12/07 15:44:40     1.2
  +++ TypeMappingMetaData.java  2001/11/02 08:42:34     1.2.6.1
  @@ -16,8 +16,7 @@
   import org.w3c.dom.Element;
   
   import org.jboss.logging.Logger;
  -import org.jboss.ejb.DeploymentException;
  -
  +import org.jboss.deployment.DeploymentException;
   import org.jboss.metadata.MetaData;
   import org.jboss.metadata.EjbRefMetaData;
   import org.jboss.metadata.XmlLoadable;
  @@ -28,7 +27,7 @@
    *      
    *   @see <related>
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.2.6.1 $
    */
   public class TypeMappingMetaData extends MetaData implements XmlLoadable {
        // Constants -----------------------------------------------------
  
  
  

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

Reply via email to