On Thu, Aug 14, 2008 at 2:57 AM, Jacek Laskowski <[EMAIL PROTECTED]> wrote: > On Thu, Aug 14, 2008 at 3:34 AM, <[EMAIL PROTECTED]> wrote: >> Author: gawor >> Date: Wed Aug 13 18:34:00 2008 >> New Revision: 685741 >> >> URL: http://svn.apache.org/viewvc?rev=685741&view=rev >> Log: >> upgrade to jax-ws api 2.1 (GERONIMO-4242) > >> <dependency> >> - <groupId>org.apache.axis2</groupId> >> - <artifactId>axis2-jaxws-api</artifactId> >> + <groupId>org.apache.geronimo.specs</groupId> >> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> >> </dependency> > > Do they (Axis) use Geronimo jars from now on? I don't think there's a > value keeping two jars in different ASF projects.
Yes, both Axis2 and CXF are using this Geronimo spec jar now. >> Modified: >> geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java?rev=685741&r1=685740&r2=685741&view=diff >> ============================================================================== >> --- >> geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java >> (original) >> +++ >> geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java >> Wed Aug 13 18:34:00 2008 >> @@ -23,6 +23,7 @@ >> >> import javax.naming.InitialContext; >> import javax.naming.NamingException; >> +import javax.xml.ws.EndpointReference; >> import javax.xml.ws.WebServiceContext; >> import javax.xml.ws.WebServiceException; >> >> @@ -42,6 +43,8 @@ >> import org.apache.geronimo.jaxws.JNDIResolver; >> import org.apache.openejb.DeploymentInfo; >> >> +import org.w3c.dom.Element; >> + >> public class EJBEndpoint extends CXFEndpoint { >> >> public EJBEndpoint(Bus bus, >> @@ -140,5 +143,14 @@ >> // shutdown server >> super.stop(); >> } >> + >> + public EndpointReference getEndpointReference(Element... >> referenceParameters) { >> + throw new UnsupportedOperationException(); >> + } >> + >> + public <T extends EndpointReference> T getEndpointReference(Class<T> >> clazz, >> + Element... >> referenceParameters) { >> + throw new UnsupportedOperationException(); >> + } >> >> } >> >> Modified: >> geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java >> URL: >> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java?rev=685741&r1=685740&r2=685741&view=diff >> ============================================================================== >> --- >> geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java >> (original) >> +++ >> geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java >> Wed Aug 13 18:34:00 2008 >> @@ -21,6 +21,7 @@ >> import java.net.URL; >> >> import javax.naming.Context; >> +import javax.xml.ws.EndpointReference; >> import javax.xml.ws.WebServiceException; >> >> import org.slf4j.Logger; >> @@ -36,6 +37,8 @@ >> import org.apache.geronimo.jaxws.JNDIResolver; >> import org.apache.geronimo.jaxws.annotations.AnnotationHolder; >> >> +import org.w3c.dom.Element; >> + >> public class POJOEndpoint extends CXFEndpoint { >> >> private static final Logger LOG = >> LoggerFactory.getLogger(POJOEndpoint.class); >> @@ -112,4 +115,14 @@ >> // shutdown server >> super.stop(); >> } >> + >> + public EndpointReference getEndpointReference(Element... >> referenceParameters) { >> + throw new UnsupportedOperationException(); >> + } >> + >> + public <T extends EndpointReference> T getEndpointReference(Class<T> >> clazz, >> + Element... >> referenceParameters) { >> + throw new UnsupportedOperationException(); >> + } >> + >> } > > Why is getEndpointReference not part of CXFEndpoint class? It is. This commit was about upgrading the API jar. Once I actaully update CXF and Axis2 to their latest versions these new methods will be implemented properly. I'm trying to do things in smaller steps instead all of it at once. Jarek
