This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ff8316abbe4afa698331f28562fa4c3de2c28a65
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Feb 9 08:00:10 2018 +0100
CAMEL-12248 - Camel-Milo: Upgrade Milo to version 0.2.0
---
.../camel-milo/src/main/docs/milo-client-component.adoc | 5 ++---
.../camel/component/milo/client/MiloClientComponent.java | 4 ----
.../component/milo/client/MiloClientConfiguration.java | 14 --------------
.../camel/component/milo/server/MiloServerComponent.java | 10 +++++-----
.../component/milo/server/internal/CamelNamespace.java | 2 +-
parent/pom.xml | 2 +-
.../springboot/MiloClientComponentConfiguration.java | 13 -------------
7 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/components/camel-milo/src/main/docs/milo-client-component.adoc
b/components/camel-milo/src/main/docs/milo-client-component.adoc
index dd27320..6cee5c1 100644
--- a/components/camel-milo/src/main/docs/milo-client-component.adoc
+++ b/components/camel-milo/src/main/docs/milo-client-component.adoc
@@ -95,7 +95,7 @@ with the following path and query parameters:
| *endpointUri* | *Required* The OPC UA server endpoint | | String
|===
-==== Query Parameters (23 parameters):
+==== Query Parameters (22 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
@@ -120,7 +120,6 @@ with the following path and query parameters:
| *maxResponseMessageSize* (client) | The maximum number of bytes a response
message may have | | Long
| *productUri* (client) | The product URI |
http://camel.apache.org/EclipseMilo | String
| *requestTimeout* (client) | Request timeout in milliseconds | | Long
-| *secureChannel ReauthenticationEnabled* (client) | Whether secure channel
re-authentication is enabled | | Boolean
| *sessionName* (client) | Session name | | String
| *sessionTimeout* (client) | Session timeout in milliseconds | | Long
|===
@@ -167,4 +166,4 @@
milo-client://user:password@localhost:12345?node=RAW(nsu=http://foo.bar;s=foo/ba
* link:configuring-camel.html[Configuring Camel]
* link:component.html[Component]
* link:endpoint.html[Endpoint]
-* link:getting-started.html[Getting Started]
\ No newline at end of file
+* link:getting-started.html[Getting Started]
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientComponent.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientComponent.java
index ed75037..9eb38c2 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientComponent.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientComponent.java
@@ -105,10 +105,6 @@ public class MiloClientComponent extends DefaultComponent {
builder.setMaxResponseMessageSize(UInteger.valueOf(configuration.getMaxPendingPublishRequests()));
}
- if (configuration.getSecureChannelReauthenticationEnabled() != null) {
-
builder.setSecureChannelReauthenticationEnabled(configuration.getSecureChannelReauthenticationEnabled());
- }
-
if (configuration.getKeyStoreUrl() != null) {
setKey(configuration, builder);
}
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
index b390c08..8f1e184 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
@@ -65,9 +65,6 @@ public class MiloClientConfiguration implements Cloneable {
private Long maxResponseMessageSize;
@UriParam(label = "client")
- private Boolean secureChannelReauthenticationEnabled;
-
- @UriParam(label = "client")
private URL keyStoreUrl;
@UriParam(label = "client")
@@ -212,17 +209,6 @@ public class MiloClientConfiguration implements Cloneable {
}
/**
- * Whether secure channel re-authentication is enabled
- */
- public void setSecureChannelReauthenticationEnabled(final Boolean
secureChannelReauthenticationEnabled) {
- this.secureChannelReauthenticationEnabled =
secureChannelReauthenticationEnabled;
- }
-
- public Boolean getSecureChannelReauthenticationEnabled() {
- return this.secureChannelReauthenticationEnabled;
- }
-
- /**
* The URL where the key should be loaded from
*/
public void setKeyStoreUrl(final String keyStoreUrl) throws
MalformedURLException {
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
index e8295f7..0516788 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
@@ -103,10 +103,10 @@ public class MiloServerComponent extends DefaultComponent
{
throw new UaException(StatusCodes.Bad_CertificateUseNotAllowed);
}
- @Override
- public void verifyTrustChain(final X509Certificate certificate, final
List<X509Certificate> chain) throws UaException {
- throw new UaException(StatusCodes.Bad_CertificateUseNotAllowed);
- }
+ @Override
+ public void verifyTrustChain(List<X509Certificate>
certificateChain) throws UaException {
+ throw new
UaException(StatusCodes.Bad_CertificateUseNotAllowed);
+ }
}
private String namespaceUri = DEFAULT_NAMESPACE_URI;
@@ -298,7 +298,7 @@ public class MiloServerComponent extends DefaultComponent {
* Server hostname
*/
public void setHostname(final String hostname) {
- this.serverConfig.setHostname(hostname);
+ this.serverConfig.setServerName(hostname);
}
/**
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
index c2eb2b0..c1c762b 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
@@ -137,7 +137,7 @@ public class CamelNamespace implements Namespace {
final DataValue value;
if (node != null) {
- value = node.readAttribute(new AttributeContext(context),
id.getAttributeId(), timestamps, id.getIndexRange());
+ value = node.readAttribute(new AttributeContext(context),
id.getAttributeId(), timestamps, id.getIndexRange(), null);
} else {
value = new DataValue(StatusCodes.Bad_NodeIdUnknown);
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 67a253c..f294b28 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -497,7 +497,7 @@
<mchange-commons-java-version>0.2.11</mchange-commons-java-version>
<!-- TODO: spring-boot uses metrics 3.1.x -->
<metrics-version>3.1.5</metrics-version>
- <milo-version>0.1.6</milo-version>
+ <milo-version>0.2.0</milo-version>
<mina-bundle-version>1.1.7_6</mina-bundle-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.16</mina2-version>
diff --git
a/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
index c05cf37..b653f8b 100644
---
a/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/client/springboot/MiloClientComponentConfiguration.java
@@ -154,10 +154,6 @@ public class MiloClientComponentConfiguration
*/
private Long maxResponseMessageSize;
/**
- * Whether secure channel re-authentication is enabled
- */
- private Boolean secureChannelReauthenticationEnabled;
- /**
* The key store type
*/
private String keyStoreType;
@@ -262,15 +258,6 @@ public class MiloClientComponentConfiguration
this.maxResponseMessageSize = maxResponseMessageSize;
}
- public Boolean getSecureChannelReauthenticationEnabled() {
- return secureChannelReauthenticationEnabled;
- }
-
- public void setSecureChannelReauthenticationEnabled(
- Boolean secureChannelReauthenticationEnabled) {
- this.secureChannelReauthenticationEnabled =
secureChannelReauthenticationEnabled;
- }
-
public String getKeyStoreType() {
return keyStoreType;
}
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
