geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment AppClientLoader.java
Date Sun, 07 Dec 2003 03:39:06 GMT
adc         2003/12/06 19:39:06

  Modified:    modules/core/src/java/org/apache/geronimo/xml/deployment
                        AppClientLoader.java
  Log:
  Clean up from Emerson Cargnin.
  
  Revision  Changes    Path
  1.5       +8 -16     incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/AppClientLoader.java
  
  Index: AppClientLoader.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/AppClientLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AppClientLoader.java	17 Sep 2003 01:47:14 -0000	1.4
  +++ AppClientLoader.java	7 Dec 2003 03:39:05 -0000	1.5
  @@ -56,13 +56,6 @@
   package org.apache.geronimo.xml.deployment;
   
   import org.apache.geronimo.deployment.model.appclient.ApplicationClient;
  -import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
  -import org.apache.geronimo.deployment.model.j2ee.EJBRef;
  -import org.apache.geronimo.deployment.model.j2ee.ServiceRef;
  -import org.apache.geronimo.deployment.model.j2ee.ResourceRef;
  -import org.apache.geronimo.deployment.model.j2ee.ResourceEnvRef;
  -import org.apache.geronimo.deployment.model.j2ee.MessageDestinationRef;
  -import org.apache.geronimo.deployment.model.j2ee.MessageDestination;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   
  @@ -72,21 +65,20 @@
    * @version $Revision$ $Date$
    */
   public class AppClientLoader {
  -    private J2EELoader j2eeLoader = new J2EELoader();
       public ApplicationClient load(Document doc) {
           Element root = doc.getDocumentElement();
           if (!"application-client".equals(root.getLocalName())) {
               throw new IllegalArgumentException("Document is not an application-client instance");
           }
           ApplicationClient appClient = new ApplicationClient();
  -        appClient.setEnvEntry(j2eeLoader.loadEnvEntries(root));
  -        appClient.setEJBRef(j2eeLoader.loadEJBRefs(root));
  -        appClient.setServiceRef(j2eeLoader.loadServiceRefs(root));
  -        appClient.setResourceRef(j2eeLoader.loadResourceRefs(root));
  -        appClient.setResourceEnvRef(j2eeLoader.loadResourceEnvRefs(root));
  -        appClient.setMessageDestinationRef(j2eeLoader.loadMessageDestinationRefs(root));
  +        appClient.setEnvEntry(J2EELoader.loadEnvEntries(root));
  +        appClient.setEJBRef(J2EELoader.loadEJBRefs(root));
  +        appClient.setServiceRef(J2EELoader.loadServiceRefs(root));
  +        appClient.setResourceRef(J2EELoader.loadResourceRefs(root));
  +        appClient.setResourceEnvRef(J2EELoader.loadResourceEnvRefs(root));
  +        appClient.setMessageDestinationRef(J2EELoader.loadMessageDestinationRefs(root));
           appClient.setCallbackHandler(LoaderUtil.getChildContent(root, "callback-handler"));
  -        appClient.setMessageDestination(j2eeLoader.loadMessageDestinations(root));
  +        appClient.setMessageDestination(J2EELoader.loadMessageDestinations(root));
           return appClient;
       }
   }
  
  
  

Mime
View raw message