Index: src/main/distro/build-deploy.xml
===================================================================
--- src/main/distro/build-deploy.xml	(revision 11053)
+++ src/main/distro/build-deploy.xml	(working copy)
@@ -41,6 +41,7 @@
       <fileset dir="${deploy.structure}"/>
     </copy>
     <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+    <macro-add-cxf-log-category  targetdir="${jboss500.server}/conf"/>
   </target>
 
   <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
@@ -63,6 +64,7 @@
       <fileset dir="${deploy.structure}"/>
     </copy>
     <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+    <macro-add-cxf-log-category  targetdir="${jboss501.server}/conf"/>
   </target>
 
   <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
@@ -100,6 +102,7 @@
       <fileset dir="${deploy.structure}"/>
     </copy>
     <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/>
+    <macro-add-cxf-log-category  targetdir="${jboss510.server}/conf"/>
   </target>
 
   <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510">
@@ -137,6 +140,7 @@
       <fileset dir="${deploy.structure}"/>
     </copy>
     <chmod dir="${jboss520.home}/bin" perm="+x" includes="*.sh"/>
+    <macro-add-cxf-log-category  targetdir="${jboss520.server}/conf"/>
   </target>
 
   <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520">
@@ -174,6 +178,7 @@
       <fileset dir="${deploy.structure}"/>
     </copy>
     <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
+    <macro-add-cxf-log-category  targetdir="${jboss600.server}/conf"/>
   </target>
 
   <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
Index: modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	(revision 11053)
+++ modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	(working copy)
@@ -664,7 +664,9 @@
 
       <!-- delete juddi-service.sar -->
       <delete dir="@{targetdir}/../juddi-service.sar"/>
-
+      
+      <!-- delete the spring category limit in jboss-log4j.xml-->
+      <macro-remove-cxf-log-category targetdir="${jboss.server.home}/conf"/>
     </sequential>
   </macrodef>
 
@@ -701,6 +703,8 @@
       <!-- delete juddi-service.sar -->
       <delete dir="@{targetdir}/../juddi-service.sar"/>
 
+      <!-- delete the spring category limit in jboss-log4j.xml-->
+      <macro-remove-cxf-log-category targetdir="${jboss.server.home}/conf"/>
     </sequential>
   </macrodef>
 
@@ -742,6 +746,8 @@
       <!-- delete juddi-service.sar -->
       <delete dir="@{targetdir}/../juddi-service.sar"/>
 
+      <!-- delete the spring category limit in jboss-log4j.xml-->
+      <macro-remove-cxf-log-category targetdir="${jboss.server.home}/conf"/>
     </sequential>
   </macrodef>
 
@@ -782,8 +788,55 @@
 
       <!-- delete juddi-service.sar -->
       <delete dir="@{targetdir}/../juddi-service.sar"/>
+      
+      <!-- delete the spring category limit in jboss-log4j.xml-->
+      <macro-remove-cxf-log-category targetdir="${jboss.server.home}/conf"/>
+    </sequential>
+  </macrodef>
 
+
+  <!-- ================================================================== -->
+  <!-- Add cxf log category limitation                                    -->
+  <!-- ================================================================== -->
+
+  <macrodef name="macro-add-cxf-log-category">
+    <attribute name="targetdir"/>
+    <sequential>
+       <!--add the spring categroy limit in jboss-log4j.xml-->
+       <!--Do not format the CDATA replacement, there will be blankline left-->
+       <replace file="@{targetdir}/jboss-log4j.xml">
+        <replacetoken><![CDATA[<!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->]]></replacetoken>
+        <replacevalue><![CDATA[<!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+   
+   <!-- Limit the spring category to WARN-->
+   <category name="org.springframework">
+     <priority value="WARN"/>
+   </category>]]></replacevalue>
+    </replace>
     </sequential>
   </macrodef>
 
+
+  <!-- ================================================================== -->
+  <!-- Remove cxf log category limitation                                 -->
+  <!-- ================================================================== -->
+
+  <macrodef name="macro-remove-cxf-log-category">
+    <attribute name="targetdir"/>
+    <sequential>
+    <replace file="@{targetdir}/jboss-log4j.xml">
+       <replacetoken><![CDATA[
+   <!-- Limit the spring category to WARN-->
+   <category name="org.springframework">
+     <priority value="WARN"/>
+   </category>]]></replacetoken>
+    <replacevalue><![CDATA[]]></replacevalue>
+    </replace>
+    </sequential>
+  </macrodef>
+
 </project>