cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/client ClientDeploymentPlanner.java Launcher.java

[dain]

dain        2003/09/07 21:22:00

  Modified:    modules/core/src/java/org/apache/geronimo/client
                        ClientDeploymentPlanner.java Launcher.java
  Log:
  Updated to reflect movement of code to Common and Kernel modules.
  
  Revision  Changes    Path
  1.4       +3 -3      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/ClientDeploymentPlanner.java
  
  Index: ClientDeploymentPlanner.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/ClientDeploymentPlanner.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClientDeploymentPlanner.java      1 Sep 2003 20:38:49 -0000       1.3
  +++ ClientDeploymentPlanner.java      8 Sep 2003 04:22:00 -0000       1.4
  @@ -57,12 +57,12 @@
   
   import java.util.Set;
   
  -import org.apache.geronimo.deployment.DeploymentException;
  +import org.apache.geronimo.kernel.deployment.DeploymentException;
   
   /**
    *
    * @jmx:mbean
  - *      extends="org.apache.geronimo.deployment.DeploymentPlanner"
  + *      extends="org.apache.geronimo.kernel.deployment.DeploymentPlanner"
    *
    * @version $Revision$ $Date$
    */
  
  
  
  1.5       +10 -12    
incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/Launcher.java
  
  Index: Launcher.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/client/Launcher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Launcher.java     5 Sep 2003 20:18:04 -0000       1.4
  +++ Launcher.java     8 Sep 2003 04:22:00 -0000       1.5
  @@ -55,12 +55,12 @@
    */
   package org.apache.geronimo.client;
   
  +import java.io.BufferedReader;
   import java.io.File;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.Reader;
  -import java.io.BufferedReader;
   import java.io.InputStreamReader;
  +import java.io.Reader;
   import java.net.JarURLConnection;
   import java.net.MalformedURLException;
   import java.net.URL;
  @@ -85,17 +85,15 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.commons.logging.impl.LogFactoryImpl;
  -import org.apache.geronimo.deployment.DeploymentException;
  +import org.apache.geronimo.core.service.InvocationResult;
   import 
org.apache.geronimo.deployment.model.geronimo.appclient.ApplicationClient;
  -import org.apache.geronimo.jmx.JMXKernel;
  -import org.apache.geronimo.jmx.JMXUtil;
  -import org.apache.geronimo.proxy.ProxyInvocation;
  +import org.apache.geronimo.kernel.deployment.DeploymentException;
  +import org.apache.geronimo.kernel.jmx.JMXKernel;
  +import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.naming.java.ComponentContextBuilder;
  -import org.apache.geronimo.xml.deployment.AppClientLoader;
  +import org.apache.geronimo.proxy.ProxyInvocation;
   import org.apache.geronimo.xml.deployment.GeronimoAppClientLoader;
   import org.apache.geronimo.xml.deployment.LoaderUtil;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.xerces.parsers.DOMParser;
   
   /**
    * Launcher for J2EE Application Clients.
  @@ -106,7 +104,7 @@
       static {
           // Add our default Commons Logger that support the trace level
           if (System.getProperty(LogFactoryImpl.LOG_PROPERTY) == null) {
  -            System.setProperty(LogFactoryImpl.LOG_PROPERTY, 
"org.apache.geronimo.common.log.log4j.Log4jLog");
  +            System.setProperty(LogFactoryImpl.LOG_PROPERTY, 
"org.apache.geronimo.kernel.log.Log4jLog");
           }
       }
   
  @@ -309,7 +307,7 @@
           try {
               ProxyInvocation invocation = new ProxyInvocation();
               ProxyInvocation.putArguments(invocation, new Object[] { appArgs 
});
  -            result = (InvocationResult) mbServer.invoke(clientName, 
"invoke", new Object[]{invocation}, new 
String[]{"org.apache.geronimo.common.Invocation"});
  +            result = (InvocationResult) mbServer.invoke(clientName, 
"invoke", new Object[]{invocation}, new 
String[]{"org.apache.geronimo.core.service.Invocation"});
           } catch (InstanceNotFoundException e) {
               IllegalStateException ex = new IllegalStateException("Unable to 
invoke app client");
               ex.initCause(e);