You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Jason Dillon <ja...@planet57.com> on 2007/03/20 23:21:37 UTC
Re: svn commit: r520551 - in /geronimo/server/trunk/modules: geronimo-axis2-builder/ geronimo-axis2/ geronimo-axis2/src/main/generated/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/ g...
You removed the src/main/generated bits, but you did not remove the
pom configuration which hooked this up.
Also, the Axis2HandlerResolverTest is currently broken as its trying
to reference org.apache.axis2.jaxws.javaee.HandlerChainsType
--jason
On Mar 20, 2007, at 1:15 PM, dims@apache.org wrote:
> Author: dims
> Date: Tue Mar 20 13:15:06 2007
> New Revision: 520551
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=520551
> Log:
> remove jaxb generated code, use the xmlbeans code generated from
> the j2ee 5 schema instead
>
> Removed:
> geronimo/server/trunk/modules/geronimo-axis2/src/main/generated/
> Modified:
> geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
> geronimo/server/trunk/modules/geronimo-axis2/pom.xml
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/AnnotationHandlerChainBuilder.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2HandlerResolver.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2WebServiceContainer.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/AxisServiceGenerator.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/GeronimoHandlerChainBuilder.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/client/Axis2ServiceReference.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/ejb/EJBWebServiceContainer.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/ejb/EJBWebServiceGBean.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContainer.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java
> geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContext.java
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2-builder/pom.xml?
> view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
> Tue Mar 20 13:15:06 2007
> @@ -33,6 +33,11 @@
> <name>Geronimo :: Axis2 :: Builder</name>
>
> <dependencies>
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-j2ee-schema</artifactId>
> + <version>${version}</version>
> + </dependency>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-jaxws-builder</artifactId>
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/pom.xml?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/pom.xml (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/pom.xml Tue Mar 20
> 13:15:06 2007
> @@ -27,6 +27,11 @@
> <artifactId>geronimo-axis2</artifactId>
> <name>Geronimo :: AXIS2</name>
> <dependencies>
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-j2ee-schema</artifactId>
> + <version>${version}</version>
> + </dependency>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-webservices</artifactId>
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/
> AnnotationHandlerChainBuilder.java?
> view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/AnnotationHandlerChainBuilder.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/AnnotationHandlerChainBuilder.java Tue Mar 20
> 13:15:06 2007
> @@ -19,16 +19,13 @@
>
> package org.apache.geronimo.axis2;
>
> -import org.apache.axis2.jaxws.javaee.HandlerChainType;
> -import org.apache.axis2.jaxws.javaee.HandlerChainsType;
> -import org.apache.axis2.jaxws.javaee.PortComponentHandlerType;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> +import org.apache.geronimo.xbeans.javaee.HandlerChainType;
> +import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
> +import org.apache.geronimo.xbeans.javaee.PortComponentHandlerType;
>
> import javax.jws.HandlerChain;
> -import javax.xml.bind.JAXBContext;
> -import javax.xml.bind.JAXBElement;
> -import javax.xml.bind.Unmarshaller;
> import javax.xml.ws.WebServiceException;
> import javax.xml.ws.handler.Handler;
> import javax.xml.ws.handler.LogicalHandler;
> @@ -60,19 +57,14 @@
>
> HandlerChainType hc = null;
> try {
> - JAXBContext jc = JAXBContext
> - .newInstance
> (org.apache.axis2.jaxws.javaee.ObjectFactory.class);
> - Unmarshaller u = jc.createUnmarshaller();
> URL handlerFileURL = clz.getResource
> (hcAnn.getFileName());
> - JAXBElement<?> o = (JAXBElement<?>) u.unmarshal
> (handlerFileURL);
> + HandlerChainsType handlerChainsType =
> HandlerChainsType.Factory.parse(handlerFileURL);
>
> - HandlerChainsType handlerChainsType =
> (HandlerChainsType) o.getValue();
> -
> - if (null == handlerChainsType ||
> handlerChainsType.getHandlerChain().size() == 0) {
> + if (null == handlerChainsType ||
> handlerChainsType.getHandlerChainArray() == null) {
> throw new WebServiceException("Chain not
> specified");
> }
> //We expect only one HandlerChainType here
> - hc = (HandlerChainType)
> handlerChainsType.getHandlerChain().iterator().next();
> + hc = handlerChainsType.getHandlerChainArray()[0];
> } catch (Exception e) {
> e.printStackTrace();
> throw new WebServiceException("Chain not
> specified", e);
> @@ -117,13 +109,13 @@
>
> protected List<Handler> buildHandlerChain(HandlerChainType hc,
> ClassLoader classLoader) {
> List<Handler> handlerChain = new ArrayList<Handler>();
> - for (PortComponentHandlerType ht : hc.getHandler()) {
> + for (PortComponentHandlerType ht : hc.getHandlerArray()) {
> try {
> - log.debug("loading handler :" + trimString
> (ht.getHandlerName().getValue()));
> + log.debug("loading handler :" + trimString
> (ht.getHandlerName().getStringValue()));
>
> Class<? extends Handler> handlerClass =
> Class.forName(
> trimString(ht.getHandlerClass()
> - .getValue()), true, classLoader)
> + .getStringValue()), true,
> classLoader)
> .asSubclass(Handler.class);
>
> Handler handler = handlerClass.newInstance();
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/Axis2HandlerResolver.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/
> Axis2HandlerResolver.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2HandlerResolver.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2HandlerResolver.java Tue Mar 20 13:15:06
> 2007
> @@ -1,9 +1,9 @@
> package org.apache.geronimo.axis2;
>
> -import org.apache.axis2.jaxws.javaee.HandlerChainType;
> -import org.apache.axis2.jaxws.javaee.HandlerChainsType;
> import org.apache.geronimo.jaxws.annotations.AnnotationException;
> import org.apache.geronimo.jaxws.annotations.AnnotationProcessor;
> +import org.apache.geronimo.xbeans.javaee.HandlerChainType;
> +import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
>
> import javax.xml.ws.WebServiceException;
> import javax.xml.ws.handler.Handler;
> @@ -41,7 +41,7 @@
> handlers = builder.buildHandlerChainFromClass
> (this.serviceClass);
> } else {
> handlers = new ArrayList<Handler>();
> - for (HandlerChainType handlerChain :
> this.handlerChains.getHandlerChain()) {
> + for (HandlerChainType handlerChain :
> this.handlerChains.getHandlerChainArray()) {
> handlers.addAll
> (builder.buildHandlerChainFromConfiguration(handlerChain));
> }
> handlers = builder.sortHandlers(handlers);
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/
> Axis2WebServiceContainer.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2WebServiceContainer.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/Axis2WebServiceContainer.java Tue Mar 20
> 13:15:06 2007
> @@ -17,25 +17,6 @@
>
> package org.apache.geronimo.axis2;
>
> -import java.io.IOException;
> -import java.io.PrintWriter;
> -import java.net.URI;
> -import java.net.URL;
> -import java.util.HashMap;
> -import java.util.Iterator;
> -import java.util.Map;
> -import java.util.concurrent.CountDownLatch;
> -
> -import javax.naming.Context;
> -import javax.servlet.ServletContext;
> -import javax.servlet.http.HttpServletRequest;
> -import javax.servlet.http.HttpServletResponse;
> -import javax.wsdl.Definition;
> -import javax.wsdl.factory.WSDLFactory;
> -import javax.wsdl.xml.WSDLWriter;
> -import javax.xml.namespace.QName;
> -import javax.xml.ws.WebServiceException;
> -
> import org.apache.axiom.om.util.UUIDGenerator;
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.Constants;
> @@ -71,6 +52,24 @@
> import org.apache.geronimo.webservices.saaj.SAAJUniverse;
> import org.apache.ws.commons.schema.XmlSchema;
>
> +import javax.naming.Context;
> +import javax.servlet.ServletContext;
> +import javax.servlet.http.HttpServletRequest;
> +import javax.servlet.http.HttpServletResponse;
> +import javax.wsdl.Definition;
> +import javax.wsdl.factory.WSDLFactory;
> +import javax.wsdl.xml.WSDLWriter;
> +import javax.xml.namespace.QName;
> +import javax.xml.ws.WebServiceException;
> +import java.io.IOException;
> +import java.io.PrintWriter;
> +import java.net.URI;
> +import java.net.URL;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +import java.util.concurrent.CountDownLatch;
> +
>
> public abstract class Axis2WebServiceContainer implements
> WebServiceContainer {
>
> @@ -534,18 +533,14 @@
> DependencyManager.initService(serviceGroupContext);
> //endpointInstance = msgContext.getServiceContext
> ().getProperty(ServiceContext.SERVICE_OBJECT);
>
> - setMsgContextProperties(msgContext, service, response,
> request);
> + setMsgContextProperties(msgContext, service, response,
> request);
>
> - try {
> - HTTPTransportUtils.processHTTPPostRequest(
> - msgContext,
> - request.getInputStream(),
> - response.getOutputStream(),
> - contenttype,
> - soapAction,
> - request.getURI().getPath());
> - } catch (Exception ex) {
> - //ignore
> - }
> + HTTPTransportUtils.processHTTPPostRequest(
> + msgContext,
> + request.getInputStream(),
> + response.getOutputStream(),
> + contenttype,
> + soapAction,
> + request.getURI().getPath());
> }
> }
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/AxisServiceGenerator.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/
> AxisServiceGenerator.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/AxisServiceGenerator.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/AxisServiceGenerator.java Tue Mar 20 13:15:06
> 2007
> @@ -16,30 +16,6 @@
> */
> package org.apache.geronimo.axis2;
>
> -import java.io.ByteArrayInputStream;
> -import java.io.ByteArrayOutputStream;
> -import java.io.IOException;
> -import java.io.InputStream;
> -import java.io.StringReader;
> -import java.lang.reflect.Method;
> -import java.net.MalformedURLException;
> -import java.net.URI;
> -import java.net.URL;
> -import java.util.HashMap;
> -import java.util.Iterator;
> -import java.util.List;
> -import java.util.Map;
> -
> -import javax.wsdl.Definition;
> -import javax.wsdl.Port;
> -import javax.wsdl.Service;
> -import javax.wsdl.WSDLException;
> -import javax.wsdl.factory.WSDLFactory;
> -import javax.wsdl.xml.WSDLReader;
> -import javax.wsdl.xml.WSDLWriter;
> -import javax.xml.namespace.QName;
> -import javax.xml.ws.WebServiceException;
> -
> import org.apache.axiom.om.OMElement;
> import org.apache.axiom.om.OMNamespace;
> import org.apache.axis2.Constants;
> @@ -73,6 +49,29 @@
> import org.apache.ws.commons.schema.XmlSchemaParticle;
> import org.apache.ws.commons.schema.XmlSchemaSequence;
> import org.apache.ws.commons.schema.XmlSchemaType;
> +
> +import javax.wsdl.Definition;
> +import javax.wsdl.Port;
> +import javax.wsdl.Service;
> +import javax.wsdl.WSDLException;
> +import javax.wsdl.factory.WSDLFactory;
> +import javax.wsdl.xml.WSDLReader;
> +import javax.wsdl.xml.WSDLWriter;
> +import javax.xml.namespace.QName;
> +import javax.xml.ws.WebServiceException;
> +import java.io.ByteArrayInputStream;
> +import java.io.ByteArrayOutputStream;
> +import java.io.IOException;
> +import java.io.InputStream;
> +import java.io.StringReader;
> +import java.lang.reflect.Method;
> +import java.net.MalformedURLException;
> +import java.net.URI;
> +import java.net.URL;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.List;
> +import java.util.Map;
>
> //TODO: Handle RPC Style Messaging
> //TODO: Handle Fault Messages
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/
> GeronimoHandlerChainBuilder.java?
> view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/GeronimoHandlerChainBuilder.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/GeronimoHandlerChainBuilder.java Tue Mar 20
> 13:15:06 2007
> @@ -1,8 +1,8 @@
> package org.apache.geronimo.axis2;
>
> -import org.apache.axis2.jaxws.javaee.HandlerChainType;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> +import org.apache.geronimo.xbeans.javaee.HandlerChainType;
>
> import javax.xml.namespace.QName;
> import javax.xml.ws.handler.Handler;
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/
> Axis2ServiceReference.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/client/Axis2ServiceReference.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/client/Axis2ServiceReference.java Tue Mar 20
> 13:15:06 2007
> @@ -1,7 +1,6 @@
> package org.apache.geronimo.axis2.client;
>
> import org.apache.axis2.jaxws.context.WebServiceContextImpl;
> -import org.apache.axis2.jaxws.javaee.HandlerChainsType;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> import org.apache.geronimo.axis2.Axis2HandlerResolver;
> @@ -11,6 +10,7 @@
> import org.apache.geronimo.jaxws.JNDIResolver;
> import org.apache.geronimo.jaxws.client.EndpointInfo;
> import org.apache.geronimo.jaxws.client.JAXWSServiceReference;
> +import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
>
> import javax.xml.bind.JAXBException;
> import javax.xml.namespace.QName;
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/ejb/EJBWebServiceContainer.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/
> EJBWebServiceContainer.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/ejb/EJBWebServiceContainer.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/ejb/EJBWebServiceContainer.java Tue Mar 20
> 13:15:06 2007
> @@ -17,13 +17,12 @@
>
> package org.apache.geronimo.axis2.ejb;
>
> -import java.net.URL;
> -
> -import javax.naming.Context;
> -
> import org.apache.axis2.util.JavaUtils;
> import org.apache.geronimo.axis2.Axis2WebServiceContainer;
> import org.apache.geronimo.jaxws.PortInfo;
> +
> +import javax.naming.Context;
> +import java.net.URL;
>
>
> public class EJBWebServiceContainer extends
> Axis2WebServiceContainer {
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/
> EJBWebServiceGBean.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/ejb/EJBWebServiceGBean.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/ejb/EJBWebServiceGBean.java Tue Mar 20
> 13:15:06 2007
> @@ -16,10 +16,6 @@
> */
> package org.apache.geronimo.axis2.ejb;
>
> -import java.net.URL;
> -
> -import javax.naming.Context;
> -
> import org.apache.geronimo.axis2.Axis2WebServiceContainer;
> import org.apache.geronimo.gbean.GBeanInfo;
> import org.apache.geronimo.gbean.GBeanInfoBuilder;
> @@ -29,6 +25,9 @@
> import org.apache.geronimo.kernel.Kernel;
> import org.apache.geronimo.openejb.EjbDeployment;
> import org.apache.geronimo.webservices.SoapHandler;
> +
> +import javax.naming.Context;
> +import java.net.URL;
>
> public class EJBWebServiceGBean implements GBeanLifecycle {
>
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/
> POJOWebServiceContainer.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContainer.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContainer.java Tue Mar 20
> 13:15:06 2007
> @@ -17,13 +17,6 @@
>
> package org.apache.geronimo.axis2.pojo;
>
> -import java.net.URL;
> -import java.util.List;
> -
> -import javax.naming.Context;
> -import javax.xml.ws.WebServiceException;
> -import javax.xml.ws.handler.Handler;
> -
> import org.apache.axis2.context.ConfigurationContext;
> import org.apache.axis2.context.MessageContext;
> import org.apache.axis2.context.ServiceContext;
> @@ -31,7 +24,6 @@
> import org.apache.axis2.description.AxisService;
> import org.apache.axis2.engine.DependencyManager;
> import org.apache.axis2.jaxws.binding.BindingImpl;
> -import org.apache.axis2.jaxws.javaee.HandlerChainsType;
> import org.apache.axis2.jaxws.server.JAXWSMessageReceiver;
> import org.apache.axis2.transport.http.HTTPConstants;
> import org.apache.axis2.transport.http.HTTPTransportUtils;
> @@ -42,6 +34,13 @@
> import org.apache.geronimo.jaxws.JNDIResolver;
> import org.apache.geronimo.jaxws.PortInfo;
> import org.apache.geronimo.jaxws.annotations.AnnotationException;
> +import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
> +
> +import javax.naming.Context;
> +import javax.xml.ws.WebServiceException;
> +import javax.xml.ws.handler.Handler;
> +import java.net.URL;
> +import java.util.List;
>
>
> public class POJOWebServiceContainer extends
> Axis2WebServiceContainer {
> @@ -68,7 +67,7 @@
> DependencyManager.initService(serviceGroupContext);
> endpointInstance = msgContext.getServiceContext
> ().getProperty(ServiceContext.SERVICE_OBJECT);
>
> - super.setMsgContextProperties(msgContext, service,
> response, request);
> + setMsgContextProperties(msgContext, service, response,
> request);
> annotationProcessor = new JAXWSAnnotationProcessor
> (jndiResolver,
> new POJOWebServiceContext(msgContext));
> init();
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/pojo/
> POJOWebServiceContainerFactoryGBean.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/
> POJOWebServiceContainerFactoryGBean.java?
> view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java
> (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java
> Tue Mar 20 13:15:06 2007
> @@ -17,13 +17,6 @@
>
> package org.apache.geronimo.axis2.pojo;
>
> -import java.net.URL;
> -import java.util.Map;
> -
> -import javax.naming.Context;
> -import javax.naming.NamingException;
> -import javax.transaction.TransactionManager;
> -
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> import org.apache.geronimo.gbean.GBeanInfo;
> @@ -34,6 +27,12 @@
> import org.apache.geronimo.transaction.GeronimoUserTransaction;
> import org.apache.geronimo.webservices.WebServiceContainer;
> import org.apache.geronimo.webservices.WebServiceContainerFactory;
> +
> +import javax.naming.Context;
> +import javax.naming.NamingException;
> +import javax.transaction.TransactionManager;
> +import java.net.URL;
> +import java.util.Map;
>
> public class POJOWebServiceContainerFactoryGBean implements
> WebServiceContainerFactory {
>
>
> Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/
> java/org/apache/geronimo/axis2/pojo/POJOWebServiceContext.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
> geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/
> POJOWebServiceContext.java?view=diff&rev=520551&r1=520550&r2=520551
> ======================================================================
> ========
> --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContext.java (original)
> +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/
> apache/geronimo/axis2/pojo/POJOWebServiceContext.java Tue Mar 20
> 13:15:06 2007
> @@ -1,11 +1,11 @@
> package org.apache.geronimo.axis2.pojo;
>
> -import org.apache.axis2.transport.http.HTTPConstants;
> import org.apache.axis2.jaxws.handler.LogicalMessageContext;
> +import org.apache.axis2.transport.http.HTTPConstants;
>
> +import javax.servlet.http.HttpServletRequest;
> import javax.xml.ws.WebServiceContext;
> import javax.xml.ws.handler.MessageContext;
> -import javax.servlet.http.HttpServletRequest;
> import java.security.Principal;
>
> /**
>
>
Re: svn commit: r520551 - in /geronimo/server/trunk/modules: geronimo-axis2-builder/ geronimo-axis2/ geronimo-axis2/src/main/generated/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/ g...
Posted by Jason Dillon <ja...@planet57.com>.
I've updated the pom's config... and patched Axis2HandlerResolverTest
to compile, but it fails... so I disabled it. Hopefully dims or
jarek can get this sorted.
--jason
On Mar 20, 2007, at 3:58 PM, Kevan Miller wrote:
>
> On Mar 20, 2007, at 6:21 PM, Jason Dillon wrote:
>
>> You removed the src/main/generated bits, but you did not remove
>> the pom configuration which hooked this up.
>>
>> Also, the Axis2HandlerResolverTest is currently broken as its
>> trying to reference org.apache.axis2.jaxws.javaee.HandlerChainsType
>
> Dims was working to get this in just before he left for the
> airport. Jarek has fixed up the tests, now. Not sure about the pom
> configuration...
>
> --kevan
>
Re: svn commit: r520551 - in /geronimo/server/trunk/modules: geronimo-axis2-builder/ geronimo-axis2/ geronimo-axis2/src/main/generated/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/ g...
Posted by Kevan Miller <ke...@gmail.com>.
On Mar 20, 2007, at 6:21 PM, Jason Dillon wrote:
> You removed the src/main/generated bits, but you did not remove the
> pom configuration which hooked this up.
>
> Also, the Axis2HandlerResolverTest is currently broken as its
> trying to reference org.apache.axis2.jaxws.javaee.HandlerChainsType
Dims was working to get this in just before he left for the airport.
Jarek has fixed up the tests, now. Not sure about the pom
configuration...
--kevan