You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/07/17 21:56:39 UTC
svn commit: r1147704 - in
/openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf:
CxfEndpoint.java ejb/EjbWsContainer.java pojo/PojoEndpoint.java
pojo/PojoWsContainer.java
Author: rmannibucau
Date: Sun Jul 17 19:56:38 2011
New Revision: 1147704
URL: http://svn.apache.org/viewvc?rev=1147704&view=rev
Log:
Pojo WS was depending on jetty since CXF refactoring (2.4.1 version), now it only needs openejb http
Modified:
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java
Modified: openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java?rev=1147704&r1=1147703&r2=1147704&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java Sun Jul 17 19:56:38 2011
@@ -139,11 +139,6 @@ public abstract class CxfEndpoint {
// disable CXF resource injection
doInit = false;
}
-
- @Override
- protected BindingInfo createBindingInfo() {
- return super.createBindingInfo();
- }
}
protected void doPublish(String address) {
Modified: openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java?rev=1147704&r1=1147703&r2=1147704&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java Sun Jul 17 19:56:38 2011
@@ -32,7 +32,6 @@ public class EjbWsContainer extends CxfW
}
protected EjbEndpoint createEndpoint() {
- EjbEndpoint ep = new EjbEndpoint(bus, port, beanContext, httpTransportFactory);
- return ep;
+ return new EjbEndpoint(bus, port, beanContext, httpTransportFactory);
}
}
Modified: openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java?rev=1147704&r1=1147703&r2=1147704&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java Sun Jul 17 19:56:38 2011
@@ -20,6 +20,7 @@ package org.apache.openejb.server.cxf.po
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.JAXWSMethodInvoker;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.openejb.InjectionProcessor;
import static org.apache.openejb.InjectionProcessor.unwrap;
import org.apache.openejb.core.webservices.JaxWsUtils;
@@ -34,8 +35,8 @@ import javax.xml.ws.WebServiceException;
public class PojoEndpoint extends CxfEndpoint {
private InjectionProcessor<Object> injectionProcessor;
- public PojoEndpoint(Bus bus, PortData port, Context context, Class<?> instance) {
- super(bus, port, context, instance, null);
+ public PojoEndpoint(Bus bus, PortData port, Context context, Class<?> instance, HTTPTransportFactory httpTransportFactory) {
+ super(bus, port, context, instance, httpTransportFactory);
String bindingURI = null;
if (port.getBindingID() != null) {
Modified: openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java?rev=1147704&r1=1147703&r2=1147704&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java Sun Jul 17 19:56:38 2011
@@ -35,6 +35,6 @@ public class PojoWsContainer extends Cxf
}
protected PojoEndpoint createEndpoint() {
- return new PojoEndpoint(bus, port, context, target);
+ return new PojoEndpoint(bus, port, context, target, httpTransportFactory);
}
}