You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/01/16 14:12:54 UTC
[camel] 43/49: CAMEL-17499: secureXML dataformat renamed
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch dataformat-rename
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 863d89c22f2cd3f58cada99c61b3f1b2a164a79b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 16 14:04:27 2022 +0100
CAMEL-17499: secureXML dataformat renamed
---
...secureXML-dataformat => xmlSecurity-dataformat} | 0
.../org/apache/camel/dataformat.properties | 2 +-
.../camel/dataformat/{secureXML => xmlSecurity} | 0
.../{secureXML.json => xmlSecurity.json} | 6 +-
...dataformat.adoc => xmlSecurity-dataformat.adoc} | 30 +++++-----
.../xmlsecurity/XMLSecurityDataFormat.java | 4 +-
.../xmlsecurity/XMLEncryption11Test.java | 10 ++--
.../xmlsecurity/XMLSecurityConcurrencyTest.java | 4 +-
.../xmlsecurity/XMLSecurityDataFormatTest.java | 64 +++++++++++-----------
.../SpringXmlSecurityDataFormatTest-context.xml | 4 +-
...curityDataFormatWithKeyPasswordTest-context.xml | 4 +-
.../services/org/apache/camel/model.properties | 2 +-
.../apache/camel/model/dataformat/dataFormats.json | 2 +-
.../{secureXML.json => xmlSecurity.json} | 4 +-
.../resources/org/apache/camel/model/marshal.json | 2 +-
.../org/apache/camel/model/unmarshal.json | 2 +-
.../org/apache/camel/builder/DataFormatClause.java | 36 ++++++------
.../org/apache/camel/model/MarshalDefinition.java | 2 +-
.../apache/camel/model/UnmarshalDefinition.java | 2 +-
.../model/dataformat/DataFormatsDefinition.java | 2 +-
.../model/dataformat/XMLSecurityDataFormat.java | 4 +-
.../DataFormatTransformerDefinition.java | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 2 +-
.../resources/routeWithXMLSecurityDataFormat.xml | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc | 1 +
25 files changed, 98 insertions(+), 95 deletions(-)
diff --git a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/secureXML-dataformat b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlSecurity-dataformat
similarity index 100%
rename from components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/secureXML-dataformat
rename to components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlSecurity-dataformat
diff --git a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
index 69d96a9..7d5097b 100644
--- a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
+++ b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
@@ -1,5 +1,5 @@
# Generated by camel build tools - do NOT edit this file!
-dataFormats=secureXML
+dataFormats=xmlSecurity
groupId=org.apache.camel
artifactId=camel-xmlsecurity
version=3.15.0-SNAPSHOT
diff --git a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat/secureXML b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat/xmlSecurity
similarity index 100%
rename from components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat/secureXML
rename to components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat/xmlSecurity
diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/secureXML.json b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/xmlSecurity.json
similarity index 98%
rename from components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/secureXML.json
rename to components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/xmlSecurity.json
index 5dda07b..938c991 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/secureXML.json
+++ b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/xmlSecurity.json
@@ -1,18 +1,18 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "secureXML",
+ "name": "xmlSecurity",
"title": "XML Security",
"description": "Encrypt and decrypt XML payloads using Apache Santuario.",
"deprecated": false,
"firstVersion": "2.0.0",
- "label": "dataformat,transformation,xml,security",
+ "label": "dataformat,transformation,xml",
"javaType": "org.apache.camel.dataformat.xmlsecurity.XMLSecurityDataFormat",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-xmlsecurity",
"version": "3.15.0-SNAPSHOT",
- "modelName": "secureXML",
+ "modelName": "xmlSecurity",
"modelJavaType": "org.apache.camel.model.dataformat.XMLSecurityDataFormat"
},
"properties": {
diff --git a/components/camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc b/components/camel-xmlsecurity/src/main/docs/xmlSecurity-dataformat.adoc
similarity index 90%
rename from components/camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc
rename to components/camel-xmlsecurity/src/main/docs/xmlSecurity-dataformat.adoc
index 11a6909..d8f1317 100644
--- a/components/camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlSecurity-dataformat.adoc
@@ -1,6 +1,6 @@
= XML Security DataFormat
:doctitle: XML Security
-:shortname: secureXML
+:shortname: xmlSecurity
:artifactid: camel-xmlsecurity
:description: Encrypt and decrypt XML payloads using Apache Santuario.
:since: 2.0
@@ -61,12 +61,12 @@ has been explicitly configured as the key cipher algorithm.
== Marshal
In order to encrypt the payload, the `marshal` processor needs to be
-applied on the route followed by the *`secureXML()`* tag.
+applied on the route followed by the *`xmlSecurity()`* tag.
== Unmarshal
In order to decrypt the payload, the `unmarshal` processor needs to be
-applied on the route followed by the *`secureXML()`* tag.
+applied on the route followed by the *`xmlSecurity()`* tag.
== Examples
@@ -82,8 +82,8 @@ keyGenerator.init(256);
Key key = keyGenerator.generateKey();
from("direct:start")
- .marshal().secureXML(key.getEncoded())
- .unmarshal().secureXML(key.getEncoded()
+ .marshal().xmlSecurity(key.getEncoded())
+ .unmarshal().xmlSecurity(key.getEncoded()
.to("direct:end");
----------------------------
@@ -96,8 +96,8 @@ boolean secureTagContent = true;
...
String passPhrase = "Just another 24 Byte key";
from("direct:start")
- .marshal().secureXML(tagXPATH, secureTagContent, passPhrase)
- .unmarshal().secureXML(tagXPATH, secureTagContent, passPhrase)
+ .marshal().xmlSecurity(tagXPATH, secureTagContent, passPhrase)
+ .unmarshal().xmlSecurity(tagXPATH, secureTagContent, passPhrase)
.to("direct:end");
------------------------------------------------------------------
@@ -112,8 +112,8 @@ boolean secureTagContent = true;
String passPhrase = "Just another 24 Byte key";
String algorithm= XMLCipher.TRIPLEDES;
from("direct:start")
- .marshal().secureXML(tagXPATH, secureTagContent, passPhrase, algorithm)
- .unmarshal().secureXML(tagXPATH, secureTagContent, passPhrase, algorithm)
+ .marshal().xmlSecurity(tagXPATH, secureTagContent, passPhrase, algorithm)
+ .unmarshal().xmlSecurity(tagXPATH, secureTagContent, passPhrase, algorithm)
.to("direct:end");
-----------------------------------------------------------------------------
@@ -134,7 +134,7 @@ tsParameters.setResource("sender.ts");
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cust:cheesesites/italy", namespaces, true, "recipient",
+ .marshal().xmlSecurity("//cust:cheesesites/italy", namespaces, true, "recipient",
testCypherAlgorithm, XMLCipher.RSA_v1dot5, tsParameters)
.to("mock:encrypted");
}
@@ -146,7 +146,7 @@ Spring XML
A namespace prefix that is defined as part of the `camelContext`
definition can be re-used in context within the data format `secureTag`
-attribute of the `secureXML` element.
+attribute of the `xmlSecurity` element.
[source,xml]
---------------------------------------------------------------------------------
@@ -156,7 +156,7 @@ attribute of the `secureXML` element.
<route>
<from uri="direct://start"/>
<marshal>
- <secureXML secureTag="//cheese:cheesesites/italy"
+ <xmlSecurity secureTag="//cheese:cheesesites/italy"
secureTagContents="true"/>
</marshal>
...
@@ -178,7 +178,7 @@ Spring XML Sender
<route>
<from uri="direct://start"/>
<marshal>
- <secureXML secureTag="//cheese:cheesesites/italy"
+ <xmlSecurity secureTag="//cheese:cheesesites/italy"
secureTagContents="true"
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
keyCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"
@@ -193,7 +193,7 @@ Spring XML Recipient
[source,xml]
----------------------------------------------------------------------------------------------
-
+
<!-- key store configuration -->
<camel:keyStoreParameters id="keyStoreParams" resource="./recipient.ks" password="password" />
@@ -203,7 +203,7 @@ Spring XML Recipient
<route>
<from uri="direct://encrypted"/>
<unmarshal>
- <secureXML secureTag="//cheese:cheesesites/italy"
+ <xmlSecurity secureTag="//cheese:cheesesites/italy"
secureTagContents="true"
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
keyCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
index 8082992..18e1539 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
@@ -67,7 +67,7 @@ import org.apache.xml.security.utils.XMLUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Dataformat("secureXML")
+@Dataformat("xmlSecurity")
public class XMLSecurityDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware {
private static final Logger LOG = LoggerFactory.getLogger(XMLSecurityDataFormat.class);
@@ -256,7 +256,7 @@ public class XMLSecurityDataFormat extends ServiceSupport implements DataFormat,
@Override
public String getDataFormatName() {
- return "secureXML";
+ return "xmlSecurity";
}
@Override
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
index dce9e6c..227bf3e 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
@@ -150,9 +150,9 @@ public class XMLEncryption11Test extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("", true, "recipient", XMLCipher.AES_128_GCM, XMLCipher.RSA_OAEP, tsParameters)
+ .marshal().xmlSecurity("", true, "recipient", XMLCipher.AES_128_GCM, XMLCipher.RSA_OAEP, tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("", true, "recipient", XMLCipher.AES_128_GCM, XMLCipher.RSA_OAEP, ksParameters)
+ .unmarshal().xmlSecurity("", true, "recipient", XMLCipher.AES_128_GCM, XMLCipher.RSA_OAEP, ksParameters)
.to("mock:decrypted");
}
});
@@ -173,10 +173,10 @@ public class XMLEncryption11Test extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("", new HashMap<String, String>(), true, "recipient", XMLCipher.AES_128,
+ .marshal().xmlSecurity("", new HashMap<String, String>(), true, "recipient", XMLCipher.AES_128,
XMLCipher.RSA_OAEP, tsParameters, null, XMLCipher.SHA256)
.to("mock:encrypted")
- .unmarshal().secureXML("", new HashMap<String, String>(), true, "recipient", XMLCipher.AES_128,
+ .unmarshal().xmlSecurity("", new HashMap<String, String>(), true, "recipient", XMLCipher.AES_128,
XMLCipher.RSA_OAEP, ksParameters, null, XMLCipher.SHA256)
.to("mock:decrypted");
}
@@ -207,7 +207,7 @@ public class XMLEncryption11Test extends CamelTestSupport {
from("direct:start")
.marshal(xmlEncDataFormat).to("mock:encrypted")
// .log("Body: + ${body}")
- .unmarshal().secureXML("", new HashMap<String, String>(), true, "recipient", XMLCipher.AES_128,
+ .unmarshal().xmlSecurity("", new HashMap<String, String>(), true, "recipient", XMLCipher.AES_128,
XMLCipher.RSA_OAEP, ksParameters)
.to("mock:decrypted");
}
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
index b390b02..2643aa1 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
@@ -77,9 +77,9 @@ public class XMLSecurityConcurrencyTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
- from("direct:start").marshal().secureXML(defaultKey.getEncoded()).to("mock:secure").to("direct:marshalled");
+ from("direct:start").marshal().xmlSecurity(defaultKey.getEncoded()).to("mock:secure").to("direct:marshalled");
- from("direct:marshalled").unmarshal().secureXML(defaultKey.getEncoded()).convertBodyTo(String.class)
+ from("direct:marshalled").unmarshal().xmlSecurity(defaultKey.getEncoded()).convertBodyTo(String.class)
.to("mock:result");
}
};
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
index 0cb741c..5022afc 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
@@ -77,7 +77,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML(defaultKey.getEncoded())
+ .marshal().xmlSecurity(defaultKey.getEncoded())
.to("mock:encrypted");
}
});
@@ -89,7 +89,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/italy/cheese", true, defaultKey.getEncoded())
+ .marshal().xmlSecurity("//cheesesites/italy/cheese", true, defaultKey.getEncoded())
.to("mock:encrypted");
}
});
@@ -101,7 +101,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/*/cheese", true, defaultKey.getEncoded())
+ .marshal().xmlSecurity("//cheesesites/*/cheese", true, defaultKey.getEncoded())
.to("mock:encrypted");
}
});
@@ -120,7 +120,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/netherlands", false, passCode, XMLCipher.AES_128)
+ .marshal().xmlSecurity("//cheesesites/netherlands", false, passCode, XMLCipher.AES_128)
.to("mock:encrypted");
}
});
@@ -144,7 +144,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/netherlands", false, bits192, XMLCipher.AES_192)
+ .marshal().xmlSecurity("//cheesesites/netherlands", false, bits192, XMLCipher.AES_192)
.to("mock:encrypted");
}
});
@@ -182,7 +182,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void configure() {
from("direct:start")
.marshal()
- .secureXML("//cheesesites/italy/cheese", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5,
+ .xmlSecurity("//cheesesites/italy/cheese", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5,
tsParameters)
.to("mock:encrypted");
}
@@ -244,8 +244,8 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML(defaultKey.getEncoded()).to("mock:encrypted")
- .unmarshal().secureXML(defaultKey.getEncoded()).to("mock:decrypted");
+ .marshal().xmlSecurity(defaultKey.getEncoded()).to("mock:encrypted")
+ .unmarshal().xmlSecurity(defaultKey.getEncoded()).to("mock:decrypted");
}
});
xmlsecTestHelper.testDecryption(context);
@@ -256,8 +256,8 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/italy/cheese", true, defaultKey.getEncoded()).to("mock:encrypted")
- .unmarshal().secureXML("//cheesesites/italy/cheese", true, defaultKey.getEncoded())
+ .marshal().xmlSecurity("//cheesesites/italy/cheese", true, defaultKey.getEncoded()).to("mock:encrypted")
+ .unmarshal().xmlSecurity("//cheesesites/italy/cheese", true, defaultKey.getEncoded())
.to("mock:decrypted");
}
});
@@ -269,8 +269,8 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/*/cheese", true, defaultKey.getEncoded()).to("mock:encrypted")
- .unmarshal().secureXML("//cheesesites/*/cheese", true, defaultKey.getEncoded()).to("mock:decrypted");
+ .marshal().xmlSecurity("//cheesesites/*/cheese", true, defaultKey.getEncoded()).to("mock:encrypted")
+ .unmarshal().xmlSecurity("//cheesesites/*/cheese", true, defaultKey.getEncoded()).to("mock:decrypted");
}
});
xmlsecTestHelper.testDecryption(context);
@@ -281,8 +281,9 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/france/cheese", false, defaultKey.getEncoded()).to("mock:encrypted")
- .unmarshal().secureXML("//cheesesites/france", false, defaultKey.getEncoded()).to("mock:decrypted");
+ .marshal().xmlSecurity("//cheesesites/france/cheese", false, defaultKey.getEncoded())
+ .to("mock:encrypted")
+ .unmarshal().xmlSecurity("//cheesesites/france", false, defaultKey.getEncoded()).to("mock:decrypted");
}
});
xmlsecTestHelper.testDecryption(context);
@@ -306,7 +307,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
from("timer://foo?period=5000&repeatCount=1")
.to("language:constant:resource:classpath:org/apache/camel/component/xmlsecurity/EncryptedMessage.xml")
.unmarshal()
- .secureXML("/*[local-name()='Envelope']/*[local-name()='Body']",
+ .xmlSecurity("/*[local-name()='Envelope']/*[local-name()='Body']",
true, keyBytes, XMLCipher.TRIPLEDES)
.to("mock:decrypted");
}
@@ -326,8 +327,8 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("//cheesesites/italy", true, passCode, XMLCipher.AES_128).to("mock:encrypted")
- .unmarshal().secureXML("//cheesesites/italy", true, passCode, XMLCipher.AES_128).to("mock:decrypted");
+ .marshal().xmlSecurity("//cheesesites/italy", true, passCode, XMLCipher.AES_128).to("mock:encrypted")
+ .unmarshal().xmlSecurity("//cheesesites/italy", true, passCode, XMLCipher.AES_128).to("mock:decrypted");
}
});
xmlsecTestHelper.testDecryption(context);
@@ -347,9 +348,9 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, tsParameters)
+ .marshal().xmlSecurity("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, ksParameters)
+ .unmarshal().xmlSecurity("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, ksParameters)
.to("mock:decrypted");
}
});
@@ -370,9 +371,9 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, tsParameters)
+ .marshal().xmlSecurity("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, ksParameters,
+ .unmarshal().xmlSecurity("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, ksParameters,
"keyPassword")
.to("mock:decrypted");
}
@@ -397,10 +398,10 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void configure() {
from("direct:start")
.marshal()
- .secureXML("//ns1:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
+ .xmlSecurity("//ns1:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
XMLCipher.RSA_v1dot5, tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("//ns1:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
+ .unmarshal().xmlSecurity("//ns1:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
XMLCipher.RSA_v1dot5, ksParameters)
.to("mock:decrypted");
}
@@ -425,10 +426,10 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void configure() {
from("direct:start")
.marshal()
- .secureXML("//cust:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
+ .xmlSecurity("//cust:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
XMLCipher.RSA_v1dot5, tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("//cust:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
+ .unmarshal().xmlSecurity("//cust:cheesesites/italy", namespaces, true, "recipient", testCypherAlgorithm,
XMLCipher.RSA_v1dot5, ksParameters)
.to("mock:decrypted");
}
@@ -451,9 +452,9 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:start")
- .marshal().secureXML("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, tsParameters)
+ .marshal().xmlSecurity("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5, tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_OAEP, ksParameters)
+ .unmarshal().xmlSecurity("", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_OAEP, ksParameters)
.to("mock:decrypted");
}
});
@@ -482,10 +483,10 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void configure() {
from("direct:start")
.marshal()
- .secureXML("//cheesesites/italy", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5,
+ .xmlSecurity("//cheesesites/italy", true, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5,
tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("//cheesesites/italy", true, "recipient", testCypherAlgorithm,
+ .unmarshal().xmlSecurity("//cheesesites/italy", true, "recipient", testCypherAlgorithm,
XMLCipher.RSA_OAEP, ksParameters)
.to("mock:decrypted");
}
@@ -515,10 +516,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void configure() {
from("direct:start")
.marshal()
- .secureXML("//cheesesites/france/cheese", false, "recipient", testCypherAlgorithm, XMLCipher.RSA_v1dot5,
+ .xmlSecurity("//cheesesites/france/cheese", false, "recipient", testCypherAlgorithm,
+ XMLCipher.RSA_v1dot5,
tsParameters)
.to("mock:encrypted")
- .unmarshal().secureXML("//cheesesites/france", false, "recipient", testCypherAlgorithm,
+ .unmarshal().xmlSecurity("//cheesesites/france", false, "recipient", testCypherAlgorithm,
XMLCipher.RSA_OAEP, ksParameters)
.to("mock:decrypted");
}
diff --git a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml
index 2256b7b..1e4ae22 100644
--- a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml
+++ b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml
@@ -41,7 +41,7 @@
<route>
<from uri="direct://start"/>
<marshal>
- <secureXML
+ <xmlSecurity
secureTag="//cheese:cheesesites/italy"
secureTagContents="true"
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
@@ -55,7 +55,7 @@
<route>
<from uri="direct://encrypted"/>
<unmarshal>
- <secureXML
+ <xmlSecurity
secureTag="//cheese:cheesesites/italy"
secureTagContents="true"
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
diff --git a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml
index 3a11c57..b56cb09 100644
--- a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml
+++ b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml
@@ -41,7 +41,7 @@
<route>
<from uri="direct://start"/>
<marshal>
- <secureXML
+ <xmlSecurity
secureTag="//cheese:cheesesites/italy"
secureTagContents="true"
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
@@ -55,7 +55,7 @@
<route>
<from uri="direct://encrypted"/>
<unmarshal>
- <secureXML
+ <xmlSecurity
secureTag="//cheese:cheesesites/italy"
secureTagContents="true"
xmlCipherAlgorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
diff --git a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
index 42e9c19..79cf05d 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
+++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
@@ -150,7 +150,6 @@ rss
saga
sample
script
-secureXML
security
securityDefinitions
securityRequirements
@@ -205,6 +204,7 @@ weighted
when
whenSkipSendToEndpoint
wireTap
+xmlSecurity
xpath
xquery
xstream
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
index 3fdccd9..ca047ed 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/dataFormats.json
@@ -12,6 +12,6 @@
"output": false
},
"properties": {
- "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflator", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soap", "syslog", "tar [...]
+ "dataFormats": { "kind": "element", "displayName": "Data Formats", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.DataFormatDefinition>", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflator", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "syslog", "tarFile", "thrif [...]
}
}
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xmlSecurity.json
similarity index 98%
rename from core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json
rename to core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xmlSecurity.json
index adabdf3..ff6b65e 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xmlSecurity.json
@@ -1,12 +1,12 @@
{
"model": {
"kind": "model",
- "name": "secureXML",
+ "name": "xmlSecurity",
"title": "XML Security",
"description": "Encrypt and decrypt XML payloads using Apache Santuario.",
"deprecated": false,
"firstVersion": "2.0.0",
- "label": "dataformat,transformation,xml,security",
+ "label": "dataformat,transformation,xml",
"javaType": "org.apache.camel.model.dataformat.XMLSecurityDataFormat",
"abstract": false,
"input": false,
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json
index 87b27f9..cbd01fa 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/marshal.json
@@ -12,7 +12,7 @@
"output": false
},
"properties": {
- "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soap", "syslog", "tarFile", " [...]
+ "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "syslog", "tarFile", "thrift", "tid [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
"description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }
}
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json
index 36d8023..f8a9f6e 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/unmarshal.json
@@ -12,7 +12,7 @@
"output": false
},
"properties": {
- "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "secureXML", "soap", "syslog", "tarFile", " [...]
+ "dataFormatType": { "kind": "element", "displayName": "Data Format Type", "required": true, "type": "object", "javaType": "org.apache.camel.model.DataFormatDefinition", "oneOf": [ "any23", "asn1", "avro", "barcode", "base64", "beanio", "bindy", "cbor", "crypto", "csv", "custom", "fhirJson", "fhirXml", "flatpack", "grok", "gzipDeflater", "hl7", "ical", "jacksonXml", "jaxb", "json", "jsonApi", "lzf", "mimeMultipart", "pgp", "protobuf", "rss", "soap", "syslog", "tarFile", "thrift", "tid [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
"description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 6c38743..9707aa0b 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -994,7 +994,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(byte[] passPhraseByte) {
+ public T xmlSecurity(byte[] passPhraseByte) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
xsdf.setPassPhraseByte(passPhraseByte);
return dataFormat(xsdf);
@@ -1003,7 +1003,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(String secureTag, boolean secureTagContents, String passPhrase) {
+ public T xmlSecurity(String secureTag, boolean secureTagContents, String passPhrase) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
xsdf.setSecureTag(secureTag);
xsdf.setSecureTagContents(Boolean.toString(secureTagContents));
@@ -1014,7 +1014,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(String secureTag, Map<String, String> namespaces, boolean secureTagContents, String passPhrase) {
+ public T xmlSecurity(String secureTag, Map<String, String> namespaces, boolean secureTagContents, String passPhrase) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
xsdf.setSecureTag(secureTag);
xsdf.setNamespaces(namespaces);
@@ -1026,7 +1026,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(String secureTag, boolean secureTagContents, String passPhrase, String xmlCipherAlgorithm) {
+ public T xmlSecurity(String secureTag, boolean secureTagContents, String passPhrase, String xmlCipherAlgorithm) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
xsdf.setSecureTag(secureTag);
xsdf.setSecureTagContents(Boolean.toString(secureTagContents));
@@ -1038,7 +1038,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, Map<String, String> namespaces, boolean secureTagContents, String passPhrase,
String xmlCipherAlgorithm) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
@@ -1053,7 +1053,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(String secureTag, boolean secureTagContents, byte[] passPhraseByte) {
+ public T xmlSecurity(String secureTag, boolean secureTagContents, byte[] passPhraseByte) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
xsdf.setSecureTag(secureTag);
xsdf.setSecureTagContents(Boolean.toString(secureTagContents));
@@ -1064,7 +1064,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(String secureTag, Map<String, String> namespaces, boolean secureTagContents, byte[] passPhraseByte) {
+ public T xmlSecurity(String secureTag, Map<String, String> namespaces, boolean secureTagContents, byte[] passPhraseByte) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
xsdf.setSecureTag(secureTag);
xsdf.setNamespaces(namespaces);
@@ -1076,7 +1076,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(String secureTag, boolean secureTagContents, byte[] passPhraseByte, String xmlCipherAlgorithm) {
+ public T xmlSecurity(String secureTag, boolean secureTagContents, byte[] passPhraseByte, String xmlCipherAlgorithm) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
xsdf.setSecureTag(secureTag);
xsdf.setSecureTagContents(Boolean.toString(secureTagContents));
@@ -1088,7 +1088,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, Map<String, String> namespaces, boolean secureTagContents, byte[] passPhraseByte,
String xmlCipherAlgorithm) {
XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat();
@@ -1103,7 +1103,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, boolean secureTagContents, String recipientKeyAlias, String xmlCipherAlgorithm,
String keyCipherAlgorithm,
String keyOrTrustStoreParametersId) {
@@ -1120,7 +1120,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, boolean secureTagContents, String recipientKeyAlias, String xmlCipherAlgorithm,
String keyCipherAlgorithm,
String keyOrTrustStoreParametersId, String keyPassword) {
@@ -1138,7 +1138,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, boolean secureTagContents, String recipientKeyAlias, String xmlCipherAlgorithm,
String keyCipherAlgorithm,
KeyStoreParameters keyOrTrustStoreParameters) {
@@ -1155,7 +1155,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, boolean secureTagContents, String recipientKeyAlias, String xmlCipherAlgorithm,
String keyCipherAlgorithm,
KeyStoreParameters keyOrTrustStoreParameters, String keyPassword) {
@@ -1173,7 +1173,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, Map<String, String> namespaces, boolean secureTagContents, String recipientKeyAlias,
String xmlCipherAlgorithm, String keyCipherAlgorithm,
String keyOrTrustStoreParametersId) {
@@ -1190,7 +1190,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, Map<String, String> namespaces, boolean secureTagContents, String recipientKeyAlias,
String xmlCipherAlgorithm, String keyCipherAlgorithm,
String keyOrTrustStoreParametersId, String keyPassword) {
@@ -1208,7 +1208,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, Map<String, String> namespaces, boolean secureTagContents, String recipientKeyAlias,
String xmlCipherAlgorithm, String keyCipherAlgorithm,
KeyStoreParameters keyOrTrustStoreParameters) {
@@ -1226,7 +1226,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, Map<String, String> namespaces, boolean secureTagContents, String recipientKeyAlias,
String xmlCipherAlgorithm, String keyCipherAlgorithm,
KeyStoreParameters keyOrTrustStoreParameters, String keyPassword) {
@@ -1245,7 +1245,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the XML Security data format
*/
- public T secureXML(
+ public T xmlSecurity(
String secureTag, Map<String, String> namespaces, boolean secureTagContents, String recipientKeyAlias,
String xmlCipherAlgorithm, String keyCipherAlgorithm,
KeyStoreParameters keyOrTrustStoreParameters, String keyPassword, String digestAlgorithm) {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 56585d7..dcaa777 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -99,7 +99,6 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp
@XmlElement(required = false, name = "mimeMultipart", type = MimeMultipartDataFormat.class),
@XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
- @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
@XmlElement(required = false, name = "tarFile", type = TarFileDataFormat.class),
@@ -108,6 +107,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> imp
@XmlElement(required = false, name = "univocityCsv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocityFixed", type = UniVocityFixedDataFormat.class),
@XmlElement(required = false, name = "univocityTsv", type = UniVocityTsvDataFormat.class),
+ @XmlElement(required = false, name = "xmlSecurity", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 1bc9a9e..7dbe3e7 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -99,7 +99,6 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "mimeMultipart", type = MimeMultipartDataFormat.class),
@XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
- @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
@XmlElement(required = false, name = "tarFile", type = TarFileDataFormat.class),
@@ -108,6 +107,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "univocityCsv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocityFixed", type = UniVocityFixedDataFormat.class),
@XmlElement(required = false, name = "univocityTsv", type = UniVocityTsvDataFormat.class),
+ @XmlElement(required = false, name = "xmlSecurity", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index ba74832..c1ab796 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -65,7 +65,6 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "mimeMultipart", type = MimeMultipartDataFormat.class),
@XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
- @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
@XmlElement(required = false, name = "tarFile", type = TarFileDataFormat.class),
@@ -74,6 +73,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "univocityCsv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocityFixed", type = UniVocityFixedDataFormat.class),
@XmlElement(required = false, name = "univocityTsv", type = UniVocityTsvDataFormat.class),
+ @XmlElement(required = false, name = "xmlSecurity", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
index f2c6b57..be418a9 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
@@ -33,8 +33,8 @@ import org.apache.camel.support.jsse.KeyStoreParameters;
/**
* Encrypt and decrypt XML payloads using Apache Santuario.
*/
-@Metadata(firstVersion = "2.0.0", label = "dataformat,transformation,xml,security", title = "XML Security")
-@XmlRootElement(name = "secureXML")
+@Metadata(firstVersion = "2.0.0", label = "dataformat,transformation,xml", title = "XML Security")
+@XmlRootElement(name = "xmlSecurity")
@XmlAccessorType(XmlAccessType.FIELD)
public class XMLSecurityDataFormat extends DataFormatDefinition implements NamespaceAware {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index 7fefc5e..4219631 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -103,7 +103,6 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
@XmlElement(required = false, name = "mimeMultipart", type = MimeMultipartDataFormat.class),
@XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
- @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
@XmlElement(required = false, name = "tarFile", type = TarFileDataFormat.class),
@@ -112,6 +111,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
@XmlElement(required = false, name = "univocityCsv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocityFixed", type = UniVocityFixedDataFormat.class),
@XmlElement(required = false, name = "univocityTsv", type = UniVocityTsvDataFormat.class),
+ @XmlElement(required = false, name = "xmlSecurity", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index dd451a3..6cb2e05 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -3287,7 +3287,7 @@ public class ModelParser extends BaseParser {
case "univocityCsv": return doParseUniVocityCsvDataFormat();
case "univocityFixed": return doParseUniVocityFixedDataFormat();
case "univocityTsv": return doParseUniVocityTsvDataFormat();
- case "secureXML": return doParseXMLSecurityDataFormat();
+ case "xmlSecurity": return doParseXMLSecurityDataFormat();
case "xstream": return doParseXStreamDataFormat();
case "yaml": return doParseYAMLDataFormat();
case "zipDeflater": return doParseZipDeflaterDataFormat();
diff --git a/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml
index 7ee7d50..c546d2d 100644
--- a/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml
+++ b/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml
@@ -22,7 +22,7 @@
<from uri="seda:a"/>
<pipeline>
<marshal>
- <secureXML/>
+ <xmlSecurity/>
</marshal>
<to uri="seda:b"/>
</pipeline>
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
index 503dab0..efff100 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
@@ -50,6 +50,7 @@ The data formats naming has been made consistent to use Camel Case:
| zip-deflater | zipDeflater
| jacksonxml | jacksonXml
| mime-multipart | mimeMultipart
+| secureXML | xmlSecurity
| soapjaxb | soap
| univociy-csv | univociyCsv
| univociy-fixed | univociyFixed