Author: ningjiang
Date: Tue Aug 21 01:28:51 2007
New Revision: 568016
URL: http://svn.apache.org/viewvc?rev=568016&view=rev
Log:
Added unit test for client MTOMEable from spring configuration. Also fixed some
typo of http transport's Messages.properties
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/Messages.properties
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java?rev=568016&r1=568015&r2=568016&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
Tue Aug 21 01:28:51 2007
@@ -251,6 +251,14 @@
String wsdlLocation = factory.getWsdlLocation();
assertEquals("We should get the right wsdl location" , wsdlLocation,
"wsdl/hello_world.wsdl");
+ factory =
(JaxWsProxyFactoryBean)ctx.getBean("inlineSoapBinding.proxyFactory");
+ assertNotNull(factory);
+ BindingConfiguration bc = factory.getBindingConfig();
+ assertTrue(bc instanceof SoapBindingConfiguration);
+ SoapBindingConfiguration sbc = (SoapBindingConfiguration) bc;
+ assertTrue(sbc.getVersion() instanceof Soap12);
+ assertTrue("the soap configure should set isMtomEnabled to be true",
+ sbc.isMtomEnabled());
}
}
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml?rev=568016&r1=568015&r2=568016&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
Tue Aug 21 01:28:51 2007
@@ -20,8 +20,10 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:jaxws="http://cxf.apache.org/jaxws";
+ xmlns:soap="http://cxf.apache.org/bindings/soap";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/bindings/soap
http://cxf.apache.org/schemas/configuration/soap.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
@@ -68,5 +70,13 @@
address="http://localhost:8080/simpleWithAddress";
wsdlLocation="wsdl/hello_world.wsdl"/>
-
+ <jaxws:client id="inlineSoapBinding"
+ serviceClass="org.apache.hello_world_soap_http.Greeter"
+ address="http://localhost:9000/foo";
+ serviceName="s:SOAPService"
+ xmlns:s="http://apache.org/hello_world_soap_http";>
+ <jaxws:binding>
+ <soap:soapBinding mtomEnabled="true" version="1.2"/>
+ </jaxws:binding>
+ </jaxws:client>
</beans>
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties?rev=568016&r1=568015&r2=568016&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties
Tue Aug 21 01:28:51 2007
@@ -30,7 +30,7 @@
KEY_STORE_TYPE_SET = The key store type has been set in configuration to {0}.
LOADED_KEYSTORE = Successfully loaded keystore, {0}.
FAILED_TO_LOAD_KEYSTORE = Loading the keystore {0}, failed with the following
problem: {1}.
-FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD = Loading the keystore. {0}, failed
becasue the password is not set.
+FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD = Loading the keystore. {0}, failed
because the password is not set.
TRUST_STORE_NOT_SET = The location of the trust store has not been set via a
system parameter or through configuration so the default value of {0} will be
used.
TRUST_STORE_SET = The trust store location has been set in configuration to
{0}.
TRUST_STORE_SYSTEM_PROPERTY_SET = The trust store location has been via a
system property to {0}.
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/Messages.properties?rev=568016&r1=568015&r2=568016&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/Messages.properties
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/Messages.properties
Tue Aug 21 01:28:51 2007
@@ -30,7 +30,7 @@
KEY_STORE_TYPE_SET = The key store type has been set in configuration to {0}.
LOADED_KEYSTORE = Successfully loaded keystore, {0}.
FAILED_TO_LOAD_KEYSTORE = Loading the keystore {0}, failed with the following
problem: {1}.
-FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD = Loading the keystore. {0}, failed
becasue the password is not set.
+FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD = Loading the keystore. {0}, failed
because the password is not set.
TRUST_STORE_NOT_SET = The location of the trust store has not been set via a
system parameter or through configuration so the default value of {0} will be
used.
TRUST_STORE_SET = The trust store location has been set in configuration to
{0}.
TRUST_STORE_SYSTEM_PROPERTY_SET = The trust store location has been via a
system property to {0}.
