You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2007/04/20 11:05:26 UTC
svn commit: r530704 - in /incubator/cxf/trunk:
distribution/src/main/release/samples/soap12/src/demo/hw/server/
rt/bindings/http/src/main/resources/META-INF/
rt/bindings/http/src/main/resources/META-INF/cxf/
rt/frontend/jaxws/src/main/java/org/apache/c...
Author: ffang
Date: Fri Apr 20 02:05:24 2007
New Revision: 530704
URL: http://svn.apache.org/viewvc?view=rev&rev=530704
Log:
[CXF-551] get soap12 sample working
[CXF-550] get restful_http_binding sample working
Added:
incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml (with props)
incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension (with props)
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/soap12/src/demo/hw/server/GreeterImpl.java
incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap12/src/demo/hw/server/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap12/src/demo/hw/server/GreeterImpl.java?view=diff&rev=530704&r1=530703&r2=530704
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap12/src/demo/hw/server/GreeterImpl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap12/src/demo/hw/server/GreeterImpl.java Fri Apr 20 02:05:24 2007
@@ -27,7 +27,7 @@
@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap12_http",
endpointInterface = "org.apache.hello_world_soap12_http.Greeter")
-
+@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
public class GreeterImpl implements Greeter {
private static final Logger LOG =
Added: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml?view=auto&rev=530704
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml (added)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml Fri Apr 20 02:05:24 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<extensions xmlns="http://cxf.apache.org/bus/extension">
+
+ <extension class="org.apache.cxf.binding.http.HttpBindingFactory"
+ interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+ <namespace>http://apache.org/cxf/binding/http</namespace>
+ </extension>
+
+</extensions>
Propchange: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml?view=diff&rev=530704&r1=530703&r2=530704
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml Fri Apr 20 02:05:24 2007
@@ -30,5 +30,6 @@
<value>http://apache.org/cxf/binding/http</value>
</set>
</property>
+ <property name="bus" ref="cxf"/>
</bean>
</beans>
Added: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530704
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension Fri Apr 20 02:05:24 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-http-binding.xml
Propchange: incubator/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java?view=diff&rev=530704&r1=530703&r2=530704
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java Fri Apr 20 02:05:24 2007
@@ -86,16 +86,16 @@
if (getBindingConfig() instanceof JaxWsSoapBindingConfiguration) {
JaxWsSoapBindingConfiguration conf = (JaxWsSoapBindingConfiguration)getBindingConfig();
- if (jaxBid.equals(binding.equals(SOAPBinding.SOAP12HTTP_BINDING))) {
+ if (jaxBid.equals(SOAPBinding.SOAP12HTTP_BINDING)) {
conf.setVersion(Soap12.getInstance());
}
- if (jaxBid.equals(binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING))) {
+ if (jaxBid.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) {
conf.setVersion(Soap12.getInstance());
conf.setMtomEnabled(true);
}
- if (jaxBid.equals(binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING))) {
+ if (jaxBid.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING)) {
conf.setMtomEnabled(true);
}