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 2009/06/12 23:26:23 UTC
svn commit: r784279 - in /cxf/sandbox/geronimo-jaxws_2.2_spec: ./
src/main/java/javax/xml/ws/ src/main/java/javax/xml/ws/spi/
src/main/java/javax/xml/ws/spi/http/
Author: dkulp
Date: Fri Jun 12 21:26:22 2009
New Revision: 784279
URL: http://svn.apache.org/viewvc?rev=784279&view=rev
Log:
Implement all but HttpExchange
Added:
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java (with props)
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpExchange.java (with props)
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpHandler.java (with props)
Modified:
cxf/sandbox/geronimo-jaxws_2.2_spec/TODO
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Service.java
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Provider.java
Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/TODO
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/TODO?rev=784279&r1=784278&r2=784279&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/TODO (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/TODO Fri Jun 12 21:26:22 2009
@@ -1,10 +1,25 @@
-INFO: 7011: javax.xml.ws.Endpoint: Method 'public javax.xml.ws.Endpoint create(java.lang.Object, javax.xml.ws.WebServiceFeature[])' has been added
-INFO: 7011: javax.xml.ws.Endpoint: Method 'public javax.xml.ws.Endpoint create(java.lang.String, java.lang.Object, javax.xml.ws.WebServiceFeature[])' has been added
-INFO: 7011: javax.xml.ws.Endpoint: Method 'public javax.xml.ws.Endpoint publish(java.lang.String, java.lang.Object, javax.xml.ws.WebServiceFeature[])' has been added
-INFO: 7011: javax.xml.ws.Endpoint: Method 'public void publish(javax.xml.ws.spi.http.HttpContext)' has been added
-INFO: 7011: javax.xml.ws.Service: Method 'protected Service(java.net.URL, javax.xml.namespace.QName, javax.xml.ws.WebServiceFeature[])' has been added
-INFO: 7011: javax.xml.ws.Service: Method 'public javax.xml.ws.Service create(java.net.URL, javax.xml.namespace.QName, javax.xml.ws.WebServiceFeature[])' has been added
-INFO: 7011: javax.xml.ws.Service: Method 'public javax.xml.ws.Service create(javax.xml.namespace.QName, javax.xml.ws.WebServiceFeature[])' has been added
-INFO: 8000: javax.xml.ws.spi.http.HttpContext: Class javax.xml.ws.spi.http.HttpContext added
-INFO: 8000: javax.xml.ws.spi.http.HttpExchange: Class javax.xml.ws.spi.http.HttpExchange added
-INFO: 8000: javax.xml.ws.spi.http.HttpHandler: Class javax.xml.ws.spi.http.HttpHandler added
+INFO: 6000: javax.xml.ws.spi.http.HttpExchange: Added public field REQUEST_CIPHER_SUITE
+INFO: 6000: javax.xml.ws.spi.http.HttpExchange: Added public field REQUEST_KEY_SIZE
+INFO: 6000: javax.xml.ws.spi.http.HttpExchange: Added public field REQUEST_X509CERTIFICATE
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public void addResponseHeader(java.lang.String, java.lang.String)' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public void close()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.Object getAttribute(java.lang.String)' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.util.Set getAttributeNames()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getContextPath()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public javax.xml.ws.spi.http.HttpContext getHttpContext()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.net.InetSocketAddress getLocalAddress()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getPathInfo()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getProtocol()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getQueryString()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.net.InetSocketAddress getRemoteAddress()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.io.InputStream getRequestBody()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getRequestHeader(java.lang.String)' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.util.Map getRequestHeaders()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getRequestMethod()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getRequestURI()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.io.OutputStream getResponseBody()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.util.Map getResponseHeaders()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.lang.String getScheme()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public java.security.Principal getUserPrincipal()' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public boolean isUserInRole(java.lang.String)' has been added
+ERROR: 7013: javax.xml.ws.spi.http.HttpExchange: Abstract method 'public void setStatus(int)' has been added
Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java?rev=784279&r1=784278&r2=784279&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Endpoint.java Fri Jun 12 21:26:22 2009
@@ -36,6 +36,28 @@
public static Endpoint create(String bindingId, Object implementor) {
return Provider.provider().createEndpoint(bindingId, implementor);
}
+ /**
+ * @since 2.2
+ */
+ public static Endpoint create(Object implementor, WebServiceFeature ... features) {
+ return Provider.provider().createEndpoint(null, implementor, features);
+ }
+ /**
+ * @since 2.2
+ */
+ public static Endpoint create(String bindingId, Object implementor, WebServiceFeature ... features) {
+ return Provider.provider().createEndpoint(bindingId, implementor, features);
+ }
+
+ public static Endpoint publish(String address, Object implementor) {
+ return Provider.provider().createAndPublishEndpoint(address, implementor);
+ }
+ /**
+ * @since 2.2
+ */
+ public static Endpoint publish(String address, Object implementor, WebServiceFeature ... features) {
+ return Provider.provider().createAndPublishEndpoint(address, implementor, features);
+ }
public abstract Binding getBinding();
@@ -43,9 +65,6 @@
public abstract void publish(String s);
- public static Endpoint publish(String address, Object implementor) {
- return Provider.provider().createAndPublishEndpoint(address, implementor);
- }
public abstract void publish(Object obj);
@@ -73,9 +92,16 @@
/**
* @since 2.2
*/
- public void setEndpointContext(javax.xml.ws.EndpointContext ctx) {
+ public void setEndpointContext(EndpointContext ctx) {
throw new UnsupportedOperationException("JAX-WS 2.2 implementations must override this method.");
}
+ /**
+ * @since 2.2
+ */
+ public void publish(javax.xml.ws.spi.http.HttpContext context) {
+ throw new UnsupportedOperationException("JAX-WS 2.2 implementations must override this method.");
+ }
+
public static final String WSDL_SERVICE = "javax.xml.ws.wsdl.service";
public static final String WSDL_PORT = "javax.xml.ws.wsdl.port";
Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Service.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Service.java?rev=784279&r1=784278&r2=784279&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Service.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/Service.java Fri Jun 12 21:26:22 2009
@@ -29,12 +29,18 @@
import java.util.concurrent.Executor;
public class Service {
- public enum Mode {
- MESSAGE, PAYLOAD }
+ public enum Mode { MESSAGE, PAYLOAD }
protected Service(URL wsdlDocumentLocation, QName serviceName) {
delegate = Provider.provider().createServiceDelegate(wsdlDocumentLocation, serviceName, getClass());
}
+ /**
+ * @since 2.2
+ */
+ protected Service(URL wsdlDocumentLocation, QName serviceName, WebServiceFeature... features) {
+ delegate = Provider.provider().createServiceDelegate(wsdlDocumentLocation, serviceName, getClass(), features);
+ }
+
public <T> T getPort(QName portName, Class<T> serviceEndpointInterface) {
return (T) delegate.getPort(portName, serviceEndpointInterface);
@@ -119,6 +125,19 @@
public static Service create(QName serviceName) {
return new Service(null, serviceName);
}
+ /**
+ * @since 2.2
+ */
+ public static Service create(URL url, QName sn, javax.xml.ws.WebServiceFeature ... features) {
+ return new Service(url, sn, features);
+ }
+ /**
+ * @since 2.2
+ */
+ public static Service create(QName sn, WebServiceFeature ... features) {
+ return new Service(null, sn, features);
+ }
+
private ServiceDelegate delegate;
}
Modified: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Provider.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Provider.java?rev=784279&r1=784278&r2=784279&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Provider.java (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Provider.java Fri Jun 12 21:26:22 2009
@@ -53,7 +53,7 @@
* @since 2.2
*/
public ServiceDelegate createServiceDelegate(URL url, QName qname, Class<? extends Service> cls,
- WebServiceFeature[] features) {
+ WebServiceFeature ... features) {
throw new UnsupportedOperationException("JAX-WS 2.2 implementations must override this method.");
}
@@ -66,7 +66,7 @@
* Creates an Endpoint object with the provided bindingId, implementation class, invoker, and web service features.
* @since 2.2
*/
- public Endpoint createEndpoint(String bindingId, Class<?> cls, Invoker invoker, WebServiceFeature[] features) {
+ public Endpoint createEndpoint(String bindingId, Class<?> cls, Invoker invoker, WebServiceFeature ... features) {
throw new UnsupportedOperationException("JAX-WS 2.2 implementations must override this method.");
}
@@ -74,7 +74,7 @@
* Creates an Endpoint object with the provided bindingId, implementation object, and web service features.
* @since 2.2
*/
- public Endpoint createEndpoint(String bindingId, Object obj, WebServiceFeature[] features) {
+ public Endpoint createEndpoint(String bindingId, Object obj, WebServiceFeature ... features) {
throw new UnsupportedOperationException("JAX-WS 2.2 implementations must override this method.");
}
@@ -88,7 +88,7 @@
* Creates and publishes an Endpoint object with the specified address, implementation object and web service features.
* @since 2.2
*/
- public Endpoint createAndPublishEndpoint(String address, Object obj, WebServiceFeature[] features) {
+ public Endpoint createAndPublishEndpoint(String address, Object obj, WebServiceFeature ... features) {
throw new UnsupportedOperationException("JAX-WS 2.2 implementations must override this method.");
}
Added: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java?rev=784279&view=auto
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java (added)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java Fri Jun 12 21:26:22 2009
@@ -0,0 +1,42 @@
+/**
+ * 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 javax.xml.ws.spi.http;
+
+import java.util.Set;
+
+/**
+ * @since 2.2
+ */
+public abstract class HttpContext {
+ protected HttpHandler handler;
+
+ public HttpContext() {
+ }
+
+ public abstract Object getAttribute(String name);
+
+ public abstract Set<String> getAttributeNames();
+ public abstract String getPath();
+
+ public void setHandler(HttpHandler handler) {
+ this.handler = handler;
+ }
+
+}
Propchange: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpExchange.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpExchange.java?rev=784279&view=auto
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpExchange.java (added)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpExchange.java Fri Jun 12 21:26:22 2009
@@ -0,0 +1,27 @@
+/**
+ * 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 javax.xml.ws.spi.http;
+
+/**
+ * @since 2.2
+ */
+public abstract class HttpExchange {
+
+}
Propchange: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpExchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpExchange.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpHandler.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpHandler.java?rev=784279&view=auto
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpHandler.java (added)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpHandler.java Fri Jun 12 21:26:22 2009
@@ -0,0 +1,28 @@
+/**
+ * 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 javax.xml.ws.spi.http;
+
+/**
+ *
+ */
+public abstract class HttpHandler {
+ public abstract void handle(HttpExchange exchange);
+
+}
Propchange: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/http/HttpHandler.java
------------------------------------------------------------------------------
svn:keywords = Rev Date