CAMEL-7999: More components include documentation

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4d762f5e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4d762f5e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4d762f5e

Branch: refs/heads/master
Commit: 4d762f5e838d5a476a26c70c8435df95546f3223
Parents: 0a173c0
Author: Claus Ibsen <davscl...@apache.org>
Authored: Fri Jan 2 16:02:49 2015 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Fri Jan 2 16:02:49 2015 +0100

----------------------------------------------------------------------
 .../component/javaspace/JavaSpaceComponent.java |  7 +++---
 .../component/javaspace/JavaSpaceConsumer.java  |  5 ++--
 .../component/javaspace/JavaSpaceEndpoint.java  | 25 +++++++++++++++++---
 .../component/javaspace/JavaSpaceProducer.java  |  4 ++--
 4 files changed, 30 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4d762f5e/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
----------------------------------------------------------------------
diff --git 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
index 50b57a6..cea22a0 100644
--- 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
+++ 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
@@ -21,20 +21,21 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ExchangePattern;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
 
 /**
  * The component for using the JavaSpaces library
  * 
  * @version 
  */
-public class JavaSpaceComponent extends DefaultComponent {
+public class JavaSpaceComponent extends UriEndpointComponent {
 
     public JavaSpaceComponent() {
+        super(JavaSpaceEndpoint.class);
     }
 
     public JavaSpaceComponent(CamelContext context) {
-        super(context);
+        super(context, JavaSpaceEndpoint.class);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/4d762f5e/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
index 7f302f9..4001a6e 100644
--- 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
+++ 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
@@ -32,7 +32,6 @@ import net.jini.core.transaction.CannotCommitException;
 import net.jini.core.transaction.Transaction;
 import net.jini.core.transaction.UnknownTransactionException;
 import net.jini.space.JavaSpace;
-
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
@@ -83,10 +82,10 @@ public class JavaSpaceConsumer extends DefaultConsumer {
         if (this.verb.equalsIgnoreCase("read")) {
             verb = READ;
         }
-        javaSpace = JiniSpaceAccessor.findSpace(((JavaSpaceEndpoint) 
this.getEndpoint()).getRemaining(),
+        javaSpace = JiniSpaceAccessor.findSpace(((JavaSpaceEndpoint) 
this.getEndpoint()).getUrl(),
                 ((JavaSpaceEndpoint) this.getEndpoint()).getSpaceName());
         if (transactional) {
-            transactionHelper = 
TransactionHelper.getInstance(((JavaSpaceEndpoint) 
this.getEndpoint()).getRemaining());
+            transactionHelper = 
TransactionHelper.getInstance(((JavaSpaceEndpoint) 
this.getEndpoint()).getUrl());
         }
         for (int i = 0; i < concurrentConsumers; ++i) {
             Task worker = new Task((JavaSpaceEndpoint) this.getEndpoint(), 
this.getProcessor(), javaSpace,

http://git-wip-us.apache.org/repos/asf/camel/blob/4d762f5e/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
----------------------------------------------------------------------
diff --git 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
index d4e05a8..764bf59 100644
--- 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
+++ 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceEndpoint.java
@@ -23,25 +23,36 @@ import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
 
 /**
  * @version 
  */
+@UriEndpoint(scheme = "javaspace", consumerClass = JavaSpaceConsumer.class, 
label = "messaging")
 public class JavaSpaceEndpoint extends DefaultEndpoint {
 
-    private final String remaining;
     private final Map<?, ?> parameters;
 
+    @UriPath
+    private final String url;
+    @UriParam(defaultValue = "1")
     private int concurrentConsumers = 1;
+    @UriParam
     private String spaceName;
+    @UriParam(defaultValue = "false")
     private boolean transactional;
+    @UriParam
     private long transactionTimeout = Long.MAX_VALUE;
+    @UriParam(defaultValue = "take")
     private String verb = "take";
+    @UriParam
     private String templateId;
 
     public JavaSpaceEndpoint(String endpointUri, String remaining, Map<?, ?> 
parameters, JavaSpaceComponent component) {
         super(endpointUri, component);
-        this.remaining = remaining;
+        this.url = remaining;
         this.parameters = parameters;
     }
     
@@ -74,8 +85,16 @@ public class JavaSpaceEndpoint extends DefaultEndpoint {
         return true;
     }
 
+    /**
+     * @deprecated use {@link #getUrl()}
+     */
+    @Deprecated
     public String getRemaining() {
-        return remaining;
+        return url;
+    }
+
+    public String getUrl() {
+        return url;
     }
 
     public Map<?, ?> getParameters() {

http://git-wip-us.apache.org/repos/asf/camel/blob/4d762f5e/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java
 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java
index f695984..ab811d2 100644
--- 
a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java
+++ 
b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceProducer.java
@@ -118,10 +118,10 @@ public class JavaSpaceProducer extends DefaultProducer {
     protected void doStart() throws Exception {
         // TODO: There should be a switch to enable/disable using this 
security hack
         Utility.setSecurityPolicy("policy.all", "policy_producer.all");
-        javaSpace = JiniSpaceAccessor.findSpace(((JavaSpaceEndpoint) 
this.getEndpoint()).getRemaining(),
+        javaSpace = JiniSpaceAccessor.findSpace(((JavaSpaceEndpoint) 
this.getEndpoint()).getUrl(),
                 ((JavaSpaceEndpoint) this.getEndpoint()).getSpaceName());
         if (transactional) {
-            transactionHelper = 
TransactionHelper.getInstance(((JavaSpaceEndpoint) 
this.getEndpoint()).getRemaining());
+            transactionHelper = 
TransactionHelper.getInstance(((JavaSpaceEndpoint) 
this.getEndpoint()).getUrl());
         }
         (new File("policy_producer.all")).delete();
     }

Reply via email to