diff --git a/utils/oracle/DBExport.bat b/utils/oracle/DBExport.bat index 54566e63bf..bc6e6583d2 100644 --- a/utils/oracle/DBExport.bat +++ b/utils/oracle/DBExport.bat @@ -7,14 +7,15 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: userAccount @if (%1) == () goto usage @Rem Cleanup -@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql +@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql @Rem The Export -@exp %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp Log=%ADEMPIERE_HOME%\data\ExpDat.log CONSISTENT=Y STATISTICS=NONE OWNER=%1 +@exp %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp Log=%ADEMPIERE_HOME%\data\ExpDat.log CONSISTENT=Y STATISTICS=NONE OWNER=%1 @cd %ADEMPIERE_HOME%\Data @copy ExpDat.jar ExpDatOld.jar diff --git a/utils/oracle/DBExport.sh b/utils/oracle/DBExport.sh index 50c7a3d031..3a6a66c039 100644 --- a/utils/oracle/DBExport.sh +++ b/utils/oracle/DBExport.sh @@ -19,10 +19,10 @@ if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] fi # Cleanup -sqlplus $1/$2@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Daily.sql +sqlplus $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Daily.sql # Export -exp $1/$2@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp Log=$ADEMPIERE_HOME/data/ExpDat.log CONSISTENT=Y OWNER=$1 +exp $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp Log=$ADEMPIERE_HOME/data/ExpDat.log CONSISTENT=Y OWNER=$1 cd $ADEMPIERE_HOME/data jar cvfM ExpDat.jar ExpDat.dmp ExpDat.log diff --git a/utils/oracle/DBExportFull.bat b/utils/oracle/DBExportFull.bat index 536a82ada6..874666c854 100644 --- a/utils/oracle/DBExportFull.bat +++ b/utils/oracle/DBExportFull.bat @@ -7,14 +7,15 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: systemAccount @if (%1) == () goto usage -@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql +@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql -@exp %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDatFull.dmp Log=%ADEMPIERE_HOME%\data\ExpDatFull.log CONSISTENT=Y STATISTICS=NONE FULL=Y +@exp %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDatFull.dmp Log=%ADEMPIERE_HOME%\data\ExpDatFull.log CONSISTENT=Y STATISTICS=NONE FULL=Y @cd %ADEMPIERE_HOME%\data @jar cvfM data\ExpDatFull.jar ExpDatFull.dmp ExpDatFull.log diff --git a/utils/oracle/DBExportFull.sh b/utils/oracle/DBExportFull.sh index 81c909da82..ff5b83c8bf 100644 --- a/utils/oracle/DBExportFull.sh +++ b/utils/oracle/DBExportFull.sh @@ -18,7 +18,7 @@ if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] exit 1 fi -exp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDatFull.dmp Log=$ADEMPIERE_HOME/data/ExpDatFull.log CONSISTENT=Y FULL=Y +exp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDatFull.dmp Log=$ADEMPIERE_HOME/data/ExpDatFull.log CONSISTENT=Y FULL=Y cd $ADEMPIERE_HOME/data jar cvfM ExpDatFull.jar ExpDatFull.dmp ExpDatFull.log diff --git a/utils/oracle/DBRestore.bat b/utils/oracle/DBRestore.bat index ddf06b38a5..82bc83639f 100644 --- a/utils/oracle/DBRestore.bat +++ b/utils/oracle/DBRestore.bat @@ -7,6 +7,7 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: systemAccount adempiereID AdempierePwd @if (%1) == () goto usage @if (%2) == () goto usage @@ -15,12 +16,12 @@ @echo ------------------------------------- @echo Re-Create DB user @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 @echo ------------------------------------- @echo Import ExpDat @echo ------------------------------------- -@imp %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp FROMUSER=(%2) TOUSER=%2 STATISTICS=RECALCULATE +@imp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp FROMUSER=(%2) TOUSER=%2 STATISTICS=RECALCULATE @echo ------------------------------------- @echo Create SQLJ @@ -31,7 +32,7 @@ @echo Check System @echo Import may show some warnings. This is OK as long as the following does not show errors @echo ------------------------------------- -@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\AfterImport.sql +@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\AfterImport.sql @goto end diff --git a/utils/oracle/DBRestore.sh b/utils/oracle/DBRestore.sh index 6be152f37d..a7396775ef 100644 --- a/utils/oracle/DBRestore.sh +++ b/utils/oracle/DBRestore.sh @@ -21,12 +21,12 @@ fi echo ------------------------------------- echo Re-Create DB user echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 echo ------------------------------------- echo Import ExpDat echo ------------------------------------- -imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp FROMUSER=\($2\) TOUSER=$2 +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp FROMUSER=\($2\) TOUSER=$2 echo ------------------------------------- echo Create SQLJ @@ -37,4 +37,4 @@ echo ------------------------------------- echo Check System echo Import may show some warnings. This is OK as long as the following does not show errors echo ------------------------------------- -sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/utils/oracle/ExportReference.sh b/utils/oracle/ExportReference.sh index c265464e2c..98242ffa08 100755 --- a/utils/oracle/ExportReference.sh +++ b/utils/oracle/ExportReference.sh @@ -13,7 +13,7 @@ if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] fi # Export -exp reference/reference@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp Log=$ADEMPIERE_HOME/data/Adempiere.log CONSISTENT=Y OWNER=reference +exp reference/reference@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp Log=$ADEMPIERE_HOME/data/Adempiere.log CONSISTENT=Y OWNER=reference cd $ADEMPIERE_HOME/data jar cvfM Adempiere.jar Adempiere.dmp Adempiere.log diff --git a/utils/oracle/ImportAdempiere.bat b/utils/oracle/ImportAdempiere.bat index 4265167a60..931f786e17 100644 --- a/utils/oracle/ImportAdempiere.bat +++ b/utils/oracle/ImportAdempiere.bat @@ -7,6 +7,7 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameters systemAccount AdempiereID AdempierePwd @if (%1) == () goto usage @if (%2) == () goto usage @@ -15,12 +16,12 @@ @echo ------------------------------------- @echo Re-Create DB user @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 @echo ------------------------------------- @echo Import Adempiere.dmp @echo ------------------------------------- -@imp %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\Adempiere.dmp FROMUSER=(reference) TOUSER=%2 STATISTICS=RECALCULATE +@imp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\Adempiere.dmp FROMUSER=(reference) TOUSER=%2 STATISTICS=RECALCULATE echo ------------------------------------- echo Create SQLJ @@ -31,7 +32,7 @@ call %ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\create %ADEMPIERE_DB_USER%/%ADEM @echo System Check - The Import phase showed warnings. @echo This is OK as long as the following does not show errors @echo --------========--------========--------========-------- -@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql +@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql @goto end diff --git a/utils/oracle/ImportAdempiere.sh b/utils/oracle/ImportAdempiere.sh index 45db1215e8..e9ded0d6b8 100644 --- a/utils/oracle/ImportAdempiere.sh +++ b/utils/oracle/ImportAdempiere.sh @@ -21,14 +21,14 @@ fi echo ------------------------------------- echo Re-Create DB user echo ------------------------------------- -echo sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 +echo sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 echo ------------------------------------- echo Import Adempiere.dmp echo ------------------------------------- -echo "imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" -imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 +echo "imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 echo ------------------------------------- echo Create SQLJ @@ -39,5 +39,5 @@ echo ------------------------------------- echo Check System echo Import may show some warnings. This is OK as long as the following does not show errors echo ------------------------------------- -echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql -sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/utils/oracle/ImportReference.bat b/utils/oracle/ImportReference.bat index e7b0904702..0e1ea1c96a 100644 --- a/utils/oracle/ImportReference.bat +++ b/utils/oracle/ImportReference.bat @@ -7,13 +7,14 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: systemAccount @if (%1) == () goto usage @echo ------------------------------------- @echo Re-Create new user @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql Reference Adempiere +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql Reference Adempiere @echo ------------------------------------- @echo Import Reference @@ -24,7 +25,7 @@ imp %1@%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\Reference.dmp FROMUSER=(re @echo Check System @echo Import may show some warnings. This is OK as long as the following does not show errors @echo ------------------------------------- -@sqlplus reference/adempiere@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql +@sqlplus reference/adempiere@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql @goto end diff --git a/utils/oracle/ImportReference.sh b/utils/oracle/ImportReference.sh index 5ba10de9c5..e8f75f97f9 100644 --- a/utils/oracle/ImportReference.sh +++ b/utils/oracle/ImportReference.sh @@ -21,17 +21,17 @@ fi echo ------------------------------------- echo Re-Create new user echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql Reference Adempiere +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql Reference Adempiere echo ------------------------------------- echo Import Reference echo ------------------------------------- echo imp $1@$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Reference.dmp FROMUSER=\(reference\) TOUSER=reference -imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Reference.dmp FROMUSER=\(reference\) TOUSER=reference +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Reference.dmp FROMUSER=\(reference\) TOUSER=reference echo ------------------------------------- echo Check System echo Import may show some warnings. This is OK as long as the following does not show errors echo ------------------------------------- -sqlplus reference/adempiere@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +sqlplus reference/adempiere@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/utils/oracle/PostMigration.sh b/utils/oracle/PostMigration.sh index f1fdace845..43fed7b025 100644 --- a/utils/oracle/PostMigration.sh +++ b/utils/oracle/PostMigration.sh @@ -18,4 +18,4 @@ fi echo ------------------------------------- echo Add missing translations echo ------------------------------------- -echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/01_add_missing_Translations.sql +echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/01_add_missing_Translations.sql diff --git a/utils/oracle/Start.bat b/utils/oracle/Start.bat index 818ad98b87..af58d01cf6 100644 --- a/utils/oracle/Start.bat +++ b/utils/oracle/Start.bat @@ -4,7 +4,7 @@ lsnrctl start @Echo Starting Database .... -@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Start.sql +@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Start.sql @Echo Starting optional agent .... agentctl start diff --git a/utils/oracle/Start.sh b/utils/oracle/Start.sh index f8de498a4b..517569ff10 100644 --- a/utils/oracle/Start.sh +++ b/utils/oracle/Start.sh @@ -1,3 +1,3 @@ # $Id: Start.sh,v 1.6 2005/01/22 21:59:15 jjanke Exp $ -sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql +sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql diff --git a/utils/oracle/Stop.bat b/utils/oracle/Stop.bat index 8631536471..6a663d6e44 100644 --- a/utils/oracle/Stop.bat +++ b/utils/oracle/Stop.bat @@ -1,7 +1,7 @@ @Rem $Id: Stop.bat,v 1.7 2005/01/22 21:59:15 jjanke Exp $ @Echo Stopping database .... -@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Stop.sql +@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Stop.sql @Echo Stopping Listener .... lsnrctl stop diff --git a/utils/oracle/Stop.sh b/utils/oracle/Stop.sh index 498f9cd10f..98c04a9dae 100644 --- a/utils/oracle/Stop.sh +++ b/utils/oracle/Stop.sh @@ -4,5 +4,5 @@ # SET ORACLE_SID= # export ORACLE_SID -sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql +sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql diff --git a/utils/oracleXE/DBExport.bat b/utils/oracleXE/DBExport.bat index 54566e63bf..bc6e6583d2 100644 --- a/utils/oracleXE/DBExport.bat +++ b/utils/oracleXE/DBExport.bat @@ -7,14 +7,15 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: userAccount @if (%1) == () goto usage @Rem Cleanup -@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql +@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql @Rem The Export -@exp %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp Log=%ADEMPIERE_HOME%\data\ExpDat.log CONSISTENT=Y STATISTICS=NONE OWNER=%1 +@exp %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp Log=%ADEMPIERE_HOME%\data\ExpDat.log CONSISTENT=Y STATISTICS=NONE OWNER=%1 @cd %ADEMPIERE_HOME%\Data @copy ExpDat.jar ExpDatOld.jar diff --git a/utils/oracleXE/DBExport.sh b/utils/oracleXE/DBExport.sh index 50c7a3d031..3a6a66c039 100644 --- a/utils/oracleXE/DBExport.sh +++ b/utils/oracleXE/DBExport.sh @@ -19,10 +19,10 @@ if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] fi # Cleanup -sqlplus $1/$2@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Daily.sql +sqlplus $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Daily.sql # Export -exp $1/$2@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp Log=$ADEMPIERE_HOME/data/ExpDat.log CONSISTENT=Y OWNER=$1 +exp $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp Log=$ADEMPIERE_HOME/data/ExpDat.log CONSISTENT=Y OWNER=$1 cd $ADEMPIERE_HOME/data jar cvfM ExpDat.jar ExpDat.dmp ExpDat.log diff --git a/utils/oracleXE/DBExportFull.bat b/utils/oracleXE/DBExportFull.bat index 536a82ada6..874666c854 100644 --- a/utils/oracleXE/DBExportFull.bat +++ b/utils/oracleXE/DBExportFull.bat @@ -7,14 +7,15 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: systemAccount @if (%1) == () goto usage -@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql +@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql -@exp %1/%2@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDatFull.dmp Log=%ADEMPIERE_HOME%\data\ExpDatFull.log CONSISTENT=Y STATISTICS=NONE FULL=Y +@exp %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDatFull.dmp Log=%ADEMPIERE_HOME%\data\ExpDatFull.log CONSISTENT=Y STATISTICS=NONE FULL=Y @cd %ADEMPIERE_HOME%\data @jar cvfM data\ExpDatFull.jar ExpDatFull.dmp ExpDatFull.log diff --git a/utils/oracleXE/DBExportFull.sh b/utils/oracleXE/DBExportFull.sh index 81c909da82..ff5b83c8bf 100644 --- a/utils/oracleXE/DBExportFull.sh +++ b/utils/oracleXE/DBExportFull.sh @@ -18,7 +18,7 @@ if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] exit 1 fi -exp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDatFull.dmp Log=$ADEMPIERE_HOME/data/ExpDatFull.log CONSISTENT=Y FULL=Y +exp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDatFull.dmp Log=$ADEMPIERE_HOME/data/ExpDatFull.log CONSISTENT=Y FULL=Y cd $ADEMPIERE_HOME/data jar cvfM ExpDatFull.jar ExpDatFull.dmp ExpDatFull.log diff --git a/utils/oracleXE/DBRestore.bat b/utils/oracleXE/DBRestore.bat index 96937ec9c4..42993978c5 100644 --- a/utils/oracleXE/DBRestore.bat +++ b/utils/oracleXE/DBRestore.bat @@ -7,6 +7,7 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: systemAccount adempiereID AdempierePwd @if (%1) == () goto usage @if (%2) == () goto usage @@ -15,18 +16,23 @@ @echo ------------------------------------- @echo Re-Create DB user @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 @echo ------------------------------------- @echo Import ExpDat @echo ------------------------------------- -@imp %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp FROMUSER=(%2) TOUSER=%2 STATISTICS=RECALCULATE +@imp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\ExpDat.dmp FROMUSER=(%2) TOUSER=%2 STATISTICS=RECALCULATE + +REM @echo ------------------------------------- +REM @echo Create SQLJ +REM @echo ------------------------------------- +REM @call %ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\create %ADEMPIERE_DB_USER%/%ADEMPIERE_DB_PASSWORD% @echo ------------------------------------- @echo Check System @echo Import may show some warnings. This is OK as long as the following does not show errors @echo ------------------------------------- -@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\AfterImport.sql +@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\AfterImport.sql @goto end diff --git a/utils/oracleXE/DBRestore.sh b/utils/oracleXE/DBRestore.sh index 28d43fa4c0..56b5421721 100644 --- a/utils/oracleXE/DBRestore.sh +++ b/utils/oracleXE/DBRestore.sh @@ -21,15 +21,20 @@ fi echo ------------------------------------- echo Re-Create DB user echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 echo ------------------------------------- echo Import ExpDat echo ------------------------------------- -imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp FROMUSER=\($2\) TOUSER=$2 +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/ExpDat.dmp FROMUSER=\($2\) TOUSER=$2 + +# echo ------------------------------------- +# echo Create SQLJ +# echo ------------------------------------- +# $ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/create.sh $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD echo ------------------------------------- echo Check System echo Import may show some warnings. This is OK as long as the following does not show errors echo ------------------------------------- -sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/utils/oracleXE/ExportReference.sh b/utils/oracleXE/ExportReference.sh index c265464e2c..98242ffa08 100755 --- a/utils/oracleXE/ExportReference.sh +++ b/utils/oracleXE/ExportReference.sh @@ -13,7 +13,7 @@ if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] fi # Export -exp reference/reference@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp Log=$ADEMPIERE_HOME/data/Adempiere.log CONSISTENT=Y OWNER=reference +exp reference/reference@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp Log=$ADEMPIERE_HOME/data/Adempiere.log CONSISTENT=Y OWNER=reference cd $ADEMPIERE_HOME/data jar cvfM Adempiere.jar Adempiere.dmp Adempiere.log diff --git a/utils/oracleXE/ImportAdempiere.bat b/utils/oracleXE/ImportAdempiere.bat index 06b76c9fb1..16eda14090 100644 --- a/utils/oracleXE/ImportAdempiere.bat +++ b/utils/oracleXE/ImportAdempiere.bat @@ -7,6 +7,7 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameters systemAccount AdempiereID AdempierePwd @if (%1) == () goto usage @if (%2) == () goto usage @@ -15,18 +16,23 @@ @echo ------------------------------------- @echo Re-Create DB user @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 @echo ------------------------------------- @echo Import Adempiere.dmp @echo ------------------------------------- -@imp %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\Adempiere.dmp FROMUSER=(reference) TOUSER=%2 STATISTICS=RECALCULATE +@imp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\Adempiere.dmp FROMUSER=(reference) TOUSER=%2 STATISTICS=RECALCULATE + +REM echo ------------------------------------- +REM echo Create SQLJ +REM echo ------------------------------------- +REM call %ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\create %ADEMPIERE_DB_USER%/%ADEMPIERE_DB_PASSWORD% @echo --------========--------========--------========-------- @echo System Check - The Import phase showed warnings. @echo This is OK as long as the following does not show errors @echo --------========--------========--------========-------- -@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql +@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql @goto end diff --git a/utils/oracleXE/ImportAdempiere.sh b/utils/oracleXE/ImportAdempiere.sh index 7d9912b964..ea50d59377 100644 --- a/utils/oracleXE/ImportAdempiere.sh +++ b/utils/oracleXE/ImportAdempiere.sh @@ -21,18 +21,23 @@ fi echo ------------------------------------- echo Re-Create DB user echo ------------------------------------- -echo sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 +echo sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 echo ------------------------------------- echo Import Adempiere.dmp echo ------------------------------------- -echo "imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" -imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 +echo "imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 + +# echo ------------------------------------- +# echo Create SQLJ +# echo ------------------------------------- +# $ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/create.sh $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD echo ------------------------------------- echo Check System echo Import may show some warnings. This is OK as long as the following does not show errors echo ------------------------------------- -echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql -sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/utils/oracleXE/ImportReference.bat b/utils/oracleXE/ImportReference.bat index e7b0904702..0e1ea1c96a 100644 --- a/utils/oracleXE/ImportReference.bat +++ b/utils/oracleXE/ImportReference.bat @@ -7,13 +7,14 @@ @if (%ADEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment +@if (%ADEMPIERE_DB_PORT%) == () goto environment @Rem Must have parameter: systemAccount @if (%1) == () goto usage @echo ------------------------------------- @echo Re-Create new user @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql Reference Adempiere +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql Reference Adempiere @echo ------------------------------------- @echo Import Reference @@ -24,7 +25,7 @@ imp %1@%ADEMPIERE_DB_NAME% FILE=%ADEMPIERE_HOME%\data\Reference.dmp FROMUSER=(re @echo Check System @echo Import may show some warnings. This is OK as long as the following does not show errors @echo ------------------------------------- -@sqlplus reference/adempiere@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql +@sqlplus reference/adempiere@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql @goto end diff --git a/utils/oracleXE/ImportReference.sh b/utils/oracleXE/ImportReference.sh index 5ba10de9c5..e8f75f97f9 100644 --- a/utils/oracleXE/ImportReference.sh +++ b/utils/oracleXE/ImportReference.sh @@ -21,17 +21,17 @@ fi echo ------------------------------------- echo Re-Create new user echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql Reference Adempiere +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql Reference Adempiere echo ------------------------------------- echo Import Reference echo ------------------------------------- echo imp $1@$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Reference.dmp FROMUSER=\(reference\) TOUSER=reference -imp $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Reference.dmp FROMUSER=\(reference\) TOUSER=reference +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Reference.dmp FROMUSER=\(reference\) TOUSER=reference echo ------------------------------------- echo Check System echo Import may show some warnings. This is OK as long as the following does not show errors echo ------------------------------------- -sqlplus reference/adempiere@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +sqlplus reference/adempiere@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/utils/oracleXE/PostMigration.sh b/utils/oracleXE/PostMigration.sh index f1fdace845..43fed7b025 100644 --- a/utils/oracleXE/PostMigration.sh +++ b/utils/oracleXE/PostMigration.sh @@ -18,4 +18,4 @@ fi echo ------------------------------------- echo Add missing translations echo ------------------------------------- -echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/01_add_missing_Translations.sql +echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/01_add_missing_Translations.sql diff --git a/utils/oracleXE/Start.bat b/utils/oracleXE/Start.bat index 818ad98b87..af58d01cf6 100644 --- a/utils/oracleXE/Start.bat +++ b/utils/oracleXE/Start.bat @@ -4,7 +4,7 @@ lsnrctl start @Echo Starting Database .... -@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Start.sql +@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Start.sql @Echo Starting optional agent .... agentctl start diff --git a/utils/oracleXE/Start.sh b/utils/oracleXE/Start.sh index f8de498a4b..517569ff10 100644 --- a/utils/oracleXE/Start.sh +++ b/utils/oracleXE/Start.sh @@ -1,3 +1,3 @@ # $Id: Start.sh,v 1.6 2005/01/22 21:59:15 jjanke Exp $ -sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql +sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql diff --git a/utils/oracleXE/Stop.bat b/utils/oracleXE/Stop.bat index 8631536471..6a663d6e44 100644 --- a/utils/oracleXE/Stop.bat +++ b/utils/oracleXE/Stop.bat @@ -1,7 +1,7 @@ @Rem $Id: Stop.bat,v 1.7 2005/01/22 21:59:15 jjanke Exp $ @Echo Stopping database .... -@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Stop.sql +@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Stop.sql @Echo Stopping Listener .... lsnrctl stop diff --git a/utils/oracleXE/Stop.sh b/utils/oracleXE/Stop.sh index 498f9cd10f..98c04a9dae 100644 --- a/utils/oracleXE/Stop.sh +++ b/utils/oracleXE/Stop.sh @@ -4,5 +4,5 @@ # SET ORACLE_SID= # export ORACLE_SID -sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql +sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql