camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-7999: apt compiler to generate json schema documentation for the model, whcih we later use to enrich the xml xsd to include documentation. Work in progress.
Date Fri, 02 Jan 2015 16:01:43 GMT
Repository: camel
Updated Branches:
  refs/heads/master ac54279f2 -> bdcbf6d2c


CAMEL-7999: apt compiler to generate json schema documentation for the model, whcih we later
use to enrich the xml xsd to include documentation. Work in progress.


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

Branch: refs/heads/master
Commit: bdcbf6d2c4b63f1ba3fdd402c0162da61be535ca
Parents: ac54279
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Jan 2 17:01:07 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Jan 2 17:01:07 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/model/RestContextRefDefinition.java     | 2 ++
 .../java/org/apache/camel/model/rest/DeleteVerbDefinition.java    | 3 +++
 .../main/java/org/apache/camel/model/rest/GetVerbDefinition.java  | 3 +++
 .../main/java/org/apache/camel/model/rest/HeadVerbDefinition.java | 3 +++
 .../main/java/org/apache/camel/model/rest/PostVerbDefinition.java | 3 +++
 .../main/java/org/apache/camel/model/rest/PutVerbDefinition.java  | 3 +++
 .../java/org/apache/camel/model/rest/RestBindingDefinition.java   | 2 ++
 .../main/java/org/apache/camel/model/rest/RestBindingMode.java    | 3 +++
 .../org/apache/camel/model/rest/RestConfigurationDefinition.java  | 2 ++
 .../src/main/java/org/apache/camel/model/rest/RestDefinition.java | 2 ++
 .../java/org/apache/camel/model/rest/RestHostNameResolver.java    | 3 +++
 .../java/org/apache/camel/model/rest/RestPropertyDefinition.java  | 3 +++
 .../main/java/org/apache/camel/model/rest/RestsDefinition.java    | 2 ++
 .../src/main/java/org/apache/camel/model/rest/VerbDefinition.java | 2 ++
 14 files changed, 36 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
index 7f8e7ca..8a1251a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
@@ -24,12 +24,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.rest.RestDefinition;
+import org.apache.camel.spi.Label;
 
 /**
  * Represents an XML &lt;restContextRef/&gt; element
  *
  * @version 
  */
+@Label("rest")
 @XmlRootElement(name = "restContextRef")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class RestContextRefDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
index 990819a..96cd4a5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
@@ -20,6 +20,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.camel.spi.Label;
+
+@Label("rest")
 @XmlRootElement(name = "delete")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class DeleteVerbDefinition extends VerbDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
index f3e398e..c95b4b4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
@@ -20,6 +20,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.camel.spi.Label;
+
+@Label("rest")
 @XmlRootElement(name = "get")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class GetVerbDefinition extends VerbDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
index abcd2f9..77cdf8b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
@@ -20,6 +20,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.camel.spi.Label;
+
+@Label("rest")
 @XmlRootElement(name = "head")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class HeadVerbDefinition extends VerbDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
index a5d2fb0..507b419 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
@@ -20,6 +20,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.camel.spi.Label;
+
+@Label("rest")
 @XmlRootElement(name = "post")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class PostVerbDefinition extends VerbDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
index b1f4541..a4912a3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
@@ -20,6 +20,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.camel.spi.Label;
+
+@Label("rest")
 @XmlRootElement(name = "put")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class PutVerbDefinition extends VerbDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
index 197bcf6..6ee4c8b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
@@ -29,9 +29,11 @@ import org.apache.camel.Processor;
 import org.apache.camel.model.NoOutputDefinition;
 import org.apache.camel.processor.binding.RestBindingProcessor;
 import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.Label;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.IntrospectionSupport;
 
+@Label("rest")
 @XmlRootElement(name = "restBinding")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinition>
{

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
index c2c669b..7a9218b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
@@ -19,6 +19,9 @@ package org.apache.camel.model.rest;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.camel.spi.Label;
+
+@Label("rest")
 @XmlType
 @XmlEnum(String.class)
 public enum RestBindingMode {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
index b033dc6..afec8e9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
@@ -27,12 +27,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.Label;
 import org.apache.camel.spi.RestConfiguration;
 import org.apache.camel.util.CamelContextHelper;
 
 /**
  * Represents an XML &lt;restConfiguration/&gt; element
  */
+@Label("rest")
 @XmlRootElement(name = "restConfiguration")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class RestConfigurationDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 68e3686..12090a6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -31,12 +31,14 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.model.OptionalIdentifiedDefinition;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.ToDefinition;
+import org.apache.camel.spi.Label;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
 /**
  * Represents an XML &lt;rest/&gt; element
  */
+@Label("rest")
 @XmlRootElement(name = "rest")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
b/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
index fd85d08..85d2167 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
@@ -19,6 +19,9 @@ package org.apache.camel.model.rest;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.camel.spi.Label;
+
+@Label("rest")
 @XmlType
 @XmlEnum(String.class)
 public enum RestHostNameResolver {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
index e1d5897..162aad7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
@@ -21,9 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.camel.spi.Label;
+
 /**
  * Represents the XML type for &lt;restProperty&gt;.
  */
+@Label("rest")
 @XmlRootElement(name = "restProperty")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class RestPropertyDefinition {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
index 5aab8f9..8eb9fc8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
@@ -26,10 +26,12 @@ import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.OptionalIdentifiedDefinition;
+import org.apache.camel.spi.Label;
 
 /**
  * Represents a collection of {@link org.apache.camel.model.rest.RestDefinition REST's}
  */
+@Label("rest")
 @XmlRootElement(name = "rests")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinition>
implements RestContainer {

http://git-wip-us.apache.org/repos/asf/camel/blob/bdcbf6d2/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index af56af1..c4c2327 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -27,7 +27,9 @@ import javax.xml.bind.annotation.XmlTransient;
 import org.apache.camel.model.OptionalIdentifiedDefinition;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.ToDefinition;
+import org.apache.camel.spi.Label;
 
+@Label("rest")
 @XmlRootElement(name = "verb")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> {


Mime
View raw message