Author: dkulp
Date: Fri Jun 12 18:49:30 2009
New Revision: 784229
URL: http://svn.apache.org/viewvc?rev=784229&view=rev
Log:
Start filling in 2.2 stuff
Added:
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Invoker.java
(with props)
Modified:
cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.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/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml?rev=784229&r1=784228&r2=784229&view=diff
==============================================================================
--- cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml (original)
+++ cxf/sandbox/geronimo-jaxws_2.2_spec/pom.xml Fri Jun 12 18:49:30 2009
@@ -31,11 +31,11 @@
</parent>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<packaging>bundle</packaging>
- <name>Apache Geronimo JAX-WS 2.1 API</name>
- <version>1.0.1-SNAPSHOT</version>
- <description>Java API for XML Web Services 2.1</description>
+ <name>Apache Geronimo JAX-WS 2.2 API</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>Java API for XML Web Services 2.2</description>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
<distributionManagement>
@@ -50,22 +50,16 @@
</properties>
<scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxws_2.1_spec/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxws_2.1_spec/</developerConnection>
-
<url>https://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaxws_2.1_spec/</url>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxws_2.2_spec/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaxws_2.2_spec/</developerConnection>
+
<url>https://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaxws_2.2_spec/</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -80,6 +74,29 @@
<version>1.0.2</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency-->
</dependencies>
<build>
Modified:
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java?rev=784229&r1=784228&r2=784229&view=diff
==============================================================================
---
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
(original)
+++
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/FactoryFinder.java
Fri Jun 12 18:49:30 2009
@@ -65,7 +65,7 @@
// the caller already has a doPriv. I added the doPriv in case
someone changes the
// visibility of this method to non-private.
ClassLoader cl = (ClassLoader)
- doPrivileged( new PrivilegedAction() {
+ doPrivileged( new PrivilegedAction<Object>() {
public Object run() {
Method m = null;
@@ -120,7 +120,7 @@
// the caller already has a doPriv. I added the doPriv in case
someone changes the
// visibility of this method to non-private.
Object obj =
- doPrivileged( new PrivilegedAction() {
+ doPrivileged( new PrivilegedAction<Object>() {
public Object run() {
try {
if (iClassLoader != null) {
@@ -163,7 +163,7 @@
final String iFallbackClassName = fallbackClassName;
Object obj =
- doPrivileged( new PrivilegedAction() {
+ doPrivileged( new PrivilegedAction<Object>() {
public Object run() {
debugPrintln("debug is on");
@@ -258,10 +258,10 @@
return obj;
}
- private static Object doPrivileged(PrivilegedAction action) {
+ private static <T> T doPrivileged(PrivilegedAction<T> action) {
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
- return(action.run());
+ return action.run();
} else {
return java.security.AccessController.doPrivileged(action);
}
Added:
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Invoker.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Invoker.java?rev=784229&view=auto
==============================================================================
---
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Invoker.java
(added)
+++
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Invoker.java
Fri Jun 12 18:49:30 2009
@@ -0,0 +1,47 @@
+/**
+ * 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;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.xml.ws.WebServiceContext;
+
+/**
+ * @since 2.2
+ */
+public abstract class Invoker {
+ /**
+ *
+ */
+ public abstract void inject(WebServiceContext webServiceContext)
+ throws IllegalAccessException,
+ IllegalArgumentException,
+ InvocationTargetException;
+
+ /**
+ *
+ */
+ public abstract Object invoke(Method m, Object ... args)
+ throws IllegalAccessException,
+ IllegalArgumentException,
+ InvocationTargetException;
+
+}
Propchange:
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Invoker.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/sandbox/geronimo-jaxws_2.2_spec/src/main/java/javax/xml/ws/spi/Invoker.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=784229&r1=784228&r2=784229&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 18:49:30 2009
@@ -25,12 +25,16 @@
import javax.xml.transform.Source;
import javax.xml.ws.Endpoint;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Service;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.net.URL;
import java.util.List;
+import java.util.Map;
public abstract class Provider {
+ public static final String JAXWSPROVIDER_PROPERTY =
"javax.xml.ws.spi.Provider";
+ private static final String DEFAULT_JAXWSPROVIDER =
"org.apache.cxf.jaxws.spi.ProviderImpl";
protected Provider() {
}
@@ -39,15 +43,59 @@
return (Provider) FactoryFinder.find(JAXWSPROVIDER_PROPERTY,
DEFAULT_JAXWSPROVIDER);
}
- public abstract ServiceDelegate createServiceDelegate(URL url, QName
qname, Class class1);
+ /**
+ * Creates a service delegate object for the URL and service Qname
+ */
+ public abstract ServiceDelegate createServiceDelegate(URL url, QName
qname, Class<? extends Service> class1);
+
+ /**
+ * Creates a service delegate object for the URL, service Qname, and web
service features.
+ * @since 2.2
+ */
+ public ServiceDelegate createServiceDelegate(URL url, QName qname, Class<?
extends Service> cls,
+ WebServiceFeature[] features)
{
+ throw new UnsupportedOperationException("JAX-WS 2.2 implementations
must override this method.");
+ }
- public abstract Endpoint createEndpoint(String s, Object obj);
+ /**
+ * Creates an Endpoint object with the provided bindingId and
implementation object.
+ */
+ public abstract Endpoint createEndpoint(String bindingId, Object obj);
+
+ /**
+ * 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) {
+ throw new UnsupportedOperationException("JAX-WS 2.2 implementations
must override this method.");
+ }
+
+ /**
+ * 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) {
+ throw new UnsupportedOperationException("JAX-WS 2.2 implementations
must override this method.");
+ }
+
+ /**
+ * Creates and publishes an Endpoint object with the specified address and
implementation object.
+ */
public abstract Endpoint createAndPublishEndpoint(String s, Object obj);
-
+
+ /**
+ * 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) {
+ throw new UnsupportedOperationException("JAX-WS 2.2 implementations
must override this method.");
+ }
+
public abstract EndpointReference readEndpointReference(Source eprInfoset);
- public abstract <T> T getPort(EndpointReference endpointReference,
Class<T> serviceEndpointInterface, WebServiceFeature... features);
+ public abstract <T> T getPort(EndpointReference endpointReference,
Class<T> serviceEndpointInterface,
+ WebServiceFeature... features);
public abstract W3CEndpointReference createW3CEndpointReference(String
address,
QName serviceName,
@@ -56,6 +104,22 @@
String wsdlDocumentLocation,
List<Element> referenceParameters);
- public static final String JAXWSPROVIDER_PROPERTY =
"javax.xml.ws.spi.Provider";
- private static final String DEFAULT_JAXWSPROVIDER =
"org.apache.axis2.jaxws.spi.Provider";
+
+
+ /**
+ * @since 2.2
+ */
+ public W3CEndpointReference createW3CEndpointReference(String address,
+ QName
interfaceName,
+ QName serviceName,
+ QName portName,
+ List<Element>
metadata,
+ String wsdlLocation,
+ List<Element>
referenceParameters,
+ List<Element>
elements,
+ Map<QName, String>
attributes) {
+ throw new UnsupportedOperationException("JAX-WS 2.2 implementations
must override this method.");
+ }
+
+
}
