You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/10/17 17:15:45 UTC
svn commit: r585535 - in /incubator/cxf/branches/2.0.x-fixes: ./
rt/core/src/main/resources/META-INF/cxf/
tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/
tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/
tools/javato/w...
Author: dkulp
Date: Wed Oct 17 08:15:40 2007
New Revision: 585535
URL: http://svn.apache.org/viewvc?rev=585535&view=rev
Log:
Merged revisions 585394 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r585394 | mmao | 2007-10-17 02:24:31 -0400 (Wed, 17 Oct 2007) | 3 lines
* Test to show the usage of XmlMimeType
........
Added:
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/ImageSender.java
- copied unchanged from r585394, incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/ImageSender.java
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/ImageSender2.java
- copied unchanged from r585394, incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/ImageSender2.java
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/MyImage.java
- copied unchanged from r585394, incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/MyImage.java
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
- copied unchanged from r585394, incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
- copied unchanged from r585394, incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml?rev=585535&r1=585534&r2=585535&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml Wed Oct 17 08:15:40 2007
@@ -24,8 +24,8 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
- <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
- <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
+ <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+ <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
<bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
<constructor-arg>
Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=585535&r1=585534&r2=585535&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Wed Oct 17 08:15:40 2007
@@ -417,5 +417,43 @@
String expectedFile = getClass().getResource("expected/list_expected.wsdl").getFile();
assertFileEquals(new File(expectedFile), new File(output, "/list_test.wsdl"));
+
+ }
+
+ @Test
+ // TODO: should suppor the XmlMimeType annotation in the SEI
+ public void testMimeTypeInSEI() throws Exception {
+ env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/send_image.wsdl");
+ env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.ImageSender");
+ env.put(ToolConstants.CFG_VERBOSE, ToolConstants.CFG_VERBOSE);
+ try {
+ processor.setEnvironment(env);
+ processor.process();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ File wsdlFile = new File(output, "send_image.wsdl");
+ assertTrue("Generate Wsdl Fail", wsdlFile.exists());
+
+ String expectedFile = getClass().getResource("expected/expected_send_image.wsdl").getFile();
+ assertWsdlEquals(new File(expectedFile), wsdlFile);
+ }
+
+ @Test
+ public void testMimeTypeInBean() throws Exception {
+ env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/send_image2.wsdl");
+ env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.ImageSender2");
+ env.put(ToolConstants.CFG_VERBOSE, ToolConstants.CFG_VERBOSE);
+ try {
+ processor.setEnvironment(env);
+ processor.process();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ File wsdlFile = new File(output, "send_image2.wsdl");
+ assertTrue("Generate Wsdl Fail", wsdlFile.exists());
+
+ String expectedFile = getClass().getResource("expected/expected_send_image2.wsdl").getFile();
+ assertWsdlEquals(new File(expectedFile), wsdlFile);
}
}
Modified: incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java?rev=585535&r1=585534&r2=585535&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java Wed Oct 17 08:15:40 2007
@@ -35,7 +35,6 @@
try {
assertFalse(validator.isValid());
} catch (Exception e) {
- e.printStackTrace();
assertTrue(e.getMessage().indexOf("Caused by {http://apache.org/hello_world/messages}"
+ "[portType:GreeterA][operation:sayHi] not exist.") != -1);
}