cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1304355 - in /cxf/trunk: distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootst...
Date Fri, 23 Mar 2012 14:08:42 GMT
Author: sergeyb
Date: Fri Mar 23 14:08:42 2012
New Revision: 1304355

URL: http://svn.apache.org/viewvc?rev=1304355&view=rev
Log:
[CXF-4193] Fixing the log browser demo

Modified:
    cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ContextProvider.java
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
    cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextProvider.java

Modified: cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java?rev=1304355&r1=1304354&r2=1304355&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
Fri Mar 23 14:08:42 2012
@@ -41,6 +41,8 @@ public class App extends Application {
         classes.add(new BootstrapStorage(new SimpleXMLSettingsStorage()));
         classes.add(new BootstrapStorage.StaticFileProvider());
         classes.add(new BootstrapStorage.SettingsProvider());
+        // this provider will have to be discovered via the class-scanning
+        classes.add(new org.apache.cxf.jaxrs.ext.search.SearchContextProvider()); 
 
         // The pull server
         AtomPullServer aps = new AtomPullServer();

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ContextProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ContextProvider.java?rev=1304355&r1=1304354&r2=1304355&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ContextProvider.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ContextProvider.java
Fri Mar 23 14:08:42 2012
@@ -20,6 +20,15 @@ package org.apache.cxf.jaxrs.ext;
 
 import org.apache.cxf.message.Message;
 
+/**
+ * Provider of custom contexts representing the current request
+ * @param <T> Context class
+ */
 public interface ContextProvider<T> {
+    /**
+     * Creates the context instance
+     * @param message the current message
+     * @return the context
+     */
     T createContext(Message message);
 }

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java?rev=1304355&r1=1304354&r2=1304355&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
(original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
Fri Mar 23 14:08:42 2012
@@ -200,7 +200,7 @@ public class BootstrapStorage {
     }
 
     @Provider
-    public static class SettingsProvider extends JSONProvider<String> {
+    public static class SettingsProvider extends JSONProvider<Object> {
         private static final String LOGGING_NAMESPACE = "http://cxf.apache.org/log";
         private static final String SUBSCRIPTIONS_ARRAY = "subscriptions";
 

Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextProvider.java?rev=1304355&r1=1304354&r2=1304355&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextProvider.java
(original)
+++ cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextProvider.java
Fri Mar 23 14:08:42 2012
@@ -18,9 +18,12 @@
  */
 package org.apache.cxf.jaxrs.ext.search;
 
+import javax.ws.rs.ext.Provider;
+
 import org.apache.cxf.jaxrs.ext.ContextProvider;
 import org.apache.cxf.message.Message;
 
+@Provider
 public class SearchContextProvider implements ContextProvider<SearchContext> {
 
     public SearchContext createContext(Message message) {



Mime
View raw message