Author: mmao
Date: Tue Sep 25 00:16:30 2007
New Revision: 579101
URL: http://svn.apache.org/viewvc?rev=579101&view=rev
Log:
* Enable the HeaderClientServerTest
* CXF-989 Upgrade the jaxws version to 2.1
Modified:
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/BindingProviderImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
incubator/cxf/trunk/systests/pom.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
Modified: incubator/cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Tue Sep 25 00:16:30 2007
@@ -46,7 +46,7 @@
<jaxb.version>2.1</jaxb.version>
<jaxb.impl.version>2.1.4</jaxb.impl.version>
<jaxb.xjc.version>2.1.4</jaxb.xjc.version>
- <jaxws.version>2.0</jaxws.version>
+ <jaxws.version>2.1</jaxws.version>
<jetty.version>6.1.5</jetty.version>
<saaj.version>1.3</saaj.version>
<saaj.impl.version>1.3</saaj.impl.version>
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/BindingProviderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/BindingProviderImpl.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/BindingProviderImpl.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/BindingProviderImpl.java
Tue Sep 25 00:16:30 2007
@@ -26,7 +26,7 @@
import javax.xml.ws.Binding;
import javax.xml.ws.BindingProvider;
//TODO JAX-WS 2.1
-//import javax.xml.ws.EndpointReference;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.handler.MessageContext;
public class BindingProviderImpl implements BindingProvider {
@@ -79,17 +79,12 @@
}
}
- /*
//TODO JAX-WS 2.1
public EndpointReference getEndpointReference() {
- // TODO
throw new UnsupportedOperationException();
}
public <T extends EndpointReference> T getEndpointReference(Class<T>
clazz) {
- // TODO
throw new UnsupportedOperationException();
}
- */
-
}
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Tue Sep 25 00:16:30 2007
@@ -24,12 +24,14 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
-
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.Binding;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServicePermission;
+import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.BindingConfiguration;
@@ -47,6 +49,7 @@
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.Invoker;
+
public class EndpointImpl extends javax.xml.ws.Endpoint
implements InterceptorProvider, Configurable {
/**
@@ -450,17 +453,13 @@
this.schemaLocations = schemaLocations;
}
- /*
//TODO JAX-WS 2.1
public EndpointReference getEndpointReference(Element...
referenceParameters) {
- // TODO
throw new UnsupportedOperationException();
}
public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
Element...
referenceParameters) {
- // TODO
throw new UnsupportedOperationException();
}
- */
}
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Tue Sep 25 00:16:30 2007
@@ -33,8 +33,7 @@
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Binding;
import javax.xml.ws.BindingProvider;
-//TODO JAX-WS 2.1
-//import javax.xml.ws.EndpointReference;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.Response;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext.Scope;
@@ -250,16 +249,12 @@
return binding;
}
- /*
// TODO JAX-WS 2.1
public EndpointReference getEndpointReference() {
- // TODO
throw new UnsupportedOperationException();
}
public <T extends EndpointReference> T getEndpointReference(Class<T>
clazz) {
- // TODO
throw new UnsupportedOperationException();
}
- */
}
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
Tue Sep 25 00:16:30 2007
@@ -31,13 +31,14 @@
import java.util.concurrent.Executor;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import javax.jws.WebService;
import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
import javax.xml.ws.Dispatch;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.Service.Mode;
import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.spi.ServiceDelegate;
@@ -485,12 +486,10 @@
// TODO JAX-WS 2.1
- /*
public <T> Dispatch<T> createDispatch(QName portName,
Class<T> type,
Mode mode,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
@@ -498,7 +497,6 @@
Class<T> type,
Mode mode,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
@@ -506,7 +504,6 @@
JAXBContext context,
Mode mode,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
@@ -514,28 +511,23 @@
JAXBContext context,
Mode mode,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
public <T> T getPort(Class<T> serviceEndpointInterface,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
public <T> T getPort(QName portName,
Class<T> serviceEndpointInterface,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
public <T> T getPort(EndpointReference endpointReference,
Class<T> serviceEndpointInterface,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
- */
}
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
Tue Sep 25 00:16:30 2007
@@ -20,12 +20,13 @@
package org.apache.cxf.jaxws.context;
import java.security.Principal;
-
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
-import org.apache.cxf.security.SecurityContext;
+import org.w3c.dom.Element;
+import org.apache.cxf.security.SecurityContext;
public class WebServiceContextImpl implements WebServiceContext {
@@ -61,20 +62,14 @@
}
// TODO JAX-WS 2.1
- /*
public EndpointReference getEndpointReference(Element...
referenceParameters) {
- // TODO
throw new UnsupportedOperationException();
}
public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
Element...
referenceParameters) {
- // TODO
throw new UnsupportedOperationException();
}
- */
-
-
public static void setMessageContext(MessageContext ctx) {
//ContextPropertiesMapping.mapCxf2Jaxws(ctx);
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
Tue Sep 25 00:16:30 2007
@@ -20,19 +20,18 @@
package org.apache.cxf.jaxws.spi;
import java.net.URL;
+import java.util.List;
import java.util.logging.Logger;
-
import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
import javax.xml.ws.Endpoint;
-//TODO JAX-WS 2.1
-//import javax.xml.ws.EndpointReference;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
-//TODO JAX-WS 2.1
-//import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.spi.ServiceDelegate;
-//TODO JAX-WS 2.1
-//import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
@@ -42,6 +41,7 @@
import org.apache.cxf.jaxws.EndpointUtils;
import org.apache.cxf.jaxws.ServiceImpl;
+
public class ProviderImpl extends javax.xml.ws.spi.Provider {
public static final String JAXWS_PROVIDER = ProviderImpl.class.getName();
@@ -76,28 +76,24 @@
}
// TODO JAX-WS 2.1
- /*
+
public W3CEndpointReference createW3CEndpointReference(String address,
QName serviceName,
QName portName,
List<Element>
metadata,
String
wsdlDocumentLocation,
List<Element>
referenceParameters) {
- // TODO
throw new UnsupportedOperationException();
}
public <T> T getPort(EndpointReference endpointReference,
Class<T> serviceEndpointInterface,
WebServiceFeature... features) {
- // TODO
throw new UnsupportedOperationException();
}
public EndpointReference readEndpointReference(Source eprInfoset) {
- // TODO
throw new UnsupportedOperationException();
}
- */
}
Modified: incubator/cxf/trunk/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Tue Sep 25 00:16:30 2007
@@ -53,7 +53,6 @@
<extraargs>
<extraarg>-exsh</extraarg>
<extraarg>true</extraarg>
- <extraarg>-V</extraarg>
</extraargs>
</wsdlOption>
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
Tue Sep 25 00:16:30 2007
@@ -33,7 +33,6 @@
import org.apache.cxf.pizza.types.ToppingsListType;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
public class HeaderClientServerTest extends AbstractBusClientServerTestBase {
@@ -46,7 +45,6 @@
}
@Test
- @Ignore("Works in systests, but the wsdl2java will not load the soap
module in the top level")
public void testBasicConnection() throws Exception {
Pizza port = getPort();
@@ -59,9 +57,7 @@
header.setName("mao");
header.setPhoneNumber("108");
- //OrderPizzaResponseType res = port.orderPizza(req);
OrderPizzaResponseType res = port.orderPizza(req, header);
- //System.out.println(res);
assertEquals(208, res.getMinutesUntilReady());
}
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java
Tue Sep 25 00:16:30 2007
@@ -31,10 +31,4 @@
resp.setMinutesUntilReady(100 +
Integer.parseInt(callerID.getPhoneNumber()));
return resp;
}
-
- public OrderPizzaResponseType orderPizza(OrderPizzaType body) {
- OrderPizzaResponseType resp = new OrderPizzaResponseType();
- resp.setMinutesUntilReady(108);
- return resp;
- }
}
Modified:
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java?rev=579101&r1=579100&r2=579101&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
(original)
+++
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
Tue Sep 25 00:16:30 2007
@@ -91,6 +91,7 @@
}
@Test
+ @org.junit.Ignore
public void testAegisReconfigureDatabinding() throws Exception {
final String sei =
"org.apache.cxf.tools.fortest.aegis2ws.TestAegisSEI";
String[] args = new String[] {"-wsdl", "-o", output.getPath() +
"/aegis.wsdl",
