You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/02/07 12:35:20 UTC

[camel-spring-boot] branch master updated: Regen starters

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-spring-boot.git


The following commit(s) were added to refs/heads/master by this push:
     new 80aee1a  Regen starters
80aee1a is described below

commit 80aee1aaea66280f2a59285c145053cd0ef2345e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 7 13:34:53 2020 +0100

    Regen starters
---
 .../springboot/catalog/components/milo-server.json |  8 ++--
 .../MiloServerComponentConfiguration.java          | 53 ++++++----------------
 tooling/camel-spring-boot-dependencies/pom.xml     |  5 ++
 3 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
index 6b3c643..a839fda 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
@@ -21,12 +21,10 @@
   "componentProperties": {
     "namespaceUri": { "kind": "property", "displayName": "Namespace Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The URI of the namespace, defaults to urn:org:apache:camel" },
     "applicationName": { "kind": "property", "displayName": "Application Name", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The application name" },
+    "path": { "kind": "property", "displayName": "Path", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The path to be appended to the end of the endpoint url. (doesn't need to start with '\/')" },
     "applicationUri": { "kind": "property", "displayName": "Application Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The application URI" },
     "productUri": { "kind": "property", "displayName": "Product Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The product URI" },
     "bindPort": { "kind": "property", "displayName": "Bind Port", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The TCP port the server binds to" },
-    "strictEndpointUrlsEnabled": { "kind": "property", "displayName": "Strict Endpoint Urls Enabled", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Set whether strict endpoint URLs are enforced" },
-    "serverName": { "kind": "property", "displayName": "Server Name", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Server name" },
-    "hostname": { "kind": "property", "displayName": "Hostname", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Server hostname" },
     "securityPolicies": { "kind": "property", "displayName": "Security Policies", "group": "common", "required": false, "type": "object", "javaType": "java.util.Set<org.eclipse.milo.opcua.stack.core.security.SecurityPolicy>", "deprecated": false, "secret": false, "description": "Security policies" },
     "securityPoliciesById": { "kind": "property", "displayName": "Security Policies By Id", "group": "common", "required": false, "type": "array", "javaType": "java.util.Collection<java.lang.String>", "deprecated": false, "secret": false, "description": "Security policies by URI or name" },
     "userAuthenticationCredentials": { "kind": "property", "displayName": "User Authentication Credentials", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set user password combinations in the form of user1:pwd1,user2:pwd2 Usernames and passwords will be URL decoded" },
@@ -35,8 +33,8 @@
     "bindAddresses": { "kind": "property", "displayName": "Bind Addresses", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set the addresses of the local addresses the server should bind to" },
     "buildInfo": { "kind": "property", "displayName": "Build Info", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo", "deprecated": false, "secret": false, "description": "Server build info" },
     "serverCertificate": { "kind": "property", "displayName": "Server Certificate", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.milo.KeyStoreLoader.Result", "deprecated": false, "secret": false, "description": "Server certificate" },
-    "certificateManager": { "kind": "property", "displayName": "Certificate Manager", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.application.CertificateManager", "deprecated": false, "secret": false, "description": "Server certificate manager" },
-    "certificateValidator": { "kind": "property", "displayName": "Certificate Validator", "group": "common", "required": false, "type": "object", "javaType": "java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.application.CertificateValidator>", "deprecated": false, "secret": false, "description": "Validator for client certificates" },
+    "certificateManager": { "kind": "property", "displayName": "Certificate Manager", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.security.CertificateManager", "deprecated": false, "secret": false, "description": "Server certificate manager" },
+    "certificateValidator": { "kind": "property", "displayName": "Certificate Validator", "group": "common", "required": false, "type": "object", "javaType": "java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.security.CertificateValidator>", "deprecated": false, "secret": false, "description": "Validator for client certificates" },
     "defaultCertificateValidator": { "kind": "property", "displayName": "Default Certificate Validator", "group": "common", "required": false, "type": "string", "javaType": "java.io.File", "deprecated": false, "secret": false, "description": "Validator for client certificates using default file based approach" },
     "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
index 4b2cec3..601b9d3 100644
--- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
+++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
@@ -49,6 +49,11 @@ public class MiloServerComponentConfiguration
      */
     private String applicationName;
     /**
+     * The path to be appended to the end of the endpoint url. (doesn't need to
+     * start with '/')
+     */
+    private String path;
+    /**
      * The application URI
      */
     private String applicationUri;
@@ -61,18 +66,6 @@ public class MiloServerComponentConfiguration
      */
     private Integer bindPort;
     /**
-     * Set whether strict endpoint URLs are enforced
-     */
-    private Boolean strictEndpointUrlsEnabled = false;
-    /**
-     * Server name
-     */
-    private String serverName;
-    /**
-     * Server hostname
-     */
-    private String hostname;
-    /**
      * Security policies
      */
     private Set<SecurityPolicy> securityPolicies;
@@ -109,12 +102,12 @@ public class MiloServerComponentConfiguration
     private String serverCertificate;
     /**
      * Server certificate manager. The option is a
-     * org.eclipse.milo.opcua.stack.core.application.CertificateManager type.
+     * org.eclipse.milo.opcua.stack.core.security.CertificateManager type.
      */
     private String certificateManager;
     /**
      * Validator for client certificates. The option is a
-     * java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.application.CertificateValidator> type.
+     * java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.security.CertificateValidator> type.
      */
     private String certificateValidator;
     /**
@@ -163,6 +156,14 @@ public class MiloServerComponentConfiguration
         this.applicationName = applicationName;
     }
 
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
     public String getApplicationUri() {
         return applicationUri;
     }
@@ -187,30 +188,6 @@ public class MiloServerComponentConfiguration
         this.bindPort = bindPort;
     }
 
-    public Boolean getStrictEndpointUrlsEnabled() {
-        return strictEndpointUrlsEnabled;
-    }
-
-    public void setStrictEndpointUrlsEnabled(Boolean strictEndpointUrlsEnabled) {
-        this.strictEndpointUrlsEnabled = strictEndpointUrlsEnabled;
-    }
-
-    public String getServerName() {
-        return serverName;
-    }
-
-    public void setServerName(String serverName) {
-        this.serverName = serverName;
-    }
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
     public Set<SecurityPolicy> getSecurityPolicies() {
         return securityPolicies;
     }
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 3bd5200..97f6884 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -2033,6 +2033,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-aws2-ec2</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-ecs</artifactId>
         <version>3.1.0-SNAPSHOT</version>
       </dependency>