cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r588283 [13/18] - in /incubator/cxf/branches/jliu: ./ api/ api/src/main/java/org/apache/cxf/databinding/ api/src/main/java/org/apache/cxf/io/ api/src/main/java/org/apache/cxf/message/ api/src/main/java/org/apache/cxf/phase/ api/src/main/jav...
Date Thu, 25 Oct 2007 17:10:56 GMT
Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java Thu Oct 25 10:09:20 2007
@@ -26,6 +26,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.BasicGreeterService;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.PingMeFault;
@@ -37,6 +38,7 @@
 import org.apache.cxf.systest.ws.util.OutMessageRecorder;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.PolicyEngine;
 import org.apache.cxf.ws.policy.selector.MinimalAlternativeSelector;
 import org.apache.cxf.ws.rm.RMUtils;
@@ -50,13 +52,15 @@
  */
 public class AddressingOptionalPolicyTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(AddressingOptionalPolicyTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(AddressingOptionalPolicyTest.class);
 
     public static class Server extends AbstractBusTestServerBase {
     
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml");
+            PolicyTestUtils.setPolicyConstants(bus, 
+                                               PolicyConstants.NAMESPACE_W3_200607);
             BusFactory.setDefaultBus(bus);
             LoggingInInterceptor in = new LoggingInInterceptor();
             bus.getInInterceptors().add(in);
@@ -95,6 +99,9 @@
     public void testUsingAddressing() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml");
+        Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml");
+        PolicyTestUtils.setPolicyConstants(bus, 
+                                           PolicyConstants.NAMESPACE_W3_200607);
         BusFactory.setDefaultBus(bus);
         InMessageRecorder in = new InMessageRecorder();
         bus.getInInterceptors().add(in);

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java Thu Oct 25 10:09:20 2007
@@ -26,6 +26,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.BasicGreeterService;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.PingMeFault;
@@ -44,7 +45,7 @@
  */
 public class AddressingPolicyTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(AddressingPolicyTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(AddressingPolicyTest.class);
 
     public static class Server extends AbstractBusTestServerBase {
     

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java Thu Oct 25 10:09:20 2007
@@ -30,6 +30,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.BasicGreeterService;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.PingMeFault;
@@ -37,6 +38,7 @@
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.PolicyException;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -54,13 +56,14 @@
  */
 public class HTTPClientPolicyTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(HTTPClientPolicyTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(HTTPClientPolicyTest.class);
 
     public static class Server extends AbstractBusTestServerBase {
    
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus();
+            
             BusFactory.setDefaultBus(bus);
             LoggingInInterceptor in = new LoggingInInterceptor();
             LoggingOutInterceptor out = new LoggingOutInterceptor();           
@@ -99,6 +102,10 @@
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("org/apache/cxf/systest/ws/policy/http.xml");
         BusFactory.setDefaultBus(bus);
+        
+        PolicyTestUtils.setPolicyConstants(bus, 
+                                           PolicyConstants.NAMESPACE_W3_200607);
+        
         LoggingInInterceptor in = new LoggingInInterceptor();
         bus.getInInterceptors().add(in);
         bus.getInFaultInterceptors().add(in);

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java Thu Oct 25 10:09:20 2007
@@ -27,6 +27,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.BasicGreeterService;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.PingMeFault;
@@ -50,7 +51,7 @@
  */
 public class HTTPServerPolicyTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(HTTPServerPolicyTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(HTTPServerPolicyTest.class);
 
     public static class Server extends AbstractBusTestServerBase {
    

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java Thu Oct 25 10:09:20 2007
@@ -24,6 +24,7 @@
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Fault;
@@ -41,7 +42,7 @@
 
 public class PolicyLoggingInterceptor extends AbstractPhaseInterceptor {
 
-    private static final Logger LOG = Logger.getLogger(PolicyLoggingInterceptor.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(PolicyLoggingInterceptor.class);
     
     private Bus bus;
     

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java Thu Oct 25 10:09:20 2007
@@ -26,6 +26,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.BasicGreeterService;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.PingMeFault;
@@ -51,7 +52,7 @@
  */
 public class RMPolicyTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(RMPolicyTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(RMPolicyTest.class);
     private static final String GREETMEONEWAY_ACTION = null;
     private static final String GREETME_ACTION = null;
     private static final String GREETME_RESPONSE_ACTION = null;

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java Thu Oct 25 10:09:20 2007
@@ -26,6 +26,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.PingMeFault;
 import org.apache.cxf.greeter_control.ReliableGreeterService;
@@ -39,6 +40,7 @@
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.ws.addressing.Names;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.rm.RMConstants;
 
 import org.junit.BeforeClass;
@@ -51,7 +53,7 @@
  */
 public class RMPolicyWsdlTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(RMPolicyWsdlTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(RMPolicyWsdlTest.class);
     private static final String GREETMEONEWAY_ACTION = null;
     private static final String GREETME_ACTION = null;
     private static final String GREETME_RESPONSE_ACTION = null;
@@ -65,6 +67,8 @@
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/rmwsdl.xml");
+            PolicyTestUtils.setPolicyConstants(bus, 
+                                               PolicyConstants.NAMESPACE_W3_200607);
             BusFactory.setDefaultBus(bus);
             LoggingInInterceptor in = new LoggingInInterceptor();
             bus.getInInterceptors().add(in);
@@ -78,7 +82,6 @@
             LOG.info("Published greeter endpoint.");
         }
         
-
         public static void main(String[] args) {
             try { 
                 Server s = new Server(); 
@@ -91,7 +94,7 @@
             }
         }
     }    
-
+    
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly", launchServer(Server.class));
@@ -101,6 +104,8 @@
     public void testUsingRM() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("org/apache/cxf/systest/ws/policy/rmwsdl.xml");
+        PolicyTestUtils.setPolicyConstants(bus, 
+                                           PolicyConstants.NAMESPACE_W3_200607);
         BusFactory.setDefaultBus(bus);
         OutMessageRecorder outRecorder = new OutMessageRecorder();
         bus.getOutInterceptors().add(outRecorder);

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml Thu Oct 25 10:09:20 2007
@@ -21,12 +21,12 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:http="http://cxf.apache.org/transports/http/configuration"
 	xmlns:wsa="http://cxf.apache.org/ws/addressing"
-	xmlns:wsp="http://www.w3.org/2006/07/ws-policy"
+	xmlns:wsp="http://www.w3.org/ns/ws-policy"
 	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 	xmlns:p="http://cxf.apache.org/policy"
 	xmlns:jaxws="http://cxf.apache.org/jaxws"
 	xsi:schemaLocation="
-http://www.w3.org/2006/07/ws-policy	http://www.w3.org/2006/07/ws-policy.xsd
+http://www.w3.org/ns/ws-policy	http://www.w3.org/2007/02/ws-policy.xsd
 http://cxf.apache.org/ws/addressing http://cxf.apache.org/schema/ws/addressing.xsd
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl Thu Oct 25 10:09:20 2007
@@ -104,7 +104,7 @@
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
             <!-- causes a PolicyException as it is incompatible with policy attached to port element -->
-            <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+            <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
                 <http-conf:server xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
                     ContentType="application/soap+xml"/>
             </wsp:Policy>
@@ -170,7 +170,7 @@
                 <!-- although incomaptible with the policy attached to the port this does not cause a 
                     policy exception as all server assertions are automatically asserted on the 
                     outbound path -->
-                <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+                <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
                     <http-conf:server xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
                         ContentType="application/soap+xml"/>
                 </wsp:Policy>
@@ -184,7 +184,7 @@
         <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
             <soap:address location="http://localhost:9020/SoapContext/GreeterPort"/>
             <!-- policy to be used for all invocations on this endpoint -->
-            <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+            <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
                 <http-conf:server xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
                     ContentType="application/detergent+xml"/>
             </wsp:Policy>

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml Thu Oct 25 10:09:20 2007
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<attachments xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
+<attachments xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <wsp:PolicyAttachment>
         <wsp:AppliesTo>
             <wsa:EndpointReference>

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml Thu Oct 25 10:09:20 2007
@@ -26,7 +26,7 @@
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
-      <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
+      <http:client DecoupledEndpoint="http://localhost:9998/decoupled_endpoint"/>
     </http:conduit>
 
     <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java Thu Oct 25 10:09:20 2007
@@ -28,6 +28,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.greeter_control.Greeter;
@@ -61,7 +62,7 @@
 
     public static final String GREETMEONEWAY_ACTION = null;
     public static final String GREETME_ACTION = null;
-    private static final Logger LOG = Logger.getLogger(ClientPersistenceTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(ClientPersistenceTest.class);
     
     private Greeter greeter;
     private OutMessageRecorder out;
@@ -107,10 +108,18 @@
     public static void startServers() throws Exception {        
         String derbyHome = System.getProperty("derby.system.home");
         try {
-            System.setProperty("derby.system.home", derbyHome + "-server");
+            if (derbyHome == null) {
+                System.setProperty("derby.system.home", "derby-server");
+            } else {
+                System.setProperty("derby.system.home", derbyHome + "-server");                
+            }
             assertTrue("server did not launch correctly", launchServer(Server.class));
         } finally {
-            System.setProperty("derby.system.home", derbyHome);
+            if (derbyHome == null) {
+                System.clearProperty("derby.system.home");
+            } else {
+                System.setProperty("derby.system.home", derbyHome);
+            }
         }
         RMTxStore.deleteDatabaseFiles();
     }

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Thu Oct 25 10:09:20 2007
@@ -27,6 +27,7 @@
 
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
@@ -37,7 +38,7 @@
             targetNamespace = "http://cxf.apache.org/greeter_control")
 public class ControlImpl  extends org.apache.cxf.greeter_control.ControlImpl {
     
-    private static final Logger LOG = Logger.getLogger(ControlImpl.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(ControlImpl.class);
 
     @Override
     public boolean startGreeter(String cfgResource) {

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java Thu Oct 25 10:09:20 2007
@@ -27,6 +27,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.systest.ws.util.ConnectionHelper;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -44,7 +45,7 @@
  */
 public class DecoupledBareTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(DecoupledBareTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(DecoupledBareTest.class);
 
     public static class Server extends AbstractBusTestServerBase {
         

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java Thu Oct 25 10:09:20 2007
@@ -26,6 +26,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.GreeterService;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
@@ -43,7 +44,7 @@
  */
 public class DecoupledClientServerTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(DecoupledClientServerTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(DecoupledClientServerTest.class);
     private Bus bus;
 
     public static class Server extends AbstractBusTestServerBase {

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java Thu Oct 25 10:09:20 2007
@@ -26,6 +26,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.interceptor.MessageSenderInterceptor;
@@ -43,7 +44,7 @@
  */
 public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
 
-    private static final Logger LOG = Logger.getLogger(MessageLossSimulator.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(MessageLossSimulator.class);
     private int appMessageCount; 
     
     public MessageLossSimulator() {

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Thu Oct 25 10:09:20 2007
@@ -33,6 +33,7 @@
 import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.greeter_control.Control;
@@ -70,7 +71,7 @@
  */
 public class SequenceTest extends AbstractBusClientServerTestBase {
 
-    private static final Logger LOG = Logger.getLogger(SequenceTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(SequenceTest.class);
     // private static final String APP_NAMESPACE ="http://celtix.objectweb.org/greeter_control";
     // private static final String GREETMEONEWAY_ACTION = APP_NAMESPACE +
     //     "/types/Greeter/greetMeOneWay";

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Thu Oct 25 10:09:20 2007
@@ -27,6 +27,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.greeter_control.Control;
@@ -56,7 +57,7 @@
 
     public static final String GREETMEONEWAY_ACTION = null;
     public static final String GREETME_ACTION = null;
-    private static final Logger LOG = Logger.getLogger(ServerPersistenceTest.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(ServerPersistenceTest.class);
     private static final String CFG = "/org/apache/cxf/systest/ws/rm/persistent.xml";
     private static final String SERVER_LOSS_CFG 
         = "/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml";

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java Thu Oct 25 10:09:20 2007
@@ -19,14 +19,15 @@
 package org.apache.cxf.systest.ws.util;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -34,7 +35,7 @@
 
 public class InMessageRecorder extends AbstractPhaseInterceptor<Message> {
 
-    private static final Logger LOG = Logger.getLogger(InMessageRecorder.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(InMessageRecorder.class);
     private List<byte[]> inbound;
 
     public InMessageRecorder() {
@@ -49,7 +50,7 @@
             return;
         }
 
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        LoadingByteArrayOutputStream bos = new LoadingByteArrayOutputStream();
         try {
             IOUtils.copy(is, bos);
             is.close();
@@ -58,7 +59,7 @@
             if (LOG.isLoggable(Level.FINE)) {
                 LOG.fine("inbound: " + bos.toString());
             }
-            ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+            ByteArrayInputStream bis = bos.createInputStream();
             message.setContent(InputStream.class, bis);
         } catch (Exception ex) {
             ex.printStackTrace();

Modified: incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java (original)
+++ incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java Thu Oct 25 10:09:20 2007
@@ -19,13 +19,13 @@
 
 package org.apache.cxf.systest.ws.util;
 
-import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.StaxOutInterceptor;
 import org.apache.cxf.io.CachedOutputStream;
@@ -43,7 +43,7 @@
  */
 public class OutMessageRecorder extends AbstractPhaseInterceptor {
     
-    private static final Logger LOG = Logger.getLogger(OutMessageRecorder.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(OutMessageRecorder.class);
     private List<byte[]> outbound;
 
     public OutMessageRecorder() {
@@ -75,15 +75,15 @@
         
         public void onClose(CachedOutputStream cos) {
             // bytes were already copied after flush
-            OutputStream os = cos.getOut();
-            if (os instanceof ByteArrayOutputStream) {
-                ByteArrayOutputStream bos = (ByteArrayOutputStream)os;
-                outbound.add(bos.toByteArray());
+            try {
+                byte bytes[] = cos.getBytes();
                 if (LOG.isLoggable(Level.FINE)) {
-                    LOG.fine("outbound: " + bos.toString());
+                    LOG.fine("outbound: " + bytes);
                 }
-            } else {
-                LOG.fine("Can't record message from output stream class: " + os.getClass().getName());
+                outbound.add(bytes);
+            } catch (Exception e) {
+                LOG.fine("Can't record message from output stream class: "
+                         + cos.getOut().getClass().getName());
             }
         }
         

Modified: incubator/cxf/branches/jliu/systests/src/test/resources/extrajaxbclass.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/resources/extrajaxbclass.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/resources/extrajaxbclass.xml (original)
+++ incubator/cxf/branches/jliu/systests/src/test/resources/extrajaxbclass.xml Thu Oct 25 10:09:20 2007
@@ -30,6 +30,7 @@
 	<!-- CXF -->
 	<import resource="classpath:META-INF/cxf/cxf.xml" />
 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+	<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
 	<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
 
 

Modified: incubator/cxf/branches/jliu/systests/src/test/resources/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/systests/src/test/resources/webapp/WEB-INF/beans.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/systests/src/test/resources/webapp/WEB-INF/beans.xml (original)
+++ incubator/cxf/branches/jliu/systests/src/test/resources/webapp/WEB-INF/beans.xml Thu Oct 25 10:09:20 2007
@@ -60,5 +60,11 @@
     </jaxws:serviceBean>
   </jaxws:server>
   
+  <jaxws:server address="/jaxwsAndJaxb"
+    serviceClass="org.apache.cxf.authservice.AuthService">
+    <jaxws:serviceBean>
+      <bean class="org.apache.cxf.authservice.AuthServiceImpl" />
+    </jaxws:serviceBean>
+   </jaxws:server>  
 </beans>
 <!-- END SNIPPET: beans -->

Modified: incubator/cxf/branches/jliu/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/pom.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/pom.xml (original)
+++ incubator/cxf/branches/jliu/testutils/pom.xml Thu Oct 25 10:09:20 2007
@@ -369,6 +369,9 @@
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/main/resources/wsdl/inherit.wsdl</wsdl>
                                 </wsdlOption>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/main/resources/wsdl/cardealer.wsdl</wsdl>
+                                </wsdlOption>
 
                             </wsdlOptions>
                         </configuration>

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthService.java Thu Oct 25 10:09:20 2007
@@ -37,7 +37,10 @@
     java.util.List<java.lang.String> getRoles(
                                               String sid
     );
+    
+    java.lang.String[] getRolesAsArray(String sid);
 
+    @WebMethod(operationName = "authenticate1")
     boolean authenticate(
                          String sid,
                          String uid,
@@ -49,4 +52,5 @@
     boolean authenticate(Authenticate auth);
     
     String getAuthentication(String sid);
+    
 }

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java Thu Oct 25 10:09:20 2007
@@ -22,10 +22,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.jws.WebService;
 
+@WebService(targetNamespace = "http://cxf.apache.org/AuthService", name = "AuthService",
+            endpointInterface = "org.apache.cxf.authservice.AuthService")
 public class AuthServiceImpl implements AuthService {
 
     public boolean authenticate(String sid, String uid, String pwd) {
+        if (uid == null) {
+            //test to make sure a "middle" param can be null
+            return pwd != null;
+        }
         return sid.equals(uid);
     }
 
@@ -40,7 +47,18 @@
     public List<String> getRoles(String sid) {
         List<String> list = new ArrayList<String>();
         list.add(sid);
+        list.add(sid + "-1");
+        list.add(sid + "-2");
         return list;
+    }
+    public String[] getRolesAsArray(String sid) {
+        if ("null".equals(sid)) {
+            return null;
+        }
+        if ("0".equals(sid)) {
+            return new String[0];
+        }
+        return new String[] {sid, sid + "-1"};
     }
 
 }

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java Thu Oct 25 10:09:20 2007
@@ -25,6 +25,7 @@
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Response;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.types.FaultDetail;
 import org.apache.cxf.greeter_control.types.GreetMeResponse;
 import org.apache.cxf.greeter_control.types.PingMeResponse;
@@ -36,7 +37,7 @@
 
 public class AbstractGreeterImpl implements Greeter {
 
-    private static final Logger LOG = Logger.getLogger(AbstractGreeterImpl.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(AbstractGreeterImpl.class);
     private long delay;
     private String lastOnewayArg;
     private boolean throwAlways;

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java Thu Oct 25 10:09:20 2007
@@ -31,6 +31,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.Configurer;
 import org.apache.cxf.greeter_control.types.FaultLocation;
 import org.apache.cxf.greeter_control.types.StartGreeterResponse;
@@ -43,7 +44,7 @@
             targetNamespace = "http://cxf.apache.org/greeter_control")
 public class ControlImpl implements Control {
     
-    private static final Logger LOG = Logger.getLogger(ControlImpl.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(ControlImpl.class);
     protected Object implementor;
     protected String address;
     protected Endpoint endpoint;

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java Thu Oct 25 10:09:20 2007
@@ -22,6 +22,7 @@
 import java.text.MessageFormat;
 import java.util.logging.Logger;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
@@ -35,7 +36,7 @@
 
     public static final MessageFormat MESSAGE_FORMAT
         = new MessageFormat("Interceptor fault in phase {0}.");
-    private static final Logger LOG = Logger.getLogger(FaultThrowingInterceptor.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(FaultThrowingInterceptor.class);
     
     public FaultThrowingInterceptor() {
         super(Phase.USER_LOGICAL);

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java Thu Oct 25 10:09:20 2007
@@ -29,8 +29,6 @@
 public class JaxbElementTestImpl implements JaxbElementTest {
 
     public String newOperation(String in) {
-        // TODO Auto-generated method stub
-
         if (in == null) {
             return "in=null";
         } else {

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java Thu Oct 25 10:09:20 2007
@@ -23,6 +23,9 @@
 
 import junit.framework.Assert;
 
+import org.apache.cxf.common.logging.LogUtils;
+
+
 public abstract class AbstractTestServerBase extends Assert {
     boolean inProcess;
     
@@ -34,8 +37,7 @@
     protected abstract void run();
 
     protected Logger getLog() {
-        String loggerName = this.getClass().getName();
-        return Logger.getLogger(loggerName);
+        return LogUtils.getLogger(this.getClass());
     }
     
     

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Thu Oct 25 10:09:20 2007
@@ -34,8 +34,9 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
-public class ServerLauncher {
+import org.apache.cxf.common.logging.LogUtils;
 
+public class ServerLauncher {
     public static final int DEFAULT_TIMEOUT = 3 * 60 * 1000;
 
     protected static final String SERVER_FAILED = 
@@ -43,7 +44,7 @@
 
     private static final boolean DEFAULT_IN_PROCESS = false;
     
-    private static final Logger LOG = Logger.getLogger(ServerLauncher.class.getName());
+    private static final Logger LOG = LogUtils.getLogger(ServerLauncher.class);
 
     boolean serverPassed;
     final String className;
@@ -186,8 +187,9 @@
                 throw ex;
             }
 
+            LOG.fine("CMD: " + cmd);
             if (debug) {
-                System.err.print("CMD: ");
+                System.err.print("CMD: " + cmd);
             }
             
             
@@ -322,10 +324,30 @@
         }
 
         cmd.add("-ea");
+        
+        cmd.add("-Djavax.xml.ws.spi.Provider=org.apache.cxf.bus.jaxws.spi.ProviderImpl");
+        String portClose = System.getProperty("org.apache.cxf.transports.http_jetty.DontClosePort");
+        if (portClose != null) {
+            cmd.add("-Dorg.apache.cxf.transports.http_jetty.DontClosePort=" + portClose);
+        }
+        String loggingPropertiesFile = System.getProperty("java.util.logging.config.file");
+        if (null != loggingPropertiesFile) {
+            cmd.add("-Djava.util.logging.config.file=" + loggingPropertiesFile);
+        } 
+        
         cmd.add("-classpath");
         
         ClassLoader loader = this.getClass().getClassLoader();
         StringBuffer classpath = new StringBuffer(System.getProperty("java.class.path"));
+        if (classpath.indexOf("/.compatibility/") != -1) {
+            classpath.append(":");
+            //on OSX, the compatibility lib brclasspath.indexOf("/.compatibility/")
+            int idx = classpath.indexOf("/.compatibility/");
+            int idx1 = classpath.lastIndexOf(":", idx);
+            int idx2 = classpath.indexOf(":", idx);
+            classpath.replace(idx1, idx2, ":");
+        }
+        
         if (loader instanceof URLClassLoader) {
             URLClassLoader urlloader = (URLClassLoader)loader; 
             for (URL url : urlloader.getURLs()) {
@@ -335,12 +357,6 @@
         }
         cmd.add(classpath.toString());
         
-        cmd.add("-Djavax.xml.ws.spi.Provider=org.apache.cxf.bus.jaxws.spi.ProviderImpl");
-        
-        String loggingPropertiesFile = System.getProperty("java.util.logging.config.file");
-        if (null != loggingPropertiesFile) {
-            cmd.add("-Djava.util.logging.config.file=" + loggingPropertiesFile);
-        } 
 
         // If the client set the transformer factory property,
         // we want the server to also set that property.

Modified: incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareImpl.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareImpl.java (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareImpl.java Thu Oct 25 10:09:20 2007
@@ -19,6 +19,8 @@
 
 package org.apache.hello_world_soap_http;
 
+import java.math.BigDecimal;
+
 import javax.jws.WebService;
 import javax.xml.ws.Holder;
 import org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType;
@@ -55,5 +57,9 @@
     
     public int getBareNoParamCount() {
         return bareNoParamCallCount;
+    }
+
+    public String nillableParameter(BigDecimal theRequest) {
+        return null;
     }
 }

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_port_type.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_port_type.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_port_type.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_port_type.wsdl Thu Oct 25 10:09:20 2007
@@ -113,19 +113,19 @@
 
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+            <wsdl:input message="x1:sayHiRequest"/>
+            <wsdl:output message="x1:sayHiResponse"/>
         </wsdl:operation>
 
         <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+            <wsdl:input message="x1:greetMeRequest"/>
+            <wsdl:output message="x1:greetMeResponse"/>
         </wsdl:operation>
 
         <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
-            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+            <wsdl:input message="x1:pingMeRequest"/>
+            <wsdl:output message="x1:pingMeResponse"/>
+            <wsdl:fault name="pingMeFault" message="x1:pingMeFault"/>
         </wsdl:operation>
     </wsdl:portType>
 

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_wsdl_import.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_wsdl_import.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_wsdl_import.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/catalog/hello_world_wsdl_import.wsdl Thu Oct 25 10:09:20 2007
@@ -32,18 +32,18 @@
 
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
-            <wsdl:input message="x1:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="x1:sayHiResponse" name="sayHiResponse"/>
+            <wsdl:input message="x1:sayHiRequest"/>
+            <wsdl:output message="x1:sayHiResponse"/>
         </wsdl:operation>
 
         <wsdl:operation name="greetMe">
-            <wsdl:input message="x1:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="x1:greetMeResponse" name="greetMeResponse"/>
+            <wsdl:input message="x1:greetMeRequest"/>
+            <wsdl:output message="x1:greetMeResponse"/>
         </wsdl:operation>
 
         <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="x1:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="x1:pingMeResponse"/>
+            <wsdl:input message="x1:pingMeRequest"/>
+            <wsdl:output message="x1:pingMeResponse"/>
             <wsdl:fault name="pingMeFault" message="x1:pingMeFault"/>
         </wsdl:operation>
     </wsdl:portType>

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl Thu Oct 25 10:09:20 2007
@@ -29,6 +29,8 @@
             <element name="in" type="tns:TradePriceData"/>
             <element name="inout" type="tns:TradePriceData"/>
             <element name="stringRespType" type="xsd:string"/>
+            <element name="inDecimal" nillable="true" type="xsd:decimal" />
+            <element name="outString" nillable="true" type="xsd:string" />
         </schema>
     </wsdl:types>
     <message name="PutLastTradedPriceInput">
@@ -48,6 +50,14 @@
     <message name="bareNoParamResponse">
         <part element="x1:stringRespType" name="theResponse"/>
     </message>
+    
+    <message name="nillableRequest">
+    	<part name="theRequest" element="x1:inDecimal" />
+    </message>
+    
+    <message name="nillableResponse">
+    	<part name="theResponse" element="x1:outString" />
+    </message>
 
     <portType name="PutLastTradedPricePortType">
 
@@ -66,6 +76,11 @@
             <output message="tns:bareNoParamResponse"/>
         </operation>
         
+        <operation name="nillableParameter">
+        	<input message="tns:nillableRequest" />
+        	<output message="tns:nillableResponse" />
+        </operation>
+        
     </portType>
     
     <binding name="PutLastTradedPriceSoapBinding" type="tns:PutLastTradedPricePortType">
@@ -96,7 +111,17 @@
             <output>
                 <soap:body use="literal"/>
             </output>
-        </operation>        
+        </operation>
+        
+        <operation name="nillableParameter">
+        	<input>
+        		<soap:body use="literal" />
+        	</input>
+        	<output>
+        		<soap:body use="literal" />
+        	</output>        
+        </operation>
+                
     </binding>
     <wsdl:service name="SOAPService">
         <wsdl:port name="SoapPort" binding="tns:PutLastTradedPriceSoapBinding">

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world.wsdl Thu Oct 25 10:09:20 2007
@@ -217,31 +217,31 @@
     </wsdl:message> 
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
-            <wsdl:input name="sayHiRequest" message="tns:sayHiRequest"/>
-            <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"/>
+            <wsdl:input message="tns:sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse"/>
         </wsdl:operation>
         <wsdl:operation name="greetMe">
-            <wsdl:input name="greetMeRequest" message="tns:greetMeRequest"/>
-            <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"/>
+            <wsdl:input message="tns:greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse"/>
         </wsdl:operation>
         <wsdl:operation name="testNillable">
-            <wsdl:input name="testNillableRequest" message="tns:testNillableRequest"/>
-            <wsdl:output name="testNillableResponse" message="tns:testNillableResponse"/>
+            <wsdl:input  message="tns:testNillableRequest"/>
+            <wsdl:output  message="tns:testNillableResponse"/>
         </wsdl:operation>
         <wsdl:operation name="greetMeLater">
-            <wsdl:input name="greetMeLaterRequest" message="tns:greetMeLaterRequest"/>
-            <wsdl:output name="greetMeLaterResponse" message="tns:greetMeLaterResponse"/>
+            <wsdl:input  message="tns:greetMeLaterRequest"/>
+            <wsdl:output  message="tns:greetMeLaterResponse"/>
         </wsdl:operation>
        <wsdl:operation name="greetMeSometime">
-            <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
-            <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
+            <wsdl:input  message="tns:greetMeSometimeRequest"/>
+            <wsdl:output  message="tns:greetMeSometimeResponse"/>
         </wsdl:operation>
         <wsdl:operation name="greetMeOneWay">
-            <wsdl:input name="greetMeOneWayRequest" message="tns:greetMeOneWayRequest"/>
+            <wsdl:input  message="tns:greetMeOneWayRequest"/>
         </wsdl:operation>
         <wsdl:operation name="testDocLitFault">
-            <wsdl:input name="testDocLitFaultRequest" message="tns:testDocLitFaultRequest"/>
-            <wsdl:output name="testDocLitFaultResponse" message="tns:testDocLitFaultResponse"/>
+            <wsdl:input  message="tns:testDocLitFaultRequest"/>
+            <wsdl:output  message="tns:testDocLitFaultResponse"/>
             <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
             <wsdl:fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
         </wsdl:operation>

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl Thu Oct 25 10:09:20 2007
@@ -103,19 +103,19 @@
     </wsdl:message>
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
-            <wsdl:input name="sayHiRequest" message="tns:sayHiRequest"/>
-            <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"/>
+            <wsdl:input message="tns:sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse"/>
         </wsdl:operation>
         <wsdl:operation name="greetMe">
-            <wsdl:input name="greetMeRequest" message="tns:greetMeRequest"/>
-            <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"/>
+            <wsdl:input message="tns:greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse"/>
         </wsdl:operation>
         <wsdl:operation name="greetMeOneWay">
-            <wsdl:input name="greetMeOneWayRequest" message="tns:greetMeOneWayRequest"/>
+            <wsdl:input message="tns:greetMeOneWayRequest"/>
         </wsdl:operation>
         <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+            <wsdl:input message="tns:pingMeRequest"/>
+            <wsdl:output message="tns:pingMeResponse"/>
             <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
         </wsdl:operation>
     </wsdl:portType>

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_schema_import.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_schema_import.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_schema_import.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_schema_import.wsdl Thu Oct 25 10:09:20 2007
@@ -55,26 +55,24 @@
     </wsdl:message>
     
     <wsdl:portType name="Greeter">
-	<wsdl:operation name="sayHi">
-	    <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-	    <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
-	</wsdl:operation>
-	
-	<wsdl:operation name="greetMe">
-	    <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-	    <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-	</wsdl:operation>
-	
-	<wsdl:operation name="greetMeOneWay">
-	    <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
-	</wsdl:operation>
-
-	<wsdl:operation name="pingMe">
-	    <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-	    <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
-	    <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
-	</wsdl:operation> 
+        <wsdl:operation name="sayHi">
+            <wsdl:input message="tns:sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="tns:greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="greetMeOneWay">
+            <wsdl:input message="tns:greetMeOneWayRequest"/>
+        </wsdl:operation>
+        <wsdl:operation name="pingMe">
+            <wsdl:input message="tns:pingMeRequest"/>
+            <wsdl:output message="tns:pingMeResponse"/>
+            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+        </wsdl:operation>
     </wsdl:portType>
+
     <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
 	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 	

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl Thu Oct 25 10:09:20 2007
@@ -77,12 +77,12 @@
 
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
-            <wsdl:input name="sayHiRequest" message="tns:sayHiRequest"/>
-            <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"/>
+            <wsdl:input message="tns:sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse"/>
         </wsdl:operation>
 	<wsdl:operation name="pingMe">
-	    <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-	    <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+	    <wsdl:input message="tns:pingMeRequest"/>
+	    <wsdl:output message="tns:pingMeResponse"/>
 	    <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
         </wsdl:operation> 
     </wsdl:portType>

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl Thu Oct 25 10:09:20 2007
@@ -32,18 +32,18 @@
 
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
-            <wsdl:input message="x1:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="x1:sayHiResponse" name="sayHiResponse"/>
+            <wsdl:input message="x1:sayHiRequest" />
+            <wsdl:output message="x1:sayHiResponse" />
         </wsdl:operation>
 
         <wsdl:operation name="greetMe">
-            <wsdl:input message="x1:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="x1:greetMeResponse" name="greetMeResponse"/>
+            <wsdl:input message="x1:greetMeRequest" />
+            <wsdl:output message="x1:greetMeResponse" />
         </wsdl:operation>
 
         <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="x1:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="x1:pingMeResponse"/>
+            <wsdl:input message="x1:pingMeRequest"/>
+            <wsdl:output message="x1:pingMeResponse"/>
             <wsdl:fault name="pingMeFault" message="x1:pingMeFault"/>
         </wsdl:operation>
     </wsdl:portType>

Modified: incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_xml_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_xml_bare.wsdl?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_xml_bare.wsdl (original)
+++ incubator/cxf/branches/jliu/testutils/src/main/resources/wsdl/hello_world_xml_bare.wsdl Thu Oct 25 10:09:20 2007
@@ -84,12 +84,12 @@
 
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+            <wsdl:input message="tns:sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse"/>
         </wsdl:operation>
         <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+            <wsdl:input message="tns:greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse"/>
         </wsdl:operation>
         <wsdl:operation name="sendReceiveData">
             <wsdl:input message="tns:sendReceiveDataRequest" name="SendReceiveDataRequest"/>

Modified: incubator/cxf/branches/jliu/tools/anttask/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/anttask/pom.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/anttask/pom.xml (original)
+++ incubator/cxf/branches/jliu/tools/anttask/pom.xml Thu Oct 25 10:09:20 2007
@@ -38,11 +38,14 @@
             <artifactId>cxf-tools-wsdlto-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+
+         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>cxf-tools-java2wsdl</artifactId>
+            <artifactId>cxf-tools-java2ws</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>       
+        
+        
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>

Modified: incubator/cxf/branches/jliu/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml (original)
+++ incubator/cxf/branches/jliu/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml Thu Oct 25 10:09:20 2007
@@ -21,6 +21,6 @@
 <antlib>
     <taskdef name="wsdl2java"
              classname="org.apache.cxf.ant.extensions.WSDL2JavaTask"/>
-    <taskdef name="java2wsdl"
-             classname="org.apache.cxf.ant.extensions.Java2WSDLTask"/>
+    <taskdef name="java2ws"
+             classname="org.apache.cxf.ant.extensions.Java2WSTask"/>             
 </antlib>

Modified: incubator/cxf/branches/jliu/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/common/pom.xml?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/common/pom.xml (original)
+++ incubator/cxf/branches/jliu/tools/common/pom.xml Thu Oct 25 10:09:20 2007
@@ -82,6 +82,18 @@
 	    <artifactId>cxf-common-utilities</artifactId>
 	    <version>${project.version}</version>
 	</dependency>
+	
+	<dependency>
+	    <groupId>org.apache.cxf</groupId>
+	    <artifactId>cxf-rt-core</artifactId>
+	    <version>${project.version}</version>
+	</dependency>	
+
+	<dependency>
+                <groupId>javax.xml.ws</groupId>
+                <artifactId>jaxws-api</artifactId>
+		<scope>test</scope>
+	</dependency>
 
     </dependencies>
 

Modified: incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java (original)
+++ incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java Thu Oct 25 10:09:20 2007
@@ -39,6 +39,9 @@
 import org.apache.cxf.tools.common.toolspec.parser.ErrorVisitor;
 import org.apache.cxf.version.Version;
 
+/**
+ * Common processing for the CXF tools. Processes common options.
+ */
 public abstract class AbstractCXFToolContainer extends AbstractToolContainer {
     protected static final Logger LOG = LogUtils.getL7dLogger(AbstractCXFToolContainer.class);
     
@@ -47,6 +50,7 @@
     private boolean verbose;
     private String usage;
     private final ErrorVisitor errors = new ErrorVisitor();
+    private String beanConfigResource;
     
     
     public AbstractCXFToolContainer(String nm, ToolSpec toolspec) throws Exception {
@@ -70,7 +74,7 @@
         if (hasInfoOption()) {
             outputInfo();
         } else {
-            if (commandDocument.hasParameter("verbose")) {
+            if (commandDocument.hasParameter(ToolConstants.CFG_VERBOSE)) {
                 verbose = true;
                 outputFullCommandLine();
                 outputVersion();               
@@ -105,7 +109,20 @@
         }
     }
 
-    public abstract void checkParams(ErrorVisitor err) throws ToolException;
+    /**
+     * Check command-line parameters for validity. Since subclasses delegate down to here,
+     * this cannot complain about unwanted options.
+     * @param err place to report errors.
+     * @throws ToolException for impossible options.
+     */
+    public void checkParams(ErrorVisitor err) throws ToolException {
+        CommandDocument doc = getCommandDocument();
+
+        if (doc.hasParameter(ToolConstants.CFG_BEAN_CONFIG)) {
+            String beanPath = doc.getParameter(ToolConstants.CFG_BEAN_CONFIG);           
+            setBeanConfigResource(beanPath);
+        }
+    }
 
     public boolean isVerboseOn() {
         if (context != null && context.isVerbose()) {
@@ -272,5 +289,19 @@
             }
         }
         return map;
+    }
+
+    /**
+     * @return Returns the beanConfigResource.
+     */
+    public String getBeanConfigResource() {
+        return beanConfigResource;
+    }
+
+    /**
+     * @param beanConfigResource The beanConfigResource to set.
+     */
+    public void setBeanConfigResource(String beanConfigResource) {
+        this.beanConfigResource = beanConfigResource;
     }
 }

Modified: incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java Thu Oct 25 10:09:20 2007
@@ -28,16 +28,28 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
+import javax.xml.namespace.QName;
 
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.tools.util.StAXUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.ComparisonFailure;
 
 public class ProcessorTestBase extends Assert {
 
+    private static final List<String> DEFAULT_IGNORE_ATTR = Arrays.asList(new String[]{"attributeFormDefault",
+                                                                                       "elementFormDefault", 
+                                                                                       "form"});
+    private static final List<String> DEFAULT_IGNORE_TAG = Arrays.asList(new String[]{"sequence"});
+
     protected ToolContext env = new ToolContext();
     protected File output;
 
@@ -49,7 +61,6 @@
         FileUtils.mkDir(output);
     }
 
-
     @After
     public void tearDown() {
         FileUtils.removeDir(output);
@@ -79,6 +90,11 @@
         return getClass().getResource(wsdlFile).toString();
     }
 
+    protected File getResource(String wsdlFile) throws URISyntaxException {
+        return new File(getClass().getResource(wsdlFile).toURI());
+    }
+
+
     protected void assertFileEquals(String f1, String f2) {
         assertFileEquals(new File(f1), new File(f2));
     }
@@ -118,7 +134,7 @@
 
         assertTrue(!st1.hasMoreTokens());
         assertTrue(!st2.hasMoreTokens());
-        assertTrue("Files did not match", unmatched.isEmpty());
+        assertTrue("Files did not match: " + unmatched, unmatched.isEmpty());
     }
 
     public String getStringFromFile(File location) {
@@ -179,5 +195,140 @@
                 + rtn.substring(headerIndexEnd + endToken.length() + 1);
         }
         return rtn;
+    }
+
+    public boolean assertXmlEquals(final File expected, final File source) throws Exception {
+        List<String> attr = Arrays.asList(new String[]{"attributeFormDefault", "elementFormDefault", "form"});
+        return assertXmlEquals(expected, source, attr);
+    }
+
+    public boolean assertXmlEquals(final File expected, final File source, 
+                                   final List<String> ignoreAttr) throws Exception {
+        List<Tag> expectedTags = StAXUtil.getTags(expected);
+        List<Tag> sourceTags = StAXUtil.getTags(source);
+
+        Iterator<Tag> iterator = sourceTags.iterator();
+
+        for (Tag expectedTag : expectedTags) {
+            Tag sourceTag = iterator.next();
+            if (!expectedTag.getName().equals(sourceTag.getName())) {
+                throw new ComparisonFailure("Tags not equal: ", 
+                                            expectedTag.getName().toString(), 
+                                            sourceTag.getName().toString());
+            }
+            for (QName attr : expectedTag.getAttributes()) {
+                if (ignoreAttr.contains(attr.getNamespaceURI())) {
+                    continue;
+                }
+
+                boolean found = false;
+                for (QName attr2 : sourceTag.getAttributes()) {
+                    if (attr2.getNamespaceURI().equals(attr.getNamespaceURI())) {
+                        if (attr2.getLocalPart().equals(attr.getLocalPart())) {
+                            found = true;
+                        } else {
+                            throw new ComparisonFailure("Attributes not equal: ", 
+                                                        attr.toString(), 
+                                                        attr2.toString());
+                        }
+                    }
+                }
+                if (!found) {
+                    throw new AssertionError("Attribute: " + attr + " is missing in the source file.");
+                }
+            }
+
+            if (!StringUtils.isEmpty(expectedTag.getText())
+                && !expectedTag.getText().equals(sourceTag.getText())) {
+                throw new ComparisonFailure("Text not equal: ", 
+                                            expectedTag.getText().toString(), 
+                                            sourceTag.getText().toString());
+            }
+        }
+        return true;
+    }
+
+    protected void assertTagEquals(Tag expected, Tag source) {
+        assertTagEquals(expected, source, DEFAULT_IGNORE_ATTR, DEFAULT_IGNORE_TAG);
+    }
+
+    protected void assertAttributesEquals(Collection<QName> q1, Collection<QName> q2, 
+                                          Collection<String> ignoreAttr) {
+        for (QName attr : q1) {
+            if (ignoreAttr.contains(attr.getNamespaceURI())) {
+                continue;
+            }
+            boolean found = false;
+
+            for (QName attr2 : q2) {
+                if (attr2.getNamespaceURI().equals(attr.getNamespaceURI())) {
+                    if (attr2.getLocalPart().equals(attr.getLocalPart())) {
+                        found = true;
+                    } else {
+                        throw new ComparisonFailure("Attribute not equal: ", 
+                                                    attr.toString(), 
+                                                    attr2.toString());
+                    }
+                }
+            }
+            if (!found) {
+                throw new AssertionError("Attribute: " + attr + " is missing.");
+            }
+        }
+    }
+
+    protected void assertTagEquals(Tag expected, Tag source, 
+                                   final List<String> ignoreAttr, 
+                                   final List<String> ignoreTag) {
+        if (!expected.getName().equals(source.getName())) {
+            throw new ComparisonFailure("Tags not equal: ", 
+                                        expected.getName().toString(), 
+                                        source.getName().toString());
+        }
+
+        assertAttributesEquals(expected.getAttributes(), source.getAttributes(), ignoreAttr);
+        assertAttributesEquals(source.getAttributes(), expected.getAttributes(), ignoreAttr);
+
+        if (!StringUtils.isEmpty(expected.getText())
+                && !expected.getText().equals(source.getText())) {
+            throw new ComparisonFailure("Text not equal: ", 
+                                        expected.getText().toString(), 
+                                        source.getText().toString());
+        }
+
+        if (!expected.getTags().isEmpty()) {
+            for (Tag expectedTag : expected.getTags()) {
+                if (ignoreTag.contains(expectedTag.getName().getLocalPart()) 
+                    && expectedTag.getTags().isEmpty()) {
+                    continue;
+                } 
+                Tag sourceTag = getFromSource(source, expectedTag);
+                if (sourceTag == null) {
+                    throw new AssertionError("\n" + expected.toString() 
+                                             + " is missing in the source file");
+                }
+                assertTagEquals(expectedTag, sourceTag, ignoreAttr, ignoreTag);
+            }
+        }
+    }
+
+    private Tag getFromSource(Tag sourceTag, Tag expectedTag) {
+        for (Tag tag : sourceTag.getTags()) {
+            if (tag.equals(expectedTag)) {
+                return tag;
+            }
+        }
+        return null;
+    }
+
+    public void assertWsdlEquals(final File expected, final File source, List<String> attr, List<String> tag) 
+        throws Exception {
+        Tag expectedTag = StAXUtil.getTagTree(expected, attr);
+        Tag sourceTag = StAXUtil.getTagTree(source, attr);
+        assertTagEquals(expectedTag, sourceTag, attr, tag);
+    }
+
+    public void assertWsdlEquals(final File expected, final File source) throws Exception {
+        assertWsdlEquals(expected, source, DEFAULT_IGNORE_ATTR, DEFAULT_IGNORE_TAG);
     }
 }

Modified: incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java (original)
+++ incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java Thu Oct 25 10:09:20 2007
@@ -24,11 +24,11 @@
 import java.io.PrintStream;
 
 import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.test.AbstractCXFTest;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 
-public abstract class ToolTestBase extends Assert {
+public abstract class ToolTestBase extends AbstractCXFTest {
 
     protected PrintStream oldStdErr; 
     protected PrintStream oldStdOut; 

Modified: incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java (original)
+++ incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java Thu Oct 25 10:09:20 2007
@@ -127,6 +127,8 @@
     public void setCommonAttributes() {
         attributes.put("currentdate", Calendar.getInstance().getTime());
         attributes.put("version", Version.getCurrentVersion());
+        attributes.put("name", Version.getName());
+        attributes.put("fullversion", Version.getCompleteVersionString());
     }
 
     public void clearAttributes() {

Modified: incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java (original)
+++ incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java Thu Oct 25 10:09:20 2007
@@ -23,7 +23,7 @@
 
 public class JavaField extends JavaType implements JavaAnnotatable {
     private String modifier;
-    private JavaAnnotation annotation;
+    private JAnnotation annotation;
 
     public JavaField() {
     }
@@ -41,11 +41,14 @@
         this.modifier = modi;
     }
 
-    public void setAnnotation(JavaAnnotation anno) {
+    public void setAnnotation(JAnnotation anno) {
         this.annotation = anno;
+        for (String importClz : annotation.getImports()) {
+            getOwner().addImport(importClz);
+        }        
     }
 
-    public JavaAnnotation getAnnotation() {
+    public JAnnotation getAnnotation() {
         return this.annotation;
     }
 

Modified: incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java?rev=588283&r1=588282&r2=588283&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java (original)
+++ incubator/cxf/branches/jliu/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java Thu Oct 25 10:09:20 2007
@@ -38,7 +38,7 @@
     private SOAPBinding.ParameterStyle soapParameterStyle;
     
     private final List<JavaMethod> methods = new ArrayList<JavaMethod>();
-    private final List<String> annotations = new ArrayList<String>();
+    private final List<JAnnotation> annotations = new ArrayList<JAnnotation>();
     private final Set<String> imports = new TreeSet<String>();
 
     private String webserviceName;
@@ -168,17 +168,30 @@
         this.namespace = ns;
     }
 
-    public void addAnnotation(String annotation) {
+    public void addAnnotation(JAnnotation annotation) {
         this.annotations.add(annotation);
+        for (String importClz : annotation.getImports()) {
+            addImport(importClz);
+        }        
     }
 
-    public List<String> getAnnotations() {
+    public List<JAnnotation> getAnnotations() {
         return this.annotations;
     }
 
     public void addImport(String i) {
+        if (i != null && i.lastIndexOf(".") != -1 && getPackageName() != null
+            && getPackageName().equals(i.substring(0, i.lastIndexOf(".")))) {
+            return;
+        }
         imports.add(i);
     }
+    
+    public void addImports(Collection<String> ii) {
+        for (String i : ii) {
+            imports.add(i);
+        }
+    }
 
     public Iterator<String> getImports() {
         return imports.iterator();
@@ -216,7 +229,7 @@
 
     public String toString() {
         StringBuffer sb = new StringBuffer();
-        for (String anno : annotations) {
+        for (JAnnotation anno : annotations) {
             sb.append(anno);
             sb.append("\n");
         }



Mime
View raw message