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

[dkulp]

Author: dkulp
Date: Tue Mar 13 18:04:01 2012
New Revision: 1300260

URL: http://svn.apache.org/viewvc?rev=1300260&view=rev
Log:
Fix some compile errors and warnings

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=1300260&r1=1300259&r2=1300260&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 Tue Mar 13 18:04:01 2012
@@ -869,9 +869,9 @@ public final class InjectionUtils {
             proxy = createThreadLocalServletApiContext(type.getName());  
         }
         if (proxy == null) {
-            return 
(ThreadLocalProxy)Proxy.newProxyInstance(type.getClassLoader(),
+            return 
(ThreadLocalProxy<T>)Proxy.newProxyInstance(type.getClassLoader(),
                                    new Class[] {type, ThreadLocalProxy.class },
-                                   new ThreadLocalInvocationHandler());
+                                   new ThreadLocalInvocationHandler<T>());
         }
         
         return (ThreadLocalProxy<T>)proxy;

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java?rev=1300260&r1=1300259&r2=1300260&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
 Tue Mar 13 18:04:01 2012
@@ -27,7 +27,6 @@ import java.util.Map;
 
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
-import org.apache.cxf.jaxrs.ext.search.SearchContextProvider;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.apache.cxf.jaxrs.provider.BinaryDataProvider;
 import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
@@ -56,7 +55,6 @@ public class BookServer extends Abstract
         providers.add(new FormatResponseHandler());
         providers.add(new GenericHandlerWriter());
         providers.add(new FaultyRequestHandler());
-        providers.add(new SearchContextProvider());
         sf.setProviders(providers);
         List<Interceptor<? extends Message>> outInts = new 
ArrayList<Interceptor<? extends Message>>();
         outInts.add(new CustomOutInterceptor());