cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r613942 - in /incubator/cxf/branches/2.0.x-fixes: maven-plugins/archetypes/cxf-http-basic/ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/frontend/jaxws/src/main/resources/META-INF/cxf/
Date Mon, 21 Jan 2008 17:21:50 GMT
Author: dkulp
Date: Mon Jan 21 09:21:49 2008
New Revision: 613942

URL: http://svn.apache.org/viewvc?rev=613942&view=rev
Log:
Merge a couple minor fixes from trunk

Modified:
    incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/cxf-http-basic/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml

Modified: incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/cxf-http-basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/cxf-http-basic/pom.xml?rev=613942&r1=613941&r2=613942&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/cxf-http-basic/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/cxf-http-basic/pom.xml Mon
Jan 21 09:21:49 2008
@@ -32,6 +32,7 @@
     <url>http://cwiki.apache.org/CXF</url>
     <properties>
         <maven.test.skip>true</maven.test.skip>
+        <eclipse.skip>true</eclipse.skip>
     </properties>
     <build>
         <resources>

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=613942&r1=613941&r2=613942&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Mon Jan 21 09:21:49 2008
@@ -586,8 +586,8 @@
         } catch (Fault ex) {
             ex.fillInStackTrace();
             throw ex;
-        } catch (Exception ex) {                        
-            if (ex instanceof javax.xml.bind.UnmarshalException) {                
+        } catch (Throwable ex) {
+            if (ex instanceof javax.xml.bind.UnmarshalException) {
                 javax.xml.bind.UnmarshalException unmarshalEx = (javax.xml.bind.UnmarshalException)ex;
                 throw new Fault(new Message("UNMARSHAL_ERROR", 
                                             BUNDLE, unmarshalEx.getLinkedException().getMessage()),
ex); 

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml?rev=613942&r1=613941&r2=613942&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
Mon Jan 21 09:21:49 2008
@@ -26,4 +26,6 @@
     
     <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" 
 	  id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
+    <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl" 
+	  id="org.apache.cxf.jaxws.context.WebServiceContextImpl"/>
 </beans>



Mime
View raw message