cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1366455 - in /cxf/trunk/systests/jaxrs/src/test: java/org/apache/cxf/systest/jaxrs/BookStoreSimple.java java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java resources/jaxrs/WEB-INF/beans.xml resources/jaxrs_spring/WEB-INF/beans.xml
Date Fri, 27 Jul 2012 17:01:15 GMT
Author: sergeyb
Date: Fri Jul 27 17:01:15 2012
New Revision: 1366455

URL: http://svn.apache.org/viewvc?rev=1366455&view=rev
Log:
[CXF-4444] Updating system jaxrs tests

Modified:
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSimple.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSimple.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSimple.java?rev=1366455&r1=1366454&r2=1366455&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSimple.java
(original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSimple.java
Fri Jul 27 17:01:15 2012
@@ -18,12 +18,18 @@
  */
 package org.apache.cxf.systest.jaxrs;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 @Path("/simplebooks/{id}")
 public class BookStoreSimple {
+    @Resource
+    private Book injectedBook; 
+    
+    
     @GET
     public Book getBook(@PathParam("id") long id) {
         return new Book("Simple", id);    
@@ -34,4 +40,10 @@ public class BookStoreSimple {
     public Book getBook2(@PathParam("id") long id) {
         return getBook(id);    
     }
+    @PostConstruct
+    public void postConstruct() {
+        if (injectedBook == null) {
+            throw new IllegalStateException("Book resource has not been injected");
+        }    
+    }
 }

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java?rev=1366455&r1=1366454&r2=1366455&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
(original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
Fri Jul 27 17:01:15 2012
@@ -26,7 +26,6 @@ import java.util.Map;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.MatrixParam;
@@ -58,8 +57,6 @@ public class BookStoreSpring {
     @Context
     private UriInfo ui;    
     private boolean postConstructCalled;
-    @Resource
-    private Book injectedBook; 
     
     public BookStoreSpring() {
         init();
@@ -69,9 +66,6 @@ public class BookStoreSpring {
     
     @PostConstruct
     public void postConstruct() {
-        if (injectedBook == null) {
-            throw new IllegalStateException("Book resource has not been injected");
-        }    
         postConstructCalled = true;
     }
     

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml?rev=1366455&r1=1366454&r2=1366455&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml Fri Jul 27 17:01:15
2012
@@ -43,7 +43,6 @@ http://cxf.apache.org/schemas/core.xsd">
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
   <bean class="org.apache.cxf.systest.jaxrs.BookStoreSpring" id="serviceBean"/>
-  <bean class="org.apache.cxf.systest.jaxrs.Book"/>
   
   <jaxrs:server id="bookservice"
 		        address="/bookstore">

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml?rev=1366455&r1=1366454&r2=1366455&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml Fri Jul 27
17:01:15 2012
@@ -29,6 +29,8 @@ http://cxf.apache.org/schemas/jaxrs.xsd"
   <import resource="classpath:META-INF/cxf/cxf.xml" />
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
   
+  <bean class="org.apache.cxf.systest.jaxrs.Book"/>
+  
   <jaxrs:server id="bookservice"
 		        address="/rest">
     <jaxrs:serviceBeans>



Mime
View raw message