[JBoss-dev] CVS update: jboss/src/main/org/jboss/web AbstractWebContainer.java

[Jules G. <jul...@us...>]

  User: jules_gosnell
  Date: 02/02/02 14:20:26

  Modified:    src/main/org/jboss/web AbstractWebContainer.java
  Log:
  ear un/redeployment works now
  I'll strip out the ugly debugging when I have double checked it
  
  Revision  Changes    Path
  1.17      +6 -4      jboss/src/main/org/jboss/web/AbstractWebContainer.java
  
  Index: AbstractWebContainer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AbstractWebContainer.java	2002/02/02 20:26:25	1.16
  +++ AbstractWebContainer.java	2002/02/02 22:20:26	1.17
  @@ -118,7 +118,7 @@
   @see org.jboss.security.SecurityAssociation;
   
   @author  Sco...@jb...
  -@version $Revision: 1.16 $
  +@version $Revision: 1.17 $
   */
   public abstract class AbstractWebContainer 
   extends ServiceMBeanSupport 
  @@ -276,7 +276,7 @@
            WebDescriptorParser webAppParser = new DescriptorParser();
   	    System.out.println("[8] DEBUG performDeploy:"+di.webContext);
            WebApplication warInfo = performDeploy(di.webContext, di.localUrl.toString(), webAppParser);
  -         deploymentMap.put(di.localUrl, warInfo);
  +         deploymentMap.put(di.localUrl.toString(), warInfo);
         }
         catch(DeploymentException e)
         {
  @@ -317,14 +317,14 @@
      public void undeploy(DeploymentInfo sdi) 
      throws DeploymentException 
      {
  -      undeploy(sdi.localUrl.getFile());
  +      undeploy(sdi.localUrl.toString());
      }
      
      public synchronized void undeploy(String warUrl) throws DeploymentException
      {
         try
         {
  -	System.out.println("UNDEPLOY: "+warUrl);
  +	 System.out.println("UNDEPLOY: "+warUrl);
            performUndeploy(warUrl);
            // Remove the web application ENC...
            deploymentMap.remove(warUrl);
  @@ -347,6 +347,7 @@
      */
      public boolean isDeployed(String warUrl)
      {
  +      System.out.println("IS-DEPLOYED: "+warUrl);
         return deploymentMap.containsKey(warUrl);
      }
      
  @@ -357,6 +358,7 @@
      */
      public WebApplication getDeployedApp(String warUrl)
      {
  +      System.out.println("GET-DEPLOYED-APP: "+warUrl);
         WebApplication appInfo = (WebApplication) deploymentMap.get(warUrl);
         return appInfo;
      }