svn commit: r1053858 - in /cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/

[sergeyb]

Author: sergeyb
Date: Thu Dec 30 11:38:41 2010
New Revision: 1053858

URL: http://svn.apache.org/viewvc?rev=1053858&view=rev
Log:
[JAX-RS] Updating the property name

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1053858&r1=1053857&r2=1053858&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
 Thu Dec 30 11:38:41 2010
@@ -109,7 +109,7 @@ public final class JAXRSUtils {
     
     private static final Logger LOG = LogUtils.getL7dLogger(JAXRSUtils.class);
     private static final ResourceBundle BUNDLE = 
BundleUtils.getBundle(JAXRSUtils.class);
-    private static final String PROPOGATE_EXCEPTION = 
"org.apache.cxf.propogate.exception";
+    private static final String PROPOGATE_EXCEPTION = 
"org.apache.cxf.propagate.exception";
     private static final String FORM_PARAM_MAP = JAXRSUtils.class.getName() + 
".FORM_DATA";
 
     private JAXRSUtils() {        

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1053858&r1=1053857&r2=1053858&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
 Thu Dec 30 11:38:41 2010
@@ -150,20 +150,20 @@ public class BookStore {
     }
     
     @GET
-    @Path("propogateexception")
+    @Path("propagate-exception")
     public Book propogateException() throws BookNotFoundFault {
         throw new BookNotFoundFault("Book Exception");
     }
     
     @GET
-    @Path("propogateexception2")
+    @Path("propagate-exception2")
     public Book propogateException2() throws BookNotFoundFault {
-        
PhaseInterceptorChain.getCurrentMessage().put("org.apache.cxf.propogate.exception",
 Boolean.FALSE);
+        
PhaseInterceptorChain.getCurrentMessage().put("org.apache.cxf.propagate.exception",
 Boolean.FALSE);
         throw new BookNotFoundFault("Book Exception");
     }
     
     @GET
-    @Path("propogateexception3")
+    @Path("propagate-exception3")
     public Book propogateException3() throws BookNotFoundFault {
         PhaseInterceptorChain.getCurrentMessage().getExchange()
             .put("org.apache.cxf.systest.for-out-fault-interceptor", 
Boolean.TRUE);

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1053858&r1=1053857&r2=1053858&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
 Thu Dec 30 11:38:41 2010
@@ -141,7 +141,7 @@ public class JAXRSClientServerBookTest e
     
     @Test
     public void testPropogateException() throws Exception {
-        getAndCompare("http://localhost:"; + PORT + 
"/bookstore/propogateexception",
+        getAndCompare("http://localhost:"; + PORT + 
"/bookstore/propagate-exception",
                       "", "application/xml", 500);
     }
     
@@ -151,14 +151,14 @@ public class JAXRSClientServerBookTest e
             + "<ns1:faultstring 
xmlns:ns1=\"http://cxf.apache.org/bindings/xformat\";>"
             + "org.apache.cxf.systest.jaxrs.BookNotFoundFault: Book 
Exception</ns1:faultstring>"
             + "</ns1:XMLFault>";
-        getAndCompare("http://localhost:"; + PORT + 
"/bookstore/propogateexception2",
+        getAndCompare("http://localhost:"; + PORT + 
"/bookstore/propagate-exception2",
                       data, "application/xml", 500);
     }
     
     @Test
     public void testPropogateException3() throws Exception {
         String data = "<nobook/>";
-        getAndCompare("http://localhost:"; + PORT + 
"/bookstore/propogateexception3",
+        getAndCompare("http://localhost:"; + PORT + 
"/bookstore/propagate-exception3",
                       data, "application/xml", 500);
     }