From 655a92717ac2e477296d07465e9ec5cc658bbdc7 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sun, 30 Oct 2016 20:39:16 +0100
Subject: [PATCH] prepare build.xml files for new version

---
 migration/i3.1z/oracle/build.xml              | 50 ------------------
 migration/i3.1z/postgresql/build.xml          | 51 -------------------
 migration/{i2.1z => i4.1}/oracle/build.xml    |  0
 .../{i2.1z => i4.1}/postgresql/build.xml      |  0
 migration/{i3.1 => i4.1z}/oracle/build.xml    |  0
 .../{i3.1 => i4.1z}/postgresql/build.xml      |  0
 6 files changed, 101 deletions(-)
 delete mode 100644 migration/i3.1z/oracle/build.xml
 delete mode 100644 migration/i3.1z/postgresql/build.xml
 rename migration/{i2.1z => i4.1}/oracle/build.xml (100%)
 rename migration/{i2.1z => i4.1}/postgresql/build.xml (100%)
 rename migration/{i3.1 => i4.1z}/oracle/build.xml (100%)
 rename migration/{i3.1 => i4.1z}/postgresql/build.xml (100%)

diff --git a/migration/i3.1z/oracle/build.xml b/migration/i3.1z/oracle/build.xml
deleted file mode 100644
index 1a512769ce..0000000000
--- a/migration/i3.1z/oracle/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<project name="migrate-db-oracle" default="run-scripts" basedir=".">
-	<property file="../../oracle.properties" />
-	<path id="lib.path">
-		<fileset dir="../../../db/ddlutils/lib">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	<taskdef resource="net/sf/antcontrib/antlib.xml">
-		<classpath>
-			<fileset dir="../../../db/ddlutils/lib">
-				<include name="**/*.jar" />
-			</fileset>
-		</classpath>
-	</taskdef>
-
-	<target name="init">
-		<echo message="============================================================" />
-		<echo message="     Oracle database migration tool for Adempiere ERP" />
-		<echo message="	  	Adempiere License is GNU GPL License" />
-		<echo message="============================================================" />
-		<echo message="" file="sqlplus.log" append="false" />
-		<echo append="false" file="build.log" message="#Build log:${line.separator}${line.separator}" />
-	</target>
-
-	<target name="run-scripts" depends="init">
-		<echo message="----- Running migration SQL scripts -----" />
-		<echo file="sqlplus.log" append="true" message="${line.separator}#Run Scripts:${line.separator}${line.separator}" />
-		<foreach param="file.name" target="load">
-			<path>
-				<fileset dir=".">
-					<include name="*.sql" />
-				</fileset>
-			</path>
-		</foreach>
-	</target>
-
-	<target name="load">
-		<echo message="Loading file ${file.name}" />
-		<exec dir="${oracle.home}/bin" executable="${oracle.home}/bin/sqlplus" resultproperty="sqlplus.result" output="sqlplus.log" append="true">
-			<arg line="${oracle.connect.param}" />
-			<arg line='@"${file.name}"'/>
-		</exec>
-		<echo message="File ${file.name} status ${sqlplus.result}" />
-		<echo append="true" file="build.log">File ${file.name} status ${sqlplus.result}</echo>
-		<echo append="true" file="build.log" message="${line.separator}" />
-	</target>
-
-</project>
-
-
diff --git a/migration/i3.1z/postgresql/build.xml b/migration/i3.1z/postgresql/build.xml
deleted file mode 100644
index 2627f11fdb..0000000000
--- a/migration/i3.1z/postgresql/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<project name="migrate-db-postgre" default="run-scripts" basedir=".">
-	<property file="../../postgresql.properties" />
-	<path id="lib.path">
-		<fileset dir="../../../db/ddlutils/lib">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	<taskdef resource="net/sf/antcontrib/antlib.xml">
-		<classpath>
-			<fileset dir="../../../db/ddlutils/lib">
-				<include name="**/*.jar" />
-			</fileset>
-		</classpath>
-	</taskdef>
-
-	<target name="init">
-		<echo message="============================================================" />
-		<echo message="     PostgreSQL database update tool for Adempiere ERP" />
-		<echo message="	  	Adempiere License is GNU GPL License" />
-		<echo message="============================================================" />
-		<echo message="" file="psql.log" append="false" />
-		<echo append="false" file="build.log" message="#Build log:${line.separator}${line.separator}" />
-	</target>
-        
-	<target name="run-scripts" depends="init">
-		<echo message="----- Running migration SQL scripts -----" />
-		<echo file="psql.log" append="true" message="${line.separator}#Run Scripts:${line.separator}${line.separator}" />
-		<foreach param="file.name" target="load">
-			<path>
-				<fileset dir=".">
-					<include name="*.sql" />
-				</fileset>
-			</path>
-		</foreach>
-	</target>
-
-	<target name="load">
-		<echo message="Loading file ${file.name}" />
-		<exec dir="${postgresql.home}/bin" executable="${postgresql.home}/bin/psql" resultproperty="psql.result" output="psql.log" append="true">
-			<arg line="-h ${postgresql.host}" />
-			<arg line="-d ${postgresql.database} -q" />
-			<arg line="-U ${postgresql.user}" /> 
-			<arg line="-p ${postgresql.port}"/>
-			<arg line='-f "${file.name}"' />
-			<env key="PGPASSWORD" value="${postgresql.password}" />
-		</exec>
-		<echo message="File ${file.name} status ${psql.result}" />
-		<echo append="true" file="build.log">File ${file.name} status ${psql.result}</echo>
-		<echo append="true" file="build.log" message="${line.separator}" />
-	</target>
-</project>
diff --git a/migration/i2.1z/oracle/build.xml b/migration/i4.1/oracle/build.xml
similarity index 100%
rename from migration/i2.1z/oracle/build.xml
rename to migration/i4.1/oracle/build.xml
diff --git a/migration/i2.1z/postgresql/build.xml b/migration/i4.1/postgresql/build.xml
similarity index 100%
rename from migration/i2.1z/postgresql/build.xml
rename to migration/i4.1/postgresql/build.xml
diff --git a/migration/i3.1/oracle/build.xml b/migration/i4.1z/oracle/build.xml
similarity index 100%
rename from migration/i3.1/oracle/build.xml
rename to migration/i4.1z/oracle/build.xml
diff --git a/migration/i3.1/postgresql/build.xml b/migration/i4.1z/postgresql/build.xml
similarity index 100%
rename from migration/i3.1/postgresql/build.xml
rename to migration/i4.1z/postgresql/build.xml