[jboss-svn-commits] JBL Code SVN: r29020 - in labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product: rosetta/tests/src/org/jboss/soa/esb/actions/routing/http and 13 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Aug 21 14:39:29 EDT 2009


Author: tcunning
Date: 2009-08-21 14:39:28 -0400 (Fri, 21 Aug 2009)
New Revision: 29020

Modified:
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpRouter.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/http/HttpRouterUnitTest.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer1/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer2/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise2/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise3/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise4/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_mtom/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wsaddressing/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wssecurity/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-web/src/main/webapp/attribute.jsp
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
Log:
Merge 4.4.0.GA_CP3_CR8 into SOA branch

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpRouter.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpRouter.java	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/src/org/jboss/soa/esb/actions/routing/http/HttpRouter.java	2009-08-21 18:39:28 UTC (rev 29020)
@@ -35,6 +35,7 @@
 import org.jboss.soa.esb.message.Message;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -115,7 +116,7 @@
                 } catch (MessageDeliverException e) {
                     e.printStackTrace();
                 } finally {
-                    resultStream.close();
+                    closeStream(resultStream);
                 }
             } finally {
                 method.releaseConnection();
@@ -127,6 +128,11 @@
         return message;
     }
     
+    void closeStream(final Closeable c) throws IOException {
+        if (c != null) {
+            c.close();
+        }
+    }
     private String[] extractMappedHeaderListConfig() throws ConfigurationException {
         final String mappedHeaders = config.getAttribute("MappedHeaderList");
         if (mappedHeaders != null) {

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/http/HttpRouterUnitTest.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/http/HttpRouterUnitTest.java	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/http/HttpRouterUnitTest.java	2009-08-21 18:39:28 UTC (rev 29020)
@@ -22,15 +22,20 @@
 
 package org.jboss.soa.esb.actions.routing.http;
 
+import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import junit.framework.JUnit4TestAdapter;
 
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -75,6 +80,25 @@
 
         assertEquals(0, headers.size());
     }
+
+    @Test
+    public void testRouter_NullResponse() throws ConfigurationException, ActionProcessingException
+    {    
+        final ConfigTree tree = new ConfigTree("ValidMappedHeaderList");
+        tree.setAttribute("endpointUrl", "http://foo.bar");
+        tree.setAttribute("method", "post");
+        tree.setAttribute("MappedHeaderList", "SOAPAction, Content-Type, Accept");
+        
+        HttpRouter router = new HttpRouter(tree);
+        try
+        {
+            router.closeStream(null);
+        } 
+        catch (final IOException e)
+        {
+            fail(e.getMessage());
+        }
+    }
     
     public static junit.framework.Test suite() {
         return new JUnit4TestAdapter(HttpRouterUnitTest.class);

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/conf/base-build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -523,7 +523,7 @@
         <echo message="JBR Version String: '${jbr-version-string}'."/>
         <condition property="is-valid-jbr-version">
             <and>
-                <contains string="${jbr-version-string}" substring="2.2.2.SP" />
+                <contains string="${jbr-version-string}" substring="ersion 2." />
                 <not>
                     <contains string="${jbr-version-string}" substring="2.2.2.SP1 " />
                 </not>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer1/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer1/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer1/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -54,6 +54,7 @@
 		<echo>Send ESB message that triggers webservice call</echo>
                 <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test.SendJMSMessage" failonerror="true">
                         <arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
                         <classpath refid="exec-classpath"/>
                 </java>
 
@@ -63,6 +64,7 @@
 	     <echo>Send ESB message that triggers webservice call</echo>
 	     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test.SendEsbMessage" failonerror="true">
 	     	<arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
 			<classpath refid="exec-classpath"/>
 	     </java>
 	  </target>  

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer2/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer2/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer2/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -56,6 +56,7 @@
              <echo>Send ESB message that triggers webservice call</echo>
              <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer2.test.SendJMSMessage" failonerror="true">
                 <arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
                         <classpath refid="exec-classpath"/>
              </java>
           </target>
@@ -66,6 +67,7 @@
 	     <echo>Send ESB message that triggers webservice call</echo>
 	     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer2.test.SendEsbMessage" failonerror="true">
 	     	<arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
 			<classpath refid="exec-classpath"/>
 	     </java>
 	  </target>  

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -58,6 +58,7 @@
 		<echo>Send JMS message that triggers webservice call</echo>
                 <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise.test.SendJMSMessage" failonerror="true">
                         <arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
                         <classpath refid="exec-classpath"/>
                 </java>
 
@@ -67,6 +68,7 @@
 	     <echo>Send ESB message that triggers webservice call</echo>
 	     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise.test.SendEsbMessage" failonerror="true">
 	     	<arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
 			<classpath refid="exec-classpath"/>
 	     </java>
 	  </target>  

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise2/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise2/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise2/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -58,6 +58,7 @@
 		<echo>Send JMS message that triggers webservice call</echo>
                 <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.test.SendJMSMessage" failonerror="true">
                         <arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
                         <classpath refid="exec-classpath"/>
                 </java>
 
@@ -67,6 +68,7 @@
 	     <echo>Send ESB message that triggers webservice call</echo>
 	     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.test.SendEsbMessage" failonerror="true">
 	     	<arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
 			<classpath refid="exec-classpath"/>
 	     </java>
 	  </target>  

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise3/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise3/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise3/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -58,6 +58,7 @@
 		<echo>Send JMS message that triggers webservice call</echo>
                 <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise3.test.SendJMSMessage" failonerror="true">
                         <arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
                         <classpath refid="exec-classpath"/>
                 </java>
 
@@ -67,6 +68,7 @@
 	     <echo>Send ESB message that triggers webservice call</echo>
 	     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise3.test.SendEsbMessage" failonerror="true">
 	     	<arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
 			<classpath refid="exec-classpath"/>
 	     </java>
 	  </target>  

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise4/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise4/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_consumer_wise4/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -58,6 +58,7 @@
 		<echo>Send JMS message that triggers webservice call</echo>
                 <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise4.test.SendJMSMessage" failonerror="true">
                         <arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
                         <classpath refid="exec-classpath"/>
                 </java>
 
@@ -67,6 +68,7 @@
 	     <echo>Send ESB message that triggers webservice call</echo>
 	     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise4.test.SendEsbMessage" failonerror="true">
 	     	<arg value="Jimbo"/>
+			<sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
 			<classpath refid="exec-classpath"/>
 	     </java>
 	  </target>  

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_mtom/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_mtom/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_mtom/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -32,6 +32,7 @@
     <target name="runtest" depends="compile" description="runs test JMS Sender">
         <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservicemtom.webservice.client.MTOMClient"
               failonerror="true">
+	    <sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
             <classpath refid="exec-classpath"/>
         </java>
     </target>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_producer/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -39,6 +39,7 @@
         <echo>Invoking a JBossWS Endpoint over JMS (via JBoss ESB).</echo>
         <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage" failonerror="true">
             <arg value="jms" />
+	    <sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
             <classpath refid="exec-classpath" />
         </java>
     </target>
@@ -48,6 +49,7 @@
         <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage" failonerror="true">
             <arg value="http" />
             <arg value="8765" />
+	    <sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
             <classpath refid="exec-classpath" />
         </java>
     </target>
@@ -57,6 +59,7 @@
         <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage" failonerror="true">
             <arg value="socket" />
             <arg value="8888" />
+	    <sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
             <classpath refid="exec-classpath" />
         </java>
     </target>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wsaddressing/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wsaddressing/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wsaddressing/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -31,6 +31,7 @@
 
     <target name="runtest" depends="compile" description="runs test JMS Sender">
         <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservicewsa.client.WSAClient" failonerror="true">
+	    <sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
             <classpath refid="exec-classpath"/>
         </java>
     </target>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wssecurity/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wssecurity/build.xml	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/samples/quickstarts/webservice_wssecurity/build.xml	2009-08-21 18:39:28 UTC (rev 29020)
@@ -35,6 +35,7 @@
     <target name="runtest" depends="compile" description="runs test JMS Sender">
         <java fork="yes" classname="org.jboss.test.ws.jaxws.samples.wssecurity.client.WSSClient"
               failonerror="true">
+	    <sysproperty key="java.endorsed.dirs" value="${org.jboss.esb.server.home}/lib/endorsed"/>
             <classpath refid="exec-classpath"/>
             <sysproperty key="org.jboss.ws.wsse.keyStore" value="src/META-INF/wsse.keystore"/>
             <sysproperty key="org.jboss.ws.wsse.trustStore" value="src/META-INF/wsse.truststore"/>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-web/src/main/webapp/attribute.jsp
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-web/src/main/webapp/attribute.jsp	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/console/management-web/src/main/webapp/attribute.jsp	2009-08-21 18:39:28 UTC (rev 29020)
@@ -147,6 +147,7 @@
 			<td align="right"><%=jmxd.getCountvalue()%></td>
 		</tr>
 	<%
+			break;
 		case StatisticsHelper.BYTES_ATTRIBUTE:
 	%>
 		<tr>

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java	2009-08-21 18:39:28 UTC (rev 29020)
@@ -40,7 +40,6 @@
 import org.rhq.plugins.jbossas.util.FileContentDelegate;
 import org.rhq.plugins.jmx.JMXComponent;
 import org.rhq.plugins.jmx.MBeanResourceComponent;
-import org.rhq.plugins.utils.FileUtils;
 
 /**
  * Component for ESB package deployment.
@@ -240,6 +239,23 @@
         return isreg ? AvailabilityType.UP : AvailabilityType.DOWN;
     }
 
+    /**
+    * Recursively deletes a series of files. Any directories found in the list of files will be recursively deleted as
+    * well.
+    *
+    * @param contents list of files to delete
+    */
+    public static void deleteDirectoryContents(File[] contents) {
+    	for (File file : contents) {
+    		if (file.isDirectory()) {
+    			deleteDirectoryContents(file.listFiles());
+    		}
+
+    		file.delete();
+    	}
+    }
+
+    
 	public void deleteResource() throws Exception {
         Configuration pluginConfiguration = super.resourceContext.getPluginConfiguration();
         String fullFileName = pluginConfiguration.getSimple("deployment").getStringValue();
@@ -254,7 +270,7 @@
         }
 
         if (file.isDirectory()) {
-            FileUtils.deleteDirectoryContents(file.listFiles());
+            deleteDirectoryContents(file.listFiles());
         }
 
         boolean result = file.delete();

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2009-08-21 17:48:17 UTC (rev 29019)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2009-08-21 18:39:28 UTC (rev 29020)
@@ -49,7 +49,7 @@
     private static final String OVERALL_BYTES_FAILED_METRIC = "bytesFailed";
     
     private static final String OVERALL_BYTES_PROCESSED = "overall processedbytes";
-    private static final String OVERALL_BYTES_FAILED = "overall bytes failed";
+    private static final String OVERALL_BYTES_FAILED = "overall failed bytes";
 
     private static final String OVERALL_MINUTE_METRIC_NAME = "overallMessageCountByMinute";
     



More information about the jboss-svn-commits mailing list