You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/11/07 08:41:16 UTC
[camel] 01/03: Fix jaxb
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a13a9e11d23a012896e335341301bae7d9801478
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Nov 7 09:34:57 2018 +0100
Fix jaxb
---
.../org/apache/camel/model/SagaCompletionMode.java | 5 +++++
.../apache/camel/model/SagaOptionDefinition.java | 2 ++
.../org/apache/camel/model/SagaPropagation.java | 5 +++++
.../camel/support/{ => dump}/MessageDump.java | 2 +-
.../org/apache/camel/model/cloud/jaxb.index | 22 +++++++++++++---------
.../org/apache/camel/model/dataformat/jaxb.index | 7 +++++++
.../resources/org/apache/camel/model/jaxb.index | 3 +++
.../org/apache/camel/model/loadbalancer/jaxb.index | 3 ++-
8 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java b/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java
index 28f93be..526f4ad 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java
@@ -16,9 +16,14 @@
*/
package org.apache.camel.model;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
/**
* Enumerates all saga completion modes.
*/
+@XmlType
+@XmlEnum
public enum SagaCompletionMode {
/**
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
index 4e457bd..7515131 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
@@ -20,6 +20,8 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
import org.apache.camel.Expression;
import org.apache.camel.model.language.ExpressionDefinition;
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java b/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java
index 8a16d95..10070ce 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java
@@ -16,9 +16,14 @@
*/
package org.apache.camel.model;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
/**
* Enumerates all saga propagation modes.
*/
+@XmlType
+@XmlEnum
public enum SagaPropagation {
/**
diff --git a/camel-core/src/main/java/org/apache/camel/support/MessageDump.java b/camel-core/src/main/java/org/apache/camel/support/dump/MessageDump.java
similarity index 98%
rename from camel-core/src/main/java/org/apache/camel/support/MessageDump.java
rename to camel-core/src/main/java/org/apache/camel/support/dump/MessageDump.java
index 0edbb27..16d03d9 100644
--- a/camel-core/src/main/java/org/apache/camel/support/MessageDump.java
+++ b/camel-core/src/main/java/org/apache/camel/support/dump/MessageDump.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.support;
+package org.apache.camel.support.dump;
import java.util.List;
diff --git a/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index
index 07d93ab..4a2052b 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index
@@ -14,21 +14,25 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ------------------------------------------------------------------------
-ServiceCallDefinition
-ServiceCallConfigurationDefinition
-ServiceCallServiceDiscoveryConfiguration
-ServiceCallServiceFilterConfiguration
-ServiceCallServiceChooserConfiguration
-ServiceCallServiceLoadBalancerConfiguration
BlacklistServiceCallServiceFilterConfiguration
+CustomServiceCallServiceFilterConfiguration
CombinedServiceCallServiceFilterConfiguration
-PassThroughServiceCallServiceFilterConfiguration
+CombinedServiceCallServiceDiscoveryConfiguration
CachingServiceCallServiceDiscoveryConfiguration
ConsulServiceCallServiceDiscoveryConfiguration
+DefaultServiceCallServiceLoadBalancerConfiguration
DnsServiceCallServiceDiscoveryConfiguration
EtcdServiceCallServiceDiscoveryConfiguration
HealthyServiceCallServiceFilterConfiguration
KubernetesServiceCallServiceDiscoveryConfiguration
-StaticServiceCallServiceDiscoveryConfiguration
-DefaultServiceCallServiceLoadBalancerConfiguration
+PassThroughServiceCallServiceFilterConfiguration
RibbonServiceCallServiceLoadBalancerConfiguration
+ServiceCallDefinition
+ServiceCallConfigurationDefinition
+ServiceCallExpressionConfiguration
+ServiceCallServiceDiscoveryConfiguration
+ServiceCallServiceFilterConfiguration
+ServiceCallServiceChooserConfiguration
+ServiceCallServiceLoadBalancerConfiguration
+StaticServiceCallServiceDiscoveryConfiguration
+ZooKeeperServiceCallServiceDiscoveryConfiguration
diff --git a/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
index 26d0501..d069299 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
@@ -16,14 +16,17 @@
## ------------------------------------------------------------------------
ASN1DataFormat
AvroDataFormat
+BarcodeDataFormat
Base64DataFormat
BeanioDataFormat
BindyDataFormat
BindyType
+BoonDataFormat
CryptoDataFormat
CsvDataFormat
CustomDataFormat
DataFormatsDefinition
+JacksonXMLDataFormat
FhirJsonDataFormat
FhirXmlDataFormat
FlatpackDataFormat
@@ -36,6 +39,7 @@ JsonDataFormat
JsonLibrary
LZFDataFormat
MimeMultipartDataFormat
+PGPDataFormat
ProtobufDataFormat
RssDataFormat
SerializationDataFormat
@@ -49,9 +53,12 @@ UniVocityCsvDataFormat
UniVocityFixedWidthDataFormat
UniVocityHeader
UniVocityTsvDataFormat
+XmlRpcDataFormat
XMLSecurityDataFormat
XStreamDataFormat
YAMLDataFormat
YAMLLibrary
+YAMLTypeFilterDefinition
+YAMLTypeFilterType
ZipDataFormat
ZipFileDataFormat
diff --git a/camel-core/src/main/resources/org/apache/camel/model/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
index a879745..92f62f5 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
@@ -77,7 +77,10 @@ RouteDefinition
RouteContextRefDefinition
RoutesDefinition
RoutingSlipDefinition
+SagaCompletionMode
SagaDefinition
+SagaOptionDefinition
+SagaPropagation
SamplingDefinition
ScriptDefinition
SetBodyDefinition
diff --git a/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
index 23a7651..4134232 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
@@ -19,4 +19,5 @@ FailoverLoadBalancerDefinition
RandomLoadBalancerDefinition
RoundRobinLoadBalancerDefinition
StickyLoadBalancerDefinition
-TopicLoadBalancerDefinition
\ No newline at end of file
+TopicLoadBalancerDefinition
+WeightedLoadBalancerDefinition
\ No newline at end of file