Author: ningjiang Date: Thu Dec 4 17:28:04 2008 New Revision: 723551 URL: http://svn.apache.org/viewvc?rev=723551&view=rev Log: Merged revisions 723545 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r723545 | ningjiang | 2008-12-05 09:02:19 +0800 (Fri, 05 Dec 2008) | 9 lines Merged revisions 723338 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r723338 | ningjiang | 2008-12-04 22:44:16 +0800 (Thu, 04 Dec 2008) | 1 line CXF-1931 added setDataBinding into EndpointImpl ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 4 17:28:04 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,720124 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327,719354,719362,719368,719382,719649,720119 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,720124,723545 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327,719354,719362,719368,719382,719649,720119,723338 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=723551&r1=723550&r2=723551&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Thu Dec 4 17:28:04 2008 @@ -39,6 +39,7 @@ import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList; import org.apache.cxf.configuration.Configurable; import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.endpoint.Server; import org.apache.cxf.endpoint.ServerImpl; import org.apache.cxf.feature.AbstractFeature; @@ -429,9 +430,18 @@ public void setBindingUri(String binding) { this.bindingUri = binding; } + public String getBindingUri() { return this.bindingUri; } + + public void setDataBinding(DataBinding dataBinding) { + serverFactory.setDataBinding(dataBinding); + } + + public DataBinding getDataBinding() { + return serverFactory.getDataBinding(); + } public List<Interceptor> getOutFaultInterceptors() { return outFault; Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java?rev=723551&r1=723550&r2=723551&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java Thu Dec 4 17:28:04 2008 @@ -37,6 +37,7 @@ import org.apache.cxf.binding.soap.SoapBindingConfiguration; import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; +import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.databinding.source.SourceDataBinding; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.NullConduitSelector; @@ -44,6 +45,7 @@ import org.apache.cxf.interceptor.Interceptor; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; +import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.jaxws.JaxWsServerFactoryBean; @@ -145,10 +147,6 @@ assertEquals("http://service.jaxws.cxf.apache.org/service";, name.getNamespaceURI()); assertEquals("HelloServiceCustomized", name.getLocalPart()); - name = ep.getServer().getEndpoint().getEndpointInfo().getName(); - assertEquals("http://service.jaxws.cxf.apache.org/endpoint";, name.getNamespaceURI()); - assertEquals("HelloEndpointCustomized", name.getLocalPart()); - bean = ctx.getBean("wsdlLocation"); assertNotNull(bean); @@ -157,7 +155,15 @@ String expectedEndpointUrl = "http://cxf.apache.org/Greeter";; ep = (EndpointImpl) bean; assertEquals(expectedEndpointUrl, ep.getPublishedEndpointUrl()); - + + bean = ctx.getBean("epWithDataBinding"); + assertNotNull(bean); + ep = (EndpointImpl) bean; + DataBinding dataBinding = ep.getDataBinding(); + + assertTrue(dataBinding instanceof JAXBDataBinding); + assertEquals("The namespace map should have an entry", + ((JAXBDataBinding)dataBinding).getNamespaceMap().size(), 1); // test for existence of Endpoint without an id element boolean found = false; String[] names = ctx.getBeanNamesForType(EndpointImpl.class); Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml?rev=723551&r1=723550&r2=723551&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml (original) +++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml Thu Dec 4 17:28:04 2008 @@ -112,9 +112,24 @@ </jaxws:outInterceptors> </jaxws:endpoint> - <jaxws:endpoint implementor="org.apache.cxf.jaxws.service.Hello" - address="http://localhost:8080/test"/> + <jaxws:endpoint id="epWithDataBinding" implementor="org.apache.cxf.jaxws.service.Hello" + address="http://localhost:8080/test2";> + <jaxws:dataBinding> + <bean class="org.apache.cxf.jaxb.JAXBDataBinding"> + <property name="namespaceMap"> + <map> + <entry> + <key><value>http://cxf.apache.org/anonymous_complex_type/</value></key> + <value>BeepBeep</value> + </entry> + </map> + </property> + </bean> + </jaxws:dataBinding> + </jaxws:endpoint> + <jaxws:endpoint implementor="org.apache.cxf.jaxws.service.Hello" + address="http://localhost:8080/testx"/> <jaxws:endpoint id="implementorClass" implementor="java.lang.Object"
