From 4d69d25520389d6ad5fea3628f634e94f51f3667 Mon Sep 17 00:00:00 2001
From: SenSyF-S5 <sensyf-s5@sb-10-15-22-20.sensyf.terradue.int>
Date: Tue, 24 Nov 2015 10:42:22 +0100
Subject: [PATCH] prepare.sh node paralellized, again.

---
 pom.xml                                                       | 2 +-
 src/main/app-resources/application.xml                        | 4 ----
 src/main/app-resources/s5_mcd_par_models/prepare.sh           | 1 -
 .../app-resources/s5_mcd_par_models/s5_mcd_par_models.xml     | 4 ----
 src/main/app-resources/s5_mcd_seq/prepare.sh                  | 1 -
 src/main/app-resources/s5_mcd_seq/s5_mcd_seq.xml              | 4 ----
 6 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd4ac1f..3e80202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>pom</packaging>
 	<name>dcs-bash</name>
 	<description>dcs-bash</description>
-	<version>1.0.4</version>
+	<version>1.0.5</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/app-resources/application.xml b/src/main/app-resources/application.xml
index b79d9da..1bb0fe6 100644
--- a/src/main/app-resources/application.xml
+++ b/src/main/app-resources/application.xml
@@ -8,10 +8,6 @@
 				<parameter id="dataset" title="Dataset" abstract="Valid values: for SPOT4: Argentina, Morocco, China, Jordan. For LANDSAT_8: Argentina, Spain." scope="runtime" type="opensearch" target="searchTerms">Argentina</parameter>
 				<parameter id="ts" title="Time series" abstract="Time series to use. Put here 1 or 2." scope="runtime">1</parameter>
 			</defaultParameters>
-			<!-- A one job mission :-) ! -->
-			<defaultJobconf>
-				<property id="ciop.job.max.tasks">1</property>
-			</defaultJobconf>
 		</jobTemplate>
 		<!-- train_params job template  -->
 		<jobTemplate id="train_params">
diff --git a/src/main/app-resources/s5_mcd_par_models/prepare.sh b/src/main/app-resources/s5_mcd_par_models/prepare.sh
index 26c8cdd..1b22571 100755
--- a/src/main/app-resources/s5_mcd_par_models/prepare.sh
+++ b/src/main/app-resources/s5_mcd_par_models/prepare.sh
@@ -139,4 +139,3 @@ ciop-publish "$OUTDIR/*"
 #ciop-publish "$OUTDIR"
 
 exit 0
-
diff --git a/src/main/app-resources/s5_mcd_par_models/s5_mcd_par_models.xml b/src/main/app-resources/s5_mcd_par_models/s5_mcd_par_models.xml
index b79d9da..1bb0fe6 100644
--- a/src/main/app-resources/s5_mcd_par_models/s5_mcd_par_models.xml
+++ b/src/main/app-resources/s5_mcd_par_models/s5_mcd_par_models.xml
@@ -8,10 +8,6 @@
 				<parameter id="dataset" title="Dataset" abstract="Valid values: for SPOT4: Argentina, Morocco, China, Jordan. For LANDSAT_8: Argentina, Spain." scope="runtime" type="opensearch" target="searchTerms">Argentina</parameter>
 				<parameter id="ts" title="Time series" abstract="Time series to use. Put here 1 or 2." scope="runtime">1</parameter>
 			</defaultParameters>
-			<!-- A one job mission :-) ! -->
-			<defaultJobconf>
-				<property id="ciop.job.max.tasks">1</property>
-			</defaultJobconf>
 		</jobTemplate>
 		<!-- train_params job template  -->
 		<jobTemplate id="train_params">
diff --git a/src/main/app-resources/s5_mcd_seq/prepare.sh b/src/main/app-resources/s5_mcd_seq/prepare.sh
index 1e4b15c..c72a673 100755
--- a/src/main/app-resources/s5_mcd_seq/prepare.sh
+++ b/src/main/app-resources/s5_mcd_seq/prepare.sh
@@ -139,4 +139,3 @@ ciop-publish "$OUTDIR/*"
 #ciop-publish "$OUTDIR"
 
 exit 0
-
diff --git a/src/main/app-resources/s5_mcd_seq/s5_mcd_seq.xml b/src/main/app-resources/s5_mcd_seq/s5_mcd_seq.xml
index 2f71327..1667d06 100644
--- a/src/main/app-resources/s5_mcd_seq/s5_mcd_seq.xml
+++ b/src/main/app-resources/s5_mcd_seq/s5_mcd_seq.xml
@@ -13,9 +13,6 @@
                 <parameter id="ts" title="Time series" abstract="Time series to use. Put here 1 or 2." scope="runtime">1</parameter>
                 <parameter id="subsampling" title="Subsampling" abstract="Subsample image for processing (default: 1, no subsampling)." scope="runtime">1</parameter>
             </defaultParameters>
-            <defaultJobconf>
-                <property id="ciop.job.max.tasks">1</property>
-            </defaultJobconf>
          </jobTemplate>
     </jobTemplates>
 
@@ -45,4 +42,3 @@
         </node>
     </workflow>
 </application>
-