You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/07/11 16:50:55 UTC
karaf-cellar git commit: Fix javadoc
Repository: karaf-cellar
Updated Branches:
refs/heads/master b72171c8d -> aa6e628e7
Fix javadoc
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/aa6e628e
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/aa6e628e
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/aa6e628e
Branch: refs/heads/master
Commit: aa6e628e72d52cb3ecfc4921bf0ce873d1e2a0af
Parents: b72171c
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Jul 11 18:50:46 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Jul 11 18:50:46 2016 +0200
----------------------------------------------------------------------
.../org/apache/karaf/cellar/config/ConfigurationSupport.java | 1 -
.../java/org/apache/karaf/cellar/core/command/Command.java | 2 +-
.../apache/karaf/cellar/core/discovery/DiscoveryService.java | 6 +++---
.../cellar/http/balancer/CellarBalancerProxyServlet.java | 8 ++++----
4 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/aa6e628e/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
index 646ff9a..58a4058 100644
--- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
+++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
@@ -142,7 +142,6 @@ public class ConfigurationSupport extends CellarSupport {
* @param admin the configuration admin service.
* @param pid the configuration PID to store.
* @param props the properties to store, linked to the configuration PID.
- * @throws Exception in case of store failure.
*/
protected void persistConfiguration(ConfigurationAdmin admin, String pid, Dictionary props) {
try {
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/aa6e628e/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java b/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
index db89cb5..e708a2b 100644
--- a/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
+++ b/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
@@ -92,7 +92,7 @@ public class Command<R extends Result> extends Event {
* If no result is found, it returns an empty map.
*
* @return a map of results.
- * @throws Exception in case of interruption.
+ * @throws InterruptedException in case of interruption.
*/
public Map<Node, R> getResult() throws InterruptedException {
Map<Node, R> nodeResults = null;
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/aa6e628e/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryService.java b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryService.java
index 3a104b5..463fa39 100644
--- a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryService.java
+++ b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryService.java
@@ -18,17 +18,17 @@ import java.util.Set;
public interface DiscoveryService {
/**
- * Sign In to the {@link BlackboardDiscoveryService}.
+ * Sign In to the {@link DiscoveryService}.
*/
void signIn();
/**
- * Refresh to the {@link BlackboardDiscoveryService}.
+ * Refresh to the {@link DiscoveryService}.
*/
void refresh();
/**
- * Sign Out of the {@link BlackboardDiscoveryService}.
+ * Sign Out of the {@link DiscoveryService}.
*/
void signOut();
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/aa6e628e/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/CellarBalancerProxyServlet.java
----------------------------------------------------------------------
diff --git a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/CellarBalancerProxyServlet.java b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/CellarBalancerProxyServlet.java
index edcf672..6e8493d 100644
--- a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/CellarBalancerProxyServlet.java
+++ b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/CellarBalancerProxyServlet.java
@@ -287,7 +287,7 @@ public class CellarBalancerProxyServlet extends HttpServlet {
/**
* These are the "hop-by-hop" headers that should not be copied.
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html
- * I use an HttpClient HeaderGroup class instead of Set<String> because this
+ * I use an HttpClient HeaderGroup class instead of Set of String because this
* approach does case insensitive lookup faster.
*/
protected static final HeaderGroup hopByHopHeaders;
@@ -492,13 +492,13 @@ public class CellarBalancerProxyServlet extends HttpServlet {
/**
* Encodes characters in the query or fragment part of the URI.
- * <p/>
+ *
* <p>Unfortunately, an incoming URI sometimes has characters disallowed by the spec. HttpClient
* insists that the outgoing proxied request has a valid URI because it uses Java's {@link URI}.
* To be more forgiving, we must escape the problematic characters. See the URI class for the
- * spec.
+ * spec.</p>
*
- * @param in example: name=value&foo=bar#fragment
+ * @param in The {@link CharSequence} to encode.
*/
protected static CharSequence encodeUriQuery(CharSequence in) {
//Note that I can't simply use URI.java to encode because it will escape pre-existing escaped things.