Author: ema
Date: Tue Jun 12 20:01:53 2007
New Revision: 546718
URL: http://svn.apache.org/viewvc?view=rev&rev=546718
Log:
Fixed issue with not reflecting the style and use annotation in implementor
class
Added:
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java?view=diff&rev=546718&r1=546717&r2=546718
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
Tue Jun 12 20:01:53 2007
@@ -23,6 +23,7 @@
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.frontend.AbstractServiceFactory;
+import org.apache.cxf.jaxws.binding.soap.JaxWsSoapBindingConfiguration;
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
@@ -37,6 +38,7 @@
serviceFactory.setPopulateFromClass(true);
setServiceFactory(serviceFactory);
+ setBindingConfig(new JaxWsSoapBindingConfiguration(serviceFactory));
}
public File getOutputFile() {
@@ -47,4 +49,7 @@
}
return super.getOutputFile();
}
+
+
+
}
Added:
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java?view=auto&rev=546718
==============================================================================
---
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java
(added)
+++
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/RPCHello.java
Tue Jun 12 20:01:53 2007
@@ -0,0 +1,30 @@
+/**
+ * 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.tools.fortest;
+
+import javax.jws.soap.SOAPBinding;
+
[EMAIL PROTECTED](targetNamespace = "http://cxf.apache.org/rpc")
[EMAIL PROTECTED](style = SOAPBinding.Style.RPC,
+ use = SOAPBinding.Use.LITERAL,
+ parameterStyle =
SOAPBinding.ParameterStyle.WRAPPED)
+public interface RPCHello {
+ String hello(String str);
+
+}
Modified:
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?view=diff&rev=546718&r1=546717&r2=546718
==============================================================================
---
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
(original)
+++
incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Tue Jun 12 20:01:53 2007
@@ -304,4 +304,22 @@
assertEquals(oldCP, newCP);
}
+
+ public void testRPCHello() throws Exception {
+ env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() +
"/rpc-hello.wsdl");
+ env.put(ToolConstants.CFG_CLASSNAME,
"org.apache.cxf.tools.fortest.RPCHello");
+ processor.setEnvironment(env);
+ processor.process();
+
+ File wsdlFile = new File(output, "rpc-hello.wsdl");
+ assertTrue("Generate Wsdl Fail", wsdlFile.exists());
+
+
+ String expectedFile =
getClass().getResource("expected/rpc_hello.wsdl").getFile();
+ assertFileEquals(new File(expectedFile), new File(output,
"rpc-hello.wsdl"));
+
+ }
+
+
+
}