[jboss-cvs] JBossAS SVN: r68813 - branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-01-10 05:46:12 -0500 (Thu, 10 Jan 2008)
New Revision: 68813

Modified:
   branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
   branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java
Log:
[JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail

Modified: branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java	2008-01-10 10:40:16 UTC (rev 68812)
+++ branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java	2008-01-10 10:46:12 UTC (rev 68813)
@@ -23,12 +23,6 @@
 
 //$Id: ModifyWebMetaDataDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler at jboss.com $
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.net.URL;
-
-import javax.xml.ws.WebServiceException;
-
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
@@ -67,36 +61,4 @@
          }
       }
    }
-   
-   public void destroy(Deployment dep)
-   {
-      URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url");
-      File warFile = new File(warURL.getFile());
-      if (warFile.isDirectory() == false)
-         throw new WebServiceException("Expected a war directory: " + warURL);
-
-      File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
-      if (webXML.isFile() == false)
-         throw new WebServiceException("Cannot find web.xml: " + webXML);
-
-      try
-      {
-         // On destroy remove the modified web.xml and rollback web.xml.org to web.xml
-         File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
-         webXML.delete();
-
-         // Rename the web.xml.org
-         if (orgWebXML.renameTo(webXML) == false)
-            throw new WebServiceException("Cannot rename web.xml: " + orgWebXML);
-      }
-      catch (RuntimeException rte)
-      {
-         throw rte;
-      }
-      catch (Exception e)
-      {
-         throw new WebServiceException(e);
-      }
-   }
-   
 }
\ No newline at end of file

Modified: branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java
===================================================================
--- branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java	2008-01-10 10:40:16 UTC (rev 68812)
+++ branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java	2008-01-10 10:46:12 UTC (rev 68813)
@@ -22,20 +22,19 @@
 package org.jboss.wsf.container.jboss42;
 
 
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.common.IOUtils;
-
-import javax.xml.ws.WebServiceException;
-import java.net.URL;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.FileOutputStream;
+import java.net.URL;
 
-import org.dom4j.io.SAXReader;
+import javax.xml.ws.WebServiceException;
+
+import org.dom4j.Document;
 import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
 import org.dom4j.io.XMLWriter;
-import org.dom4j.Document;
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
 
 /**
  * The rewriter for web.xml