Merge pull request #20 from assimbly/develop

Develop
assimbly · Apr 20, 2021 · 461dfc8 · 461dfc8
2 parents 9fa48ef + f74aeae
commit 461dfc8
Show file tree

Hide file tree

Showing 18 changed files with 1,393 additions and 797 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -88,20 +88,20 @@ conf.xml
             <logLevel>OFF</logLevel>
             <endpoint>
                <id>2</id>
-               <type>from<type>
+               <type>from</type>
                <uri>file://C:\test1</uri>
             </endpoint>
             <endpoint>
                <id>2</id>
-               <type>to<type>
+               <type>to</type>
                <uri>file://C:\test2</uri>
                <options>
                   <directoryMustExist>true</directoryMustExist>
                </options>
-            </endpont>
-            <error>
+            </endpoint>
+            <endpoint>
                <id>2</id>
-               <type>error<type>
+               <type>error</type>
                <uri>file://C:\test3</uri>
             </endpoint>
          </flow>

diff --git a/baseModule/pom.xml b/baseModule/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <artifactId>connector</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.3.0</version>
+    <version>3.4.0</version>
   </parent>
 
   <packaging>jar</packaging>
   <groupId>org.assimbly</groupId>
   <artifactId>baseModule</artifactId>
-  <version>3.3.0</version>
+  <version>3.4.0</version>
 
   <name>baseModule</name>
   <!-- FIXME change it to the project's website -->

diff --git a/baseModule/src/main/resources/connector.xsd b/baseModule/src/main/resources/connector.xsd
@@ -22,6 +22,7 @@
 			<xs:element type="flowsType" name="flows" />
 			<xs:element type="servicesType" name="services" />
 			<xs:element type="headersType" name="headers" />
+			<xs:element type="routesType" name="routes" />
 			<xs:element type="environmentVariablesType" name="environmentVariables" />
 		</xs:choice>
 	</xs:complexType>
@@ -45,30 +46,41 @@
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
 			<xs:element type="xs:string" name="id" minOccurs="1" maxOccurs="1"/>
 			<xs:element type="xs:string" name="name" minOccurs="0" maxOccurs="1"/>
+			<xs:element type="xs:string" name="type" minOccurs="0" maxOccurs="1"/>
 			<xs:element type="xs:string" name="autostart" minOccurs="0" maxOccurs="1"/>
 			<xs:element type="xs:string" name="offloading" minOccurs="0" maxOccurs="1"/>
-			<xs:element type="xs:string" name="type" minOccurs="0" maxOccurs="1"/>
 			<xs:element type="xs:string" name="maximumRedeliveries" minOccurs="0"/>
 			<xs:element type="xs:string" name="redeliveryDelay" minOccurs="0"/>
 			<xs:element type="xs:string" name="logLevel" minOccurs="0"/>
 			<xs:element type="xs:string" name="version" minOccurs="0"/>
 			<xs:element type="xs:string" name="created" minOccurs="0"/>
 			<xs:element type="xs:string" name="lastModified" minOccurs="0"/>
-			<xs:element type="endpointType" name="endpoint" minOccurs="0" />
+			<xs:element type="componentsType" name="components" minOccurs="0" maxOccurs="1"/>
+			<xs:element type="endpointsType" name="endpoints"  minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
+	<xs:complexType name="endpointsType">
+		<xs:sequence>
+			<xs:element type="endpointType" name="endpoint" minOccurs="1" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="endpointType">
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
 			<xs:element type="xs:string" name="id" minOccurs="0" maxOccurs="1"/>
 			<xs:element type="xs:string" name="type" minOccurs="1" maxOccurs="1"/>
-			<xs:element type="xs:string" name="uri" minOccurs="1" maxOccurs="1"/>
+			<xs:element type="xs:string" name="uri" minOccurs="0" maxOccurs="1"/>
 			<xs:element type="optionsType" name="options" minOccurs="0" />
 			<xs:element type="xs:string" name="response_id" minOccurs="0" />
 			<xs:element type="xs:string" name="service_id" minOccurs="0" />
 			<xs:element type="xs:string" name="header_id" minOccurs="0" />
 			<xs:element type="xs:string" name="route_id" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
+	<xs:complexType name="componentsType">
+		<xs:sequence maxOccurs="unbounded">
+			<xs:any namespace="##any" minOccurs="0" processContents="lax" />
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="optionsType">
 		<xs:sequence maxOccurs="unbounded">
 			<xs:any namespace="##any" minOccurs="0" processContents="lax" />
@@ -94,6 +106,18 @@
 			<xs:any namespace="##any" minOccurs="0" processContents="lax" />
 		</xs:sequence>
 	</xs:complexType>
+	<xs:complexType name="routesType">
+		<xs:sequence minOccurs="0">
+			<xs:element name="route" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:sequence minOccurs="0" maxOccurs="unbounded">
+						<xs:any namespace="##any" minOccurs="0" processContents="lax" />
+					</xs:sequence>
+					<xs:attribute name="id" type="xs:string" />
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="environmentVariablesType">
 		<xs:sequence minOccurs="0">
 			<xs:element type="environmentVariableType" name="environmentVariable" minOccurs="0" maxOccurs="unbounded"/>
@@ -103,6 +127,7 @@
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
 			<xs:element type="xs:string" name="key" maxOccurs="1" />
 			<xs:element type="xs:string" name="value" maxOccurs="1" />
+			<xs:element type="xs:string" name="encrypted" maxOccurs="1" />
 		</xs:choice>
 	</xs:complexType>
 </xs:schema>
diff --git a/brokerModule/pom.xml b/brokerModule/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <artifactId>connector</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.3.0</version>
+    <version>3.4.0</version>
   </parent>
 
   <packaging>jar</packaging>
   <groupId>org.assimbly</groupId>
   <artifactId>brokerModule</artifactId>
-  <version>3.3.0</version>
+  <version>3.4.0</version>
 
   <name>brokerModule</name>
 
@@ -23,7 +23,7 @@
     	<dependency>
 			<groupId>org.assimbly</groupId>
 			<artifactId>baseModule</artifactId>
-			  <version>3.2.0</version>
+			  <version>3.4.0</version>
 			<scope>compile</scope>
 		</dependency>
 

diff --git a/connectorModule/pom.xml b/connectorModule/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <artifactId>connector</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.3.0</version>
+    <version>3.4.0</version>
   </parent>
 
   <packaging>jar</packaging>
   <groupId>org.assimbly</groupId>
   <artifactId>connectorModule</artifactId>
-  <version>3.3.0</version>
+  <version>3.4.0</version>
 
   <name>connectorModule</name>
 
@@ -23,13 +23,13 @@
 		<dependency>
 			<groupId>org.assimbly</groupId>
 			<artifactId>baseModule</artifactId>
-			  <version>3.3.0</version>
+			  <version>3.4.0</version>
 			<scope>compile</scope>
 		</dependency>
 	  <dependency>
 		  <groupId>org.assimbly</groupId>
 		  <artifactId>extraModule</artifactId>
-		  <version>3.3.0</version>
+		  <version>3.4.0</version>
 		  <scope>compile</scope>
 	  </dependency>
     	<!-- camel core dependencies in alphabetic order-->