svn commit: r661863 - in /cxf/trunk/rt/frontend: jaxws/src/test/java/org/apache/cxf/jaxws/support/ simple/src/main/java/org/apache/cxf/service/factory/ simple/src/test/java/org/apache/cxf/service/factory/

[dkulp]

Author: dkulp
Date: Fri May 30 14:11:55 2008
New Revision: 661863

URL: http://svn.apache.org/viewvc?rev=661863&view=rev
Log:
[CXF-1618] Fix jaxws version of this

Modified:
    
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
    
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?rev=661863&r1=661862&r2=661863&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
 Fri May 30 14:11:55 2008
@@ -60,7 +60,6 @@
 
 public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
     
-    @org.junit.Ignore
     @Test
     public void testDocLiteralPartWithType() throws Exception {
         ReflectionServiceFactoryBean serviceFactory = new 
JaxWsServiceFactoryBean();
@@ -79,7 +78,6 @@
         XmlSchemaElement element = 
             
serviceInfo.getXmlSchemaCollection().getElementByQName(elementQName);
         assertNotNull(element);
-
     }
 
 

Modified: 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=661863&r1=661862&r2=661863&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Fri May 30 14:11:55 2008
@@ -911,8 +911,6 @@
 
     protected void createBareMessage(ServiceInfo serviceInfo, OperationInfo 
opInfo, boolean isOut) {
 
-        SchemaInfo schemaInfo = null;
-        XmlSchema schema = null;
         MessageInfo message = isOut ? opInfo.getOutput() : opInfo.getInput();
 
         if (message.getMessageParts().size() == 0) {
@@ -922,6 +920,9 @@
         Method method = (Method)opInfo.getProperty(METHOD);
         int paraNumber = 0;
         for (MessagePartInfo mpi : message.getMessageParts()) {
+            SchemaInfo schemaInfo = null;
+            XmlSchema schema = null;
+
             QName qname = (QName)mpi.getProperty(ELEMENT_NAME);
             if (message.getMessageParts().size() == 1) {
                 qname = qname == null && !isOut ? getInParameterName(opInfo, 
method, -1) : qname;
@@ -995,8 +996,6 @@
                 addImport(schema, mpi.getTypeQName().getNamespaceURI());
             }
 
-            schemaInfo.setSchema(schema);
-
             mpi.setElement(true);
             mpi.setElementQName(qname);
             paraNumber++;

Modified: 
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?rev=661863&r1=661862&r2=661863&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
 (original)
+++ 
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
 Fri May 30 14:11:55 2008
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.service.factory;
 
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -185,6 +186,18 @@
         serviceFactory = new ReflectionServiceFactoryBean();
         serviceFactory.setBus(getBus());
         serviceFactory.setServiceClass(NoBodyPartsImpl.class);
+        serviceFactory.getServiceConfigurations().add(0,
+            new AbstractServiceConfiguration() {
+                @Override
+                public Boolean isWrapped() {
+                    return Boolean.FALSE;
+                }
+
+                @Override
+                public Boolean isWrapped(Method m) {
+                    return Boolean.FALSE;
+                }
+            });
         Service service = serviceFactory.create();
         ServiceInfo serviceInfo = 
             service.getServiceInfos().get(0);