[jbossws-commits] JBossWS SVN: r6508 - stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-04-18 12:01:56 -0400 (Fri, 18 Apr 2008)
New Revision: 6508

Modified:
   stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
   stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
Log:
removing useless code and unused imports

Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java	2008-04-18 15:56:34 UTC (rev 6507)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java	2008-04-18 16:01:56 UTC (rev 6508)
@@ -39,7 +39,7 @@
 import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
 
 /**
- * A deployer that locates or generates cxf.xml 
+ * A deployer that locates or generates CXF configuration file 
  *
  * @author Thomas.Diesler at jboss.org
  * @since 10-May-2007
@@ -65,16 +65,12 @@
    @Override
    public void create(Deployment dep, WSFRuntime runtime)
    {
-      URL cxfURL = getCXFConfigFromClassLoader(dep);
+      URL cxfURL = getCXFConfigFromDeployment(dep);
       if (cxfURL == null)
       {
-         cxfURL = getCXFConfigFromDeployment(dep);
-         if (cxfURL == null)
-         {
-            cxfURL = generateCXFConfigFromDeployment(dep);
-         }
-         putCXFConfigToDeployment(dep, cxfURL);
+         cxfURL = generateCXFConfigFromDeployment(dep);
       }
+      putCXFConfigToDeployment(dep, cxfURL);
    }
 
    @Override
@@ -88,22 +84,6 @@
    }
    
    /**
-    * Looks for <b>cxf.xml</b> in classloader 
-    * @param dep deployment which initial classloader will be used
-    * @return <b>cxf.xml URL</b> or <b>null</b> if not found
-    */
-   private static URL getCXFConfigFromClassLoader(Deployment dep)
-   {
-      ClassLoader initCL = dep.getInitialClassLoader();
-      URL cxfURL = initCL.getResource("cxf.xml");
-      if (cxfURL != null)
-      {
-         log.info("CXF configuration found: " + cxfURL);
-      }
-      return cxfURL;
-   }
-   
-   /**
     * Looks for <b>jbossws-cxf.xml</b> in:
     * <ul>
     *   <li><b>META-INF</b> resource directory for EJB3 deployment</li>

Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java	2008-04-18 15:56:34 UTC (rev 6507)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java	2008-04-18 16:01:56 UTC (rev 6508)
@@ -23,7 +23,6 @@
 
 //$Id$
 
-import java.io.IOException;
 import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;