Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r890779 - in /cxf/branches/2.2.x-fixes: ./
 rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
Date: Tue, 15 Dec 2009 12:47:31 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20091215124731.517FD23889DA@eris.apache.org>

Author: dkulp
Date: Tue Dec 15 12:47:30 2009
New Revision: 890779

URL: http://svn.apache.org/viewvc?rev=890779&view=rev
Log:
Merged revisions 890633,890756 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r890633 | dkulp | 2009-12-14 23:01:25 -0500 (Mon, 14 Dec 2009) | 1 line
  
  [CXF-1758] Add test case in simple frontend as well
........
  r890756 | bharath | 2009-12-15 06:11:37 -0500 (Tue, 15 Dec 2009) | 1 line
  
  Fixed a checkstyle error due to unused import.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 15 12:47:30 2009
@@ -1 +1 @@
-/cxf/trunk:890614
+/cxf/trunk:890614,890633-890756

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java?rev=890779&r1=890778&r2=890779&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java Tue Dec 15 12:47:30 2009
@@ -55,8 +55,32 @@
         assertTrue(server.getDestination() instanceof CustomDestination);
     }
     
-        
-    @SuppressWarnings("unchecked")
+    public static interface TestService<P> {
+        int open(P args);
+        void close(int handle);
+    }
+
+    public static class TestServiceImpl<P> implements TestService<P> {
+        public void close(int handle) {
+        }
+
+        public int open(P args) { 
+            return 0;
+        }
+    }
+    
+    @Test
+    public void testCXF1758() throws Exception {
+        ServerFactoryBean svrBean = new ServerFactoryBean();
+        svrBean.setAddress("http://localhost/Generics");
+        svrBean.setServiceBean(new TestServiceImpl<String>() { });
+        svrBean.setBus(getBus());
+        ServerImpl server = (ServerImpl)svrBean.create();
+        //XMLUtils.printDOM(getWSDLDocument(server));
+        assertValid("//xsd:schema/xsd:complexType[@name='open']/xsd:sequence/"
+                    + "xsd:element[@type='xsd:string']",
+                    getWSDLDocument(server));
+    }
     @Test
     public void testJaxbExtraClass() throws Exception {
         ServerFactoryBean svrBean = new ServerFactoryBean();
@@ -64,7 +88,7 @@
         svrBean.setServiceClass(HelloServiceImpl.class);
         svrBean.setBus(getBus());
 
-        Map props = svrBean.getProperties();
+        Map<String, Object> props = svrBean.getProperties();
         if (props == null) {
             props = new HashMap<String, Object>();
         }