geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r524353 - in /geronimo/server/trunk/modules/geronimo-axis2/src: main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java
Date Sat, 31 Mar 2007 02:09:57 GMT
Author: dims
Date: Fri Mar 30 19:09:56 2007
New Revision: 524353

URL: http://svn.apache.org/viewvc?view=rev&rev=524353
Log:
re-org imports, catch Exception instead of more specific XmlException

Modified:
    geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
    geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java

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=524353&r1=524352&r2=524353
==============================================================================
--- 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
Fri Mar 30 19:09:56 2007
@@ -17,12 +17,6 @@
 
 package org.apache.geronimo.axis2.client;
 
-import java.net.URI;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.HandlerResolver;
-
 import org.apache.axis2.jaxws.context.WebServiceContextImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -34,7 +28,11 @@
 import org.apache.geronimo.jaxws.client.JAXWSServiceReference;
 import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
 import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
-import org.apache.xmlbeans.XmlException;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.HandlerResolver;
+import java.net.URI;
+import java.util.Map;
 
 /**
  * @version $Rev$ $Date$
@@ -60,7 +58,7 @@
                 return null;
             else
                 return HandlerChainsDocument.Factory.parse(this.handlerChainsXML).getHandlerChains();
-        } catch (XmlException e) {
+        } catch (Exception e) {
             log.warn("Failed to deserialize handler chains", e);
             return null;
         }

Modified: geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java?view=diff&rev=524353&r1=524352&r2=524353
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis2/src/test/java/org/apache/geronimo/axis2/Axis2HandlerResolverTest.java
Fri Mar 30 19:09:56 2007
@@ -19,12 +19,10 @@
 import org.apache.geronimo.testsupport.TestSupport;
 import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
 import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
-import org.apache.xmlbeans.XmlException;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.handler.Handler;
 import javax.xml.ws.handler.PortInfo;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
@@ -161,7 +159,7 @@
         assertEquals(1, handlers.size());
     }
     
-    private static HandlerChainsType toHandlerChains(InputStream input) throws IOException,
XmlException {
+    private static HandlerChainsType toHandlerChains(InputStream input) throws Exception
{
         return HandlerChainsDocument.Factory.parse(input).getHandlerChains();
     }
     



Mime
View raw message