Merge 3.0 and add new DB management and REST V2

.gitignore

@@ -17,6 +17,11 @@ local.properties
 .loadpath
 .pmd
 
+############
+## Intellij
+############
+.idea
+
 # External tool builders
 .externalToolBuilders/
 
@@ -29,6 +34,13 @@ local.properties
 # PDT-specific
 .buildpath
 
+
+#################
+# Intellij
+#################
+.idea
+src/main/java/resources/
+
 #################
 ## Java
 #################

maven-version-rules.xml

@@ -35,6 +35,7 @@
         <ignoreVersion type="regex">1\.4\..+</ignoreVersion>
         <ignoreVersion type="regex">1\.5\..+</ignoreVersion>
         <ignoreVersion type="regex">1\.6\..+</ignoreVersion>
+        <ignoreVersion type="regex">1\.8\..+</ignoreVersion>
         <ignoreVersion type="regex">2\..+</ignoreVersion>
       </ignoreVersions>
     </rule>

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>WaarpR66</artifactId>
   <name>Waarp OpenR66</name>
-  <version>3.0.10</version>
+  <version>3.0.12</version>
   <description>
   OpenR66 is a File Transfer Monitor to be used in real production to transfer files between servers.
   It allows to start/restart a transfer, check the remote MD5, check status, make pre or post
@@ -45,11 +45,37 @@
   		</snapshots>
   	</repository>
   </repositories>
+
+  <properties>
+    <skipITs>true</skipITs>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <attach-distribution>false</attach-distribution>
+    <filtermodule>**</filtermodule>
+    <!-- Dependencies versions-->
+    <test-containers>1.11.2</test-containers>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>development</id>
+      <properties>
+        <skipITs>true</skipITs>
+      </properties>
+    </profile>
+    <profile>
+      <id>integration-tests</id>
+      <properties>
+        <skipITs>false</skipITs>
+      </properties>
+    </profile>
+  </profiles>
+
+
   <dependencies>
     <dependency>
       <groupId>Waarp</groupId>
       <artifactId>WaarpCommon</artifactId>
-      <version>3.0.10</version>
+      <version>3.0.12</version>
       <exclusions>
       	<exclusion>
       		<artifactId>xml-apis</artifactId>
@@ -84,7 +110,7 @@
     <dependency>
     	<groupId>commons-codec</groupId>
     	<artifactId>commons-codec</artifactId>
-    	<version>1.11</version>
+    	<version>1.12</version>
     </dependency>
     <dependency>
     	<groupId>Waarp</groupId>
@@ -95,7 +121,7 @@
     <dependency>
     	<groupId>Waarp</groupId>
     	<artifactId>WaarpSnmp</artifactId>
-    	<version>3.0.5</version>
+    	<version>3.0.6</version>
     	<optional>true</optional>
     </dependency>
     <dependency>
@@ -111,7 +137,7 @@
     <dependency>
     	<groupId>Waarp</groupId>
     	<artifactId>WaarpThrift</artifactId>
-    	<version>3.0.5</version>
+    	<version>3.0.6</version>
     	<optional>true</optional>
     </dependency>
     <dependency>
@@ -141,12 +167,12 @@
     <dependency>
         <groupId>Waarp</groupId>
         <artifactId>WaarpGatewayKernel</artifactId>
-        <version>3.0.9</version>
+        <version>3.0.10</version>
     </dependency>
     <dependency>
         <groupId>Waarp</groupId>
         <artifactId>WaarpFtpClient</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -163,25 +189,49 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mariadb</artifactId>
-      <version>1.10.6</version>
+      <version>${test-containers}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mysql</artifactId>
-      <version>1.10.6</version>
+      <version>${test-containers}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>oracle-xe</artifactId>
+      <version>${test-containers}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.10.6</version>
+      <version>${test-containers}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils-core</artifactId>
+      <version>1.8.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-common</artifactId>
+      <version>2.28</version>
     </dependency>
+      <dependency>
+        <groupId>io.cdap.http</groupId>
+        <artifactId>netty-http</artifactId>
+          <version>1.2.0</version>
+      </dependency>
   </dependencies>
-  <properties>
-	<skipITs>true</skipITs>
-  	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  	<attach-distribution>false</attach-distribution>
-    <filtermodule>**</filtermodule>
-  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -219,7 +269,7 @@
             <goals>
               <goal>integration-test</goal>
               <goal>verify</goal>
-	    </goals>
+            </goals>
           </execution>
         </executions>
       </plugin>
@@ -313,7 +363,7 @@
         <version>2.3</version>
         <inherited>false</inherited>
         <configuration>
-          <rulesUri>file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
+          <rulesUri>file:///${session.executionRootDirectory}/maven-version-restRules.xml</rulesUri>
         </configuration>
       </plugin>
     </plugins>

src/main/httpadmin/admin-bootstrap/CancelRestart.html

@@ -113,7 +113,7 @@
 			return TASKSTEP[data];
 		case 12:
 		case 14:
-			return ErrorCode[data];
+			return ErrorCode[data.trim()];
 		case 15:
 			return UpdatedInfo[data];
 		case 21:

src/main/httpadmin/admin-bootstrap/res/OpenR66TaskOptions.html

@@ -641,9 +641,9 @@ <h4>TRANSFER</h4>
 <div class="collapse" id="RESCHEDULE">
   <div class="well">
 <h4>RESCHEDULE</h4>
-<p>Reschedule Transfer task to a time delayed by the specified number of milliseconds, if the error code is one of the specified codes and the optional intervals of date are compatible with the new time schedule.</p><p>Result of arguments will be as following options (the two first are mandatory):</p>
+<p>Reschedule Transfer task to a time delayed by the specified number of milliseconds, if the error code is one of the specified code and the optional intervals of date are compatible with the new time schedule.</p><p>Result of arguments will be as following options (the two first are mandatory):</p>
 <ul><li><code>"-delay ms"</code> where ms is the added number of ms on current time before retry on schedule</li>
-<li><code>"-case errorCode,errorCode,..."</code> where errorCode is one of the following error of the current transfer (either literal or code in 1 character):
+<li><code>"-case code,code,..."</code> where code is one of the following error of the current transfer (either literal or code in 1 character):
 <code>ConnectionImpossible(C), ServerOverloaded(l), BadAuthent(A), ExternalOp(E), TransferError(T),</code> <code>MD5Error(M), Disconnection(D), RemoteShutdown(r), FinalOp(F), Unimplemented(U), Shutdown(S),</code> <code>RemoteError(R), Internal(I), StoppedTransfer(H), CanceledTransfer(K), Warning(W), Unknown(-),</code> <code>QueryAlreadyFinished(Q), QueryStillRunning(s), NotKnownHost(N), QueryRemotelyUnknown(u),</code> <code>FileNotFound(f), CommandNotFound(c), PassThroughMode(p)</code></li>
 <li><code>"-between start;end"</code> and/or <code>"-notbetween start;end"</code> (multiple times are allowed, start or end can be not set) and where start and stop are in the following format:
 <code>Yn:Mn:Dn:Hn:mn:Sn</code> where n is a number for each time specification, each specification is optional, as <code>Y=Year, M=Month, D=Day, H=Hour, m=minute, s=second</code>.

src/main/httpadmin/i18n/res/OpenR66TaskOptions.html

@@ -301,12 +301,12 @@ <h1 class="h1">Waarp R66-TaskOptions</h1>
 <li>
 <div style="text-align:justify;"><span style="font-size:11pt;"><strong>RESCHEDULE</strong></span></div></li></ul>
 <blockquote>
-<p style="text-align:justify;"><span style="font-size:11pt;">Reschedule Transfer task to a time delayed by the specified number of milliseconds, if the error code is one of the specified codes and the optional intervals of date are compatible with the new time schedule<br /><br />Result of arguments will be as following options (the two first are mandatory):</span></p></blockquote>
+<p style="text-align:justify;"><span style="font-size:11pt;">Reschedule Transfer task to a time delayed by the specified number of milliseconds, if the error code is one of the specified code and the optional intervals of date are compatible with the new time schedule<br /><br />Result of arguments will be as following options (the two first are mandatory):</span></p></blockquote>
 <ul>
 <ul>
 <li><div style="text-align:justify;"><span style="font-size:11pt;">"-delay ms" where ms is the added number of ms on current time before retry on schedule </span></div></li>
 
-<li><div style="text-align:justify;"><span style="font-size:11pt;">"-case errorCode,errorCode,..." where errorCode is one of the following error of the current transfer (either literal or code in 1 character):<br />ConnectionImpossible(C), ServerOverloaded(l), BadAuthent(A), ExternalOp(E), TransferError(T), MD5Error(M), Disconnection(D), RemoteShutdown(r), FinalOp(F), Unimplemented(U), Shutdown(S), RemoteError(R), Internal(I), StoppedTransfer(H), CanceledTransfer(K), Warning(W), Unknown(-), QueryAlreadyFinished(Q), QueryStillRunning(s), NotKnownHost(N), QueryRemotelyUnknown(u), FileNotFound(f), CommandNotFound(c), PassThroughMode(p) </span></div></li>
+<li><div style="text-align:justify;"><span style="font-size:11pt;">"-case code,code,..." where code is one of the following error of the current transfer (either literal or code in 1 character):<br />ConnectionImpossible(C), ServerOverloaded(l), BadAuthent(A), ExternalOp(E), TransferError(T), MD5Error(M), Disconnection(D), RemoteShutdown(r), FinalOp(F), Unimplemented(U), Shutdown(S), RemoteError(R), Internal(I), StoppedTransfer(H), CanceledTransfer(K), Warning(W), Unknown(-), QueryAlreadyFinished(Q), QueryStillRunning(s), NotKnownHost(N), QueryRemotelyUnknown(u), FileNotFound(f), CommandNotFound(c), PassThroughMode(p) </span></div></li>
 
 <li><div style="text-align:justify;"><span style="font-size:11pt;">"-between start;end" and/or "-notbetween start;end" (multiple times are allowed, start or end can be not set) and where start and stop are in the following format:<br />Yn:Mn:Dn:Hn:mn:Sn where n is a number for each time specification, each specification is optional, as Y=Year, M=Month, D=Day, H=Hour, m=minute, s=second.<br />Format can be X+n, X-n, X=n or Xn where X+-n means adding/subtracting n to current date value, while X=n or Xn means setting exact value<br />If one time specification is not set, it is based on the current date.<br /><br />If "-notbetween" is specified, the planned date must not be in the area.<br />If "-between" is specified, the planned date must be found in any such specified areas (could be in any of the occurrence). If not specified, it only depends on "-notbetween".<br />If none is specified, the planned date is always valid.</span></div></li>