cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r831915 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/ parent/ rt/core/src/main/java/org/apache/cxf/service/invoker/ rt/databinding/aegis/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/ rt/databinding/a...
Date Mon, 02 Nov 2009 15:16:47 GMT
Author: dkulp
Date: Mon Nov  2 15:16:44 2009
New Revision: 831915

URL: http://svn.apache.org/viewvc?rev=831915&view=rev
Log:
Merged revisions 831600,831605 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r831600 | bimargulies | 2009-10-31 18:07:27 -0400 (Sat, 31 Oct 2009) | 2 lines
  
  As a result of CXF-1471, add unit test for GET against Aegis+JAX-WS, and improve error message
when
  using GET against an operation that isn't there.
........
  r831605 | bimargulies | 2009-10-31 18:17:10 -0400 (Sat, 31 Oct 2009) | 1 line
  
  Add test for use of Simple front end and no annotations.
........

Added:
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/
      - copied from r831605, cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java
      - copied unchanged from r831605, cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/jaxws/AegisJaxwsGetTest.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java
    cxf/branches/2.2.x-fixes/parent/pom.xml
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/Messages.properties
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:831600-831605

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java?rev=831915&r1=831914&r2=831915&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java (original)
+++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java Mon Nov  2 15:16:44
2009
@@ -42,7 +42,7 @@
     /** 
      * Creates a new bus. 
      * While concrete <code>BusFactory</code> may offer differently
-     * parametrized methods for creating a bus, all factories support
+     * parameterized methods for creating a bus, all factories support
      * this no-arg factory method.
      *
      * @return the newly created bus.

Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=831915&r1=831914&r2=831915&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Mon Nov  2 15:16:44 2009
@@ -786,6 +786,11 @@
                 </exclusions>
             </dependency>
             <dependency>
+              <groupId>commons-codec</groupId>
+              <artifactId>commons-codec</artifactId>
+              <version>1.3</version>
+            </dependency>
+            <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>1.1.1</version>

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=831915&r1=831914&r2=831915&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
Mon Nov  2 15:16:44 2009
@@ -52,6 +52,11 @@
         try {
 
             BindingOperationInfo bop = exchange.get(BindingOperationInfo.class);
+            if (bop == null) {
+                LOG.severe(new Message("MISSING_BINDING_OPERATION", LOG).toString());
+                throw new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG, 
+                                             "No binding operation info", "unknown method",
"unknown"));
+            }
             MethodDispatcher md = (MethodDispatcher) 
                 exchange.get(Service.class).get(MethodDispatcher.class.getName());
             Method m = md.getMethod(bop);

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/Messages.properties?rev=831915&r1=831914&r2=831915&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/Messages.properties
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/Messages.properties
Mon Nov  2 15:16:44 2009
@@ -26,3 +26,4 @@
 EXCEPTION_INVOKING_OBJECT={0} while invoking {1} with params {2}.
 SUSPENDED_INVOCATION_EXCEPTION=Invocation of method {1} on object {0} with params {2} has
been suspended.
 INVOKING_METHOD=Invoking method {1} on object {0} with params {2}.
+MISSING_BINDING_OPERATION= Invocation without a binding operation.

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml?rev=831915&r1=831914&r2=831915&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml Mon Nov  2 15:16:44 2009
@@ -96,6 +96,16 @@
             <scope>test</scope>
         </dependency-->
 
+        <dependency>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+          <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java?rev=831915&r1=831914&r2=831915&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
Mon Nov  2 15:16:44 2009
@@ -18,13 +18,19 @@
  */
 package org.apache.cxf.aegis.services;
 
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+
 /**
- * Echo
- * 
- * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
+ * Simple echo service.
  */
 public class Echo {
-    public String echo(String echo) {
+    @WebMethod
+    public String echo(@WebParam(name = "echo") String echo) {
         return echo;
     }
+    
+    public String simpleEcho(String string) {
+        return string;
+    }
 }



Mime
View raw message