You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jl...@apache.org on 2007/06/01 05:01:44 UTC

svn commit: r543372 - in /incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest: BookServer.java RestClientServerBookTest.java

Author: jliu
Date: Thu May 31 20:01:43 2007
New Revision: 543372

URL: http://svn.apache.org/viewvc?view=rev&rev=543372
Log:
Trivial update to RestClientServerBookTest, makes it easier to debug.

Added:
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/BookServer.java   (with props)
Modified:
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java

Added: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/BookServer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/BookServer.java?view=auto&rev=543372
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/BookServer.java (added)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/BookServer.java Thu May 31 20:01:43 2007
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.rest;
+
+import org.apache.cxf.binding.http.HttpBindingFactory;
+import org.apache.cxf.customer.book.BookService;
+import org.apache.cxf.customer.book.BookServiceImpl;
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.service.invoker.BeanInvoker;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+    
+public class BookServer extends AbstractBusTestServerBase {
+
+    protected void run() {
+        BookServiceImpl serviceObj = new BookServiceImpl();
+        JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
+        sf.setServiceClass(BookService.class);
+        // Use the HTTP Binding which understands the Java Rest Annotations
+        sf.setBindingId(HttpBindingFactory.HTTP_BINDING_ID);
+        sf.setAddress("http://localhost:9080/xml/");
+        sf.getServiceFactory().setInvoker(new BeanInvoker(serviceObj));
+
+        // Turn the "wrapped" style off. This means that CXF won't generate
+        // wrapper XML elements and we'll have prettier XML text. This
+        // means that we need to stick to one request and one response
+        // parameter though.
+        sf.getServiceFactory().setWrapped(false);
+
+        sf.create();
+    }
+
+    public static void main(String[] args) {
+        try {
+            BookServer s = new BookServer();
+            s.start();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            System.exit(-1);
+        } finally {
+            System.out.println("done!");
+        }
+    }
+}

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/BookServer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/BookServer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java?view=diff&rev=543372&r1=543371&r2=543372
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java Thu May 31 20:01:43 2007
@@ -19,65 +19,25 @@
 
 package org.apache.cxf.systest.rest;
 
-
-
 import java.util.logging.Logger;
 
-
 import org.apache.cxf.binding.http.HttpBindingFactory;
 import org.apache.cxf.customer.book.Book;
 import org.apache.cxf.customer.book.BookService;
-import org.apache.cxf.customer.book.BookServiceImpl;
 import org.apache.cxf.customer.book.GetAnotherBook;
 import org.apache.cxf.customer.book.GetBook;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.apache.cxf.service.invoker.BeanInvoker;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 
 public class RestClientServerBookTest extends AbstractBusClientServerTestBase {
     static final Logger LOG = Logger.getLogger(RestClientServerBookTest.class.getName());
-    
-    public static class MyServer extends AbstractBusTestServerBase {
-
-        protected void run() {
-            BookServiceImpl serviceObj = new BookServiceImpl();
-            JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
-            sf.setServiceClass(BookService.class);
-            // Use the HTTP Binding which understands the Java Rest Annotations
-            sf.setBindingId(HttpBindingFactory.HTTP_BINDING_ID);
-            sf.setAddress("http://localhost:9080/xml/");
-            sf.getServiceFactory().setInvoker(new BeanInvoker(serviceObj));
-
-            // Turn the "wrapped" style off. This means that CXF won't generate
-            // wrapper XML elements and we'll have prettier XML text. This
-            // means that we need to stick to one request and one response
-            // parameter though.
-            sf.getServiceFactory().setWrapped(false);
-
-            sf.create();
-        }
 
-        public static void main(String[] args) {
-            try {
-                MyServer s = new MyServer();
-                s.start();
-            } catch (Exception ex) {
-                ex.printStackTrace();
-                System.exit(-1);
-            } finally {
-                LOG.info("done!");
-            }
-        }
-    }
-    
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(MyServer.class));
+        assertTrue("server did not launch correctly", launchServer(BookServer.class));
     }
 
     @Test