[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejb/deploymentjBossFileManager.java

[jBoss CVS Development]

  User: salborini
  Date: 00/08/11 17:40:46

  Modified:    src/main/org/jboss/ejb/deployment jBossFileManager.java
  Log:
  Modifications to use the new metadata package
  
  Revision  Changes    Path
  1.10      +1 -31     jboss/src/main/org/jboss/ejb/deployment/jBossFileManager.java
  
  Index: jBossFileManager.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/deployment/jBossFileManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jBossFileManager.java     2000/07/28 14:00:47     1.9
  +++ jBossFileManager.java     2000/08/12 00:40:45     1.10
  @@ -25,17 +25,13 @@
   import com.dreambean.ejx.FileManager;
   import com.dreambean.ejx.FileManagerFactory;
   
  -import org.jboss.metadata.*;
  -import org.jboss.metadata.aggregate.*;
  -import org.jboss.metadata.ejbjar.EJBXMLReader;
  -
   /**
    *   <description>
    *
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.9 $
  + *   @version $Revision: 1.10 $
    */
   public class jBossFileManager
      extends BeanContextServicesSupport
  @@ -54,8 +50,6 @@
   
      ClassLoader cl;
   
  -   ServerMetaData metaData;
  -
      // Static --------------------------------------------------------
   
      // Constructors --------------------------------------------------
  @@ -70,10 +64,6 @@
         return ejbJar;
      }
   
  -    public ServerMetaData getMetaData() {
  -        return metaData;
  -    }
  -
        /*
        * load(URL file)
        *
  @@ -112,12 +102,6 @@
            in.close();
            ejbJar.importXml(doc.getDocumentElement());
   
  -         in = new BufferedReader(new InputStreamReader(file.openStream()));
  -         EJBXMLReader xml = new EJBXMLReader();
  -         ServerMetaData ejbContainer = xml.readXML(in);
  -         in.close();
  -         metaData = new AggregateServer(new ServerMetaData[]{ejbContainer});
  -
            // Load jBoss XML
            try
            {
  @@ -161,13 +145,6 @@
            ejbJar.importXml(doc.getDocumentElement());
   
   
  -         ejbXml = getClassLoader().getResourceAsStream("META-INF/ejb-jar.xml");
  -         in = new BufferedReader(new InputStreamReader(ejbXml));
  -         EJBXMLReader xml = new EJBXMLReader();
  -         ServerMetaData ejbContainer = xml.readXML(in);
  -         in.close();
  -         metaData = new AggregateServer(new ServerMetaData[]{ejbContainer});
  -
   
            // Load jBoss XML
            InputStream jbossXml = 
getClassLoader().getResourceAsStream("META-INF/jboss.xml");
  @@ -201,13 +178,6 @@
            doc = xm.load(in);
            ejbXml.close();
            ejbJar.importXml(doc.getDocumentElement());
  -
  -         ejbXml = getClassLoader().getResourceAsStream("META-INF/ejb-jar.xml");
  -         in = new BufferedReader(new InputStreamReader(ejbXml));
  -         EJBXMLReader xml = new EJBXMLReader();
  -         ServerMetaData ejbContainer = xml.readXML(in);
  -         in.close();
  -         metaData = new AggregateServer(new ServerMetaData[]{ejbContainer});
   
            // Load jBoss XML
            InputStream jbossXml = 
getClassLoader().getResourceAsStream("META-INF/jboss.xml");