diff --git a/org.adempiere.server-feature/adempiere-server.bat b/org.adempiere.server-feature/adempiere-server.bat index b1e04eef88..802379d090 100644 --- a/org.adempiere.server-feature/adempiere-server.bat +++ b/org.adempiere.server-feature/adempiere-server.bat @@ -17,4 +17,4 @@ goto START @Echo Starting Adempiere Server ... @Echo ======================================= -@"%JAVA%" -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -console +@"%JAVA%" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -console -application org.adempiere.server.application diff --git a/org.adempiere.server-feature/adempiere-server.sh b/org.adempiere.server-feature/adempiere-server.sh index 538c60878f..93c1df8a33 100644 --- a/org.adempiere.server-feature/adempiere-server.sh +++ b/org.adempiere.server-feature/adempiere-server.sh @@ -13,4 +13,4 @@ echo =================================== echo Starting Adempiere Server echo =================================== -$JAVA -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -console +$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -console -application org.adempiere.server.application diff --git a/org.adempiere.server-feature/build.properties b/org.adempiere.server-feature/build.properties index 3bdec20bdd..791c39632b 100644 --- a/org.adempiere.server-feature/build.properties +++ b/org.adempiere.server-feature/build.properties @@ -1,5 +1,15 @@ bin.includes = feature.xml -root=file:setup.bat,file:setup.sh,file:console-setup.sh,file:console-setup.bat,file:build.xml,file:adempiere-server.bat,file:adempiere-server.sh +root=file:build.xml,file:setup.ini root.folder.data=data -root.folder.utils=utils -root.folder.setup-configuration=setup-configuration \ No newline at end of file +root.folder.setup=setup +#linux +root.linux.gtk.x86=file:setup.sh,file:console-setup.sh,file:adempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh +root.linux.gtk.x86.folder.utils=utils.unix +root.linux.gtk.x86.permissions.755=*.sh,**/*.sh +#mac +root.macosx.cocoa.x86=file:setup.sh,file:console-setup.sh,file:adempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh +root.macosx.cocoa.x86.folder.utils=utils.unix +root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh +#windows +root.win32.win32.x86=file:setup.bat,file:console-setup.bat,file:adempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat +root.win32.win32.x86.folder.utils=utils.unix diff --git a/org.adempiere.server-feature/console-setup-alt.bat b/org.adempiere.server-feature/console-setup-alt.bat new file mode 100644 index 0000000000..c46ffd245d --- /dev/null +++ b/org.adempiere.server-feature/console-setup-alt.bat @@ -0,0 +1,38 @@ +@Title Install Adempiere Server +@Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $ +@Echo off + + +@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK +@Set JAVA=java +@Echo JAVA_HOME is not set. +@Echo You may not be able to start the required Setup window !! +@Echo Set JAVA_HOME to the directory of your local 1.5 JDK. +@Echo If you experience problems, run utils/WinEnv.js +@Echo Example: cscript utils\WinEnv.js C:\Adempiere "C:\Program Files\Java\jdk1.5.0_04" +goto START + +:JAVA_HOME_OK +@Set JAVA=%JAVA_HOME%\bin\java + + +:START +@REM Setup Adempiere.properties and AdempiereEnv.properties +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.adempiere.install.console.application + +@Echo ErrorLevel = %ERRORLEVEL% +@IF NOT ERRORLEVEL = 1 GOTO NEXT +@Echo *************************************** +@Echo Check the error message above. +@Echo *************************************** +@Pause +@Exit + +:NEXT +@REM setup tomcat +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.eclipse.ant.core.antRunner -buildfile build.xml + +@Echo . +@Echo For problems, check log file in base directory +@Rem Wait 10 second +@PING 1.1.1.1 -n 1 -w 10000 > NUL diff --git a/org.adempiere.server-feature/console-setup-alt.sh b/org.adempiere.server-feature/console-setup-alt.sh new file mode 100644 index 0000000000..b608204711 --- /dev/null +++ b/org.adempiere.server-feature/console-setup-alt.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# +echo Setup Adempiere Server +# $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $ + +if [ $JAVA_HOME ]; then + JAVA=$JAVA_HOME/bin/java + KEYTOOL=$JAVA_HOME/bin/keytool +else + JAVA=java + KEYTOOL=keytool + echo JAVA_HOME is not set. + echo You may not be able to start the Setup + echo Set JAVA_HOME to the directory of your local JDK. +fi + + +# Setup Adempiere.properties and AdempiereEnv.properties +$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.adempiere.install.console.application + +# Setup Tomcat +$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml + +echo =================================== +echo Make .sh executable & set Env +echo =================================== +chmod -R a+x *.sh +find . -name '*.sh' -exec chmod a+x '{}' \; + +echo . +echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/console-setup.bat b/org.adempiere.server-feature/console-setup.bat index 51e20a5051..a62a02b345 100644 --- a/org.adempiere.server-feature/console-setup.bat +++ b/org.adempiere.server-feature/console-setup.bat @@ -1,27 +1,9 @@ @Title Install Adempiere Server -@Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $ @Echo off -@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK -@Set JAVA=java -@Echo JAVA_HOME is not set. -@Echo You may not be able to start the required Setup window !! -@Echo Set JAVA_HOME to the directory of your local 1.5 JDK. -@Echo If you experience problems, run utils/WinEnv.js -@Echo Example: cscript utils\WinEnv.js C:\Adempiere "C:\Program Files\Java\jdk1.5.0_04" -goto START - -:JAVA_HOME_OK -@Set JAVA=%JAVA_HOME%\bin\java - - -:START -@Echo ======================================= -@Echo Starting Setup Dialog ... -@Echo ======================================= - -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.adempiere.install.console.application +@REM Setup Adempiere.properties and AdempiereEnv.properties +adempiere --launcher.ini setup.ini -application org.adempiere.install.console.application @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -32,8 +14,8 @@ goto START @Exit :NEXT - -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.eclipse.ant.core.antRunner -buildfile build.xml +@REM Setup Tomcat +adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml @Echo . @Echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/console-setup.sh b/org.adempiere.server-feature/console-setup.sh index baeae0f68a..c24f407d5f 100644 --- a/org.adempiere.server-feature/console-setup.sh +++ b/org.adempiere.server-feature/console-setup.sh @@ -1,34 +1,12 @@ #!/bin/sh # -echo Install Adempiere Server -# $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $ +echo Setup Adempiere Server -if [ $JAVA_HOME ]; then - JAVA=$JAVA_HOME/bin/java - KEYTOOL=$JAVA_HOME/bin/keytool -else - JAVA=java - KEYTOOL=keytool - echo JAVA_HOME is not set. - echo You may not be able to start the Setup - echo Set JAVA_HOME to the directory of your local JDK. -fi +# Setup Adempiere.properties and AdempiereEnv.properties +./adempiere --launcher.ini setup.ini -application org.adempiere.install.console.application - -echo =================================== -echo Console Mode Setup -echo =================================== - -# OSGi: -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -application org.adempiere.install.console.application - -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -application org.eclipse.ant.core.antRunner -buildfile build.xml - -echo =================================== -echo Make .sh executable & set Env -echo =================================== -chmod -R a+x *.sh -find . -name '*.sh' -exec chmod a+x '{}' \; +# Setup Tomcat +./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml echo . echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/setup-alt.bat b/org.adempiere.server-feature/setup-alt.bat new file mode 100644 index 0000000000..1f8229bb94 --- /dev/null +++ b/org.adempiere.server-feature/setup-alt.bat @@ -0,0 +1,38 @@ +@Title Setup Adempiere Server +@Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $ +@Echo off + + +@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK +@Set JAVA=java +@Echo JAVA_HOME is not set. +@Echo You may not be able to start the required Setup window !! +@Echo Set JAVA_HOME to the directory of your local 1.5 JDK. +@Echo If you experience problems, run utils/WinEnv.js +@Echo Example: cscript utils\WinEnv.js C:\Adempiere "C:\Program Files\Java\jdk1.5.0_04" +goto START + +:JAVA_HOME_OK +@Set JAVA=%JAVA_HOME%\bin\java + + +:START +@REM Setup Adempiere.properties and AdempiereEnv.properties +@"%JAVA%" -Dosgi.noShutdown=true -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.adempiere.install.application -consoleLog + +@Echo ErrorLevel = %ERRORLEVEL% +@IF NOT ERRORLEVEL = 1 GOTO NEXT +@Echo *************************************** +@Echo Check the error message above. +@Echo *************************************** +@Pause +@Exit + +:NEXT +@REM setup tomcat +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml + +@Echo . +@Echo For problems, check log file in base directory +@Rem Wait 10 second +@PING 1.1.1.1 -n 1 -w 10000 > NUL diff --git a/org.adempiere.server-feature/setup-alt.sh b/org.adempiere.server-feature/setup-alt.sh new file mode 100644 index 0000000000..9f30330eb5 --- /dev/null +++ b/org.adempiere.server-feature/setup-alt.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +echo Setup Adempiere Server +# $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $ + +if [ $JAVA_HOME ]; then + JAVA=$JAVA_HOME/bin/java + KEYTOOL=$JAVA_HOME/bin/keytool +else + JAVA=java + KEYTOOL=keytool + echo JAVA_HOME is not set. + echo You may not be able to start the Setup + echo Set JAVA_HOME to the directory of your local JDK. +fi + +#setup Adempiere.properties and AdempiereEnv.propertiess +$JAVA -Dosgi.noShutdown=true -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.adempiere.install.application -consoleLog + +#setup tomcat +$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml + +echo =================================== +echo Make .sh executable & set Env +echo =================================== +chmod -R a+x *.sh +find . -name '*.sh' -exec chmod a+x '{}' \; + +echo . +echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/setup.bat b/org.adempiere.server-feature/setup.bat index a58bb9e93c..1255ed074d 100644 --- a/org.adempiere.server-feature/setup.bat +++ b/org.adempiere.server-feature/setup.bat @@ -1,27 +1,8 @@ @Title Install Adempiere Server -@Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $ @Echo off - -@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK -@Set JAVA=java -@Echo JAVA_HOME is not set. -@Echo You may not be able to start the required Setup window !! -@Echo Set JAVA_HOME to the directory of your local 1.5 JDK. -@Echo If you experience problems, run utils/WinEnv.js -@Echo Example: cscript utils\WinEnv.js C:\Adempiere "C:\Program Files\Java\jdk1.5.0_04" -goto START - -:JAVA_HOME_OK -@Set JAVA=%JAVA_HOME%\bin\java - - -:START -@Echo ======================================= -@Echo Starting Setup Dialog ... -@Echo ======================================= - -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -Declipse.p2.data.area=@config.dir/p2 -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.adempiere.install.application -consoleLog +@REM Setup Adempiere.properties and AdempiereEnv.properties +adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -32,8 +13,8 @@ goto START @Exit :NEXT - -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -Declipse.p2.data.area=@config.dir/p2 -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.eclipse.ant.core.antRunner -buildfile build.xml +@REM Setup Tomcat +adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml @Echo . @Echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini new file mode 100644 index 0000000000..6220244d82 --- /dev/null +++ b/org.adempiere.server-feature/setup.ini @@ -0,0 +1,11 @@ +-startup +plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar +-install +setup +--launcher.library +plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.1.R36x_v20100810 +--launcher.XXMaxPermSize +192m +-vmargs +-Dosgi.noShutdown=false +-Dosgi.compatibility.bootdelegation=true diff --git a/org.adempiere.server-feature/setup.sh b/org.adempiere.server-feature/setup.sh index 74fb0d4d2f..fe7a1fb55d 100644 --- a/org.adempiere.server-feature/setup.sh +++ b/org.adempiere.server-feature/setup.sh @@ -1,34 +1,12 @@ #!/bin/sh # -echo Install Adempiere Server -# $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $ +echo Setup Adempiere Server -if [ $JAVA_HOME ]; then - JAVA=$JAVA_HOME/bin/java - KEYTOOL=$JAVA_HOME/bin/keytool -else - JAVA=java - KEYTOOL=keytool - echo JAVA_HOME is not set. - echo You may not be able to start the Setup - echo Set JAVA_HOME to the directory of your local JDK. -fi +# Setup Adempiere.properties and AdempiereEnv.properties +./adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application - -echo =================================== -echo Setup Dialog -echo =================================== - -# OSGi: -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -Declipse.p2.data.area=@config.dir/p2 -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.adempiere.install.application -consoleLog - -$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.configuration.area=setup-configuration -Declipse.p2.data.area=@config.dir/p2 -jar plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -clean -noRegistryCache -application org.eclipse.ant.core.antRunner -buildfile build.xml - -echo =================================== -echo Make .sh executable & set Env -echo =================================== -chmod -R a+x *.sh -find . -name '*.sh' -exec chmod a+x '{}' \; +# Setup Tomcat +./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml echo . echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/setup-configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini similarity index 78% rename from org.adempiere.server-feature/setup-configuration/config.ini rename to org.adempiere.server-feature/setup/configuration/config.ini index 44135fcf0f..d9355ae181 100644 --- a/org.adempiere.server-feature/setup-configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,9 +1,5 @@ -#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser -#Thu Oct 28 17:26:32 MYT 2010 -eclipse.p2.profile=ServerProfile -osgi.framework=file\:plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar equinox.use.ds=true osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,com.springsource.org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,com.springsource.org.apache.commons.collections,org.apache.ant,com.springsource.javax.servlet,com.springsource.javax.jms,org.apache.ecs,com.springsource.org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,com.springsource.org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,com.springsource.org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,com.springsource.javax.activation osgi.framework.extensions= -eclipse.p2.data.area=@config.dir/../p2 osgi.bundles.defaultStartLevel=4 diff --git a/org.adempiere.server-feature/utils/RUN_DBExport.sh b/org.adempiere.server-feature/utils.unix/RUN_DBExport.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBExport.sh rename to org.adempiere.server-feature/utils.unix/RUN_DBExport.sh diff --git a/org.adempiere.server-feature/utils/RUN_DBRestore.sh b/org.adempiere.server-feature/utils.unix/RUN_DBRestore.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBRestore.sh rename to org.adempiere.server-feature/utils.unix/RUN_DBRestore.sh diff --git a/org.adempiere.server-feature/utils/RUN_DBStart.sh b/org.adempiere.server-feature/utils.unix/RUN_DBStart.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBStart.sh rename to org.adempiere.server-feature/utils.unix/RUN_DBStart.sh diff --git a/org.adempiere.server-feature/utils/RUN_DBStop.sh b/org.adempiere.server-feature/utils.unix/RUN_DBStop.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBStop.sh rename to org.adempiere.server-feature/utils.unix/RUN_DBStop.sh diff --git a/org.adempiere.server-feature/utils/RUN_Env.sh b/org.adempiere.server-feature/utils.unix/RUN_Env.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Env.sh rename to org.adempiere.server-feature/utils.unix/RUN_Env.sh diff --git a/org.adempiere.server-feature/utils/RUN_ExportReference.sh b/org.adempiere.server-feature/utils.unix/RUN_ExportReference.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_ExportReference.sh rename to org.adempiere.server-feature/utils.unix/RUN_ExportReference.sh diff --git a/org.adempiere.server-feature/utils/RUN_GetAdempiereTemplate.sh b/org.adempiere.server-feature/utils.unix/RUN_GetAdempiereTemplate.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_GetAdempiereTemplate.sh rename to org.adempiere.server-feature/utils.unix/RUN_GetAdempiereTemplate.sh diff --git a/org.adempiere.server-feature/utils/RUN_ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_ImportAdempiere.sh rename to org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh diff --git a/org.adempiere.server-feature/utils/RUN_ImportReference.sh b/org.adempiere.server-feature/utils.unix/RUN_ImportReference.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_ImportReference.sh rename to org.adempiere.server-feature/utils.unix/RUN_ImportReference.sh diff --git a/org.adempiere.server-feature/utils/RUN_Migrate.sh b/org.adempiere.server-feature/utils.unix/RUN_Migrate.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Migrate.sh rename to org.adempiere.server-feature/utils.unix/RUN_Migrate.sh diff --git a/org.adempiere.server-feature/utils/RUN_PostMigration.sh b/org.adempiere.server-feature/utils.unix/RUN_PostMigration.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_PostMigration.sh rename to org.adempiere.server-feature/utils.unix/RUN_PostMigration.sh diff --git a/org.adempiere.server-feature/utils/RUN_PutExportTemplate.sh b/org.adempiere.server-feature/utils.unix/RUN_PutExportTemplate.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_PutExportTemplate.sh rename to org.adempiere.server-feature/utils.unix/RUN_PutExportTemplate.sh diff --git a/org.adempiere.server-feature/utils/RUN_Server2.sh b/org.adempiere.server-feature/utils.unix/RUN_Server2.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Server2.sh rename to org.adempiere.server-feature/utils.unix/RUN_Server2.sh diff --git a/org.adempiere.server-feature/utils/RUN_Server2Stop.sh b/org.adempiere.server-feature/utils.unix/RUN_Server2Stop.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Server2Stop.sh rename to org.adempiere.server-feature/utils.unix/RUN_Server2Stop.sh diff --git a/org.adempiere.server-feature/utils/RUN_SignDatabaseBuild.sh b/org.adempiere.server-feature/utils.unix/RUN_SignDatabaseBuild.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_SignDatabaseBuild.sh rename to org.adempiere.server-feature/utils.unix/RUN_SignDatabaseBuild.sh diff --git a/org.adempiere.server-feature/utils/RUN_TrlExport.sh b/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_TrlExport.sh rename to org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh diff --git a/org.adempiere.server-feature/utils/RUN_TrlImport.sh b/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_TrlImport.sh rename to org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh diff --git a/org.adempiere.server-feature/utils/RUN_UnixEnvTemplate.sh b/org.adempiere.server-feature/utils.unix/RUN_UnixEnvTemplate.sh similarity index 100% rename from org.adempiere.server-feature/utils/RUN_UnixEnvTemplate.sh rename to org.adempiere.server-feature/utils.unix/RUN_UnixEnvTemplate.sh diff --git a/org.adempiere.server-feature/utils/myDBcopyTemplate.sh b/org.adempiere.server-feature/utils.unix/myDBcopyTemplate.sh similarity index 100% rename from org.adempiere.server-feature/utils/myDBcopyTemplate.sh rename to org.adempiere.server-feature/utils.unix/myDBcopyTemplate.sh diff --git a/org.adempiere.server-feature/utils/myEnvironmentTemplate.sh b/org.adempiere.server-feature/utils.unix/myEnvironmentTemplate.sh similarity index 100% rename from org.adempiere.server-feature/utils/myEnvironmentTemplate.sh rename to org.adempiere.server-feature/utils.unix/myEnvironmentTemplate.sh diff --git a/org.adempiere.server-feature/utils/oracle/01_add_missing_Translations.sql b/org.adempiere.server-feature/utils.unix/oracle/01_add_missing_Translations.sql similarity index 100% rename from org.adempiere.server-feature/utils/oracle/01_add_missing_Translations.sql rename to org.adempiere.server-feature/utils.unix/oracle/01_add_missing_Translations.sql diff --git a/org.adempiere.server-feature/utils/oracle/DBExport.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExport.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/DBExport.sh rename to org.adempiere.server-feature/utils.unix/oracle/DBExport.sh diff --git a/org.adempiere.server-feature/utils/oracle/DBExportFull.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExportFull.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/DBExportFull.sh rename to org.adempiere.server-feature/utils.unix/oracle/DBExportFull.sh diff --git a/org.adempiere.server-feature/utils/oracle/DBRestore.sh b/org.adempiere.server-feature/utils.unix/oracle/DBRestore.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/DBRestore.sh rename to org.adempiere.server-feature/utils.unix/oracle/DBRestore.sh diff --git a/org.adempiere.server-feature/utils/oracle/ExportReference.sh b/org.adempiere.server-feature/utils.unix/oracle/ExportReference.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/ExportReference.sh rename to org.adempiere.server-feature/utils.unix/oracle/ExportReference.sh diff --git a/org.adempiere.server-feature/utils/oracle/ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/ImportAdempiere.sh rename to org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh diff --git a/org.adempiere.server-feature/utils/oracle/ImportReference.sh b/org.adempiere.server-feature/utils.unix/oracle/ImportReference.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/ImportReference.sh rename to org.adempiere.server-feature/utils.unix/oracle/ImportReference.sh diff --git a/org.adempiere.server-feature/utils/oracle/PostMigration.sh b/org.adempiere.server-feature/utils.unix/oracle/PostMigration.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/PostMigration.sh rename to org.adempiere.server-feature/utils.unix/oracle/PostMigration.sh diff --git a/org.adempiere.server-feature/utils/oracle/Start.sh b/org.adempiere.server-feature/utils.unix/oracle/Start.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/Start.sh rename to org.adempiere.server-feature/utils.unix/oracle/Start.sh diff --git a/org.adempiere.server-feature/utils/oracle/Stop.sh b/org.adempiere.server-feature/utils.unix/oracle/Stop.sh similarity index 100% rename from org.adempiere.server-feature/utils/oracle/Stop.sh rename to org.adempiere.server-feature/utils.unix/oracle/Stop.sh diff --git a/org.adempiere.server-feature/utils/postgresql/01_add_missing_translations.sql b/org.adempiere.server-feature/utils.unix/postgresql/01_add_missing_translations.sql similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/01_add_missing_translations.sql rename to org.adempiere.server-feature/utils.unix/postgresql/01_add_missing_translations.sql diff --git a/org.adempiere.server-feature/utils/postgresql/DBExport.sh b/org.adempiere.server-feature/utils.unix/postgresql/DBExport.sh similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/DBExport.sh rename to org.adempiere.server-feature/utils.unix/postgresql/DBExport.sh diff --git a/org.adempiere.server-feature/utils/postgresql/DBRestore.sh b/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/DBRestore.sh rename to org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh diff --git a/org.adempiere.server-feature/utils/postgresql/ExportReference.sh b/org.adempiere.server-feature/utils.unix/postgresql/ExportReference.sh similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/ExportReference.sh rename to org.adempiere.server-feature/utils.unix/postgresql/ExportReference.sh diff --git a/org.adempiere.server-feature/utils/postgresql/ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/ImportAdempiere.sh rename to org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh diff --git a/org.adempiere.server-feature/utils/postgresql/PostMigration.sh b/org.adempiere.server-feature/utils.unix/postgresql/PostMigration.sh similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/PostMigration.sh rename to org.adempiere.server-feature/utils.unix/postgresql/PostMigration.sh diff --git a/org.adempiere.server-feature/utils/postgresql/Start.sh b/org.adempiere.server-feature/utils.unix/postgresql/Start.sh similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/Start.sh rename to org.adempiere.server-feature/utils.unix/postgresql/Start.sh diff --git a/org.adempiere.server-feature/utils/postgresql/Stop.sh b/org.adempiere.server-feature/utils.unix/postgresql/Stop.sh similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/Stop.sh rename to org.adempiere.server-feature/utils.unix/postgresql/Stop.sh diff --git a/org.adempiere.server-feature/utils/postgresql/Test.sql b/org.adempiere.server-feature/utils.unix/postgresql/Test.sql similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/Test.sql rename to org.adempiere.server-feature/utils.unix/postgresql/Test.sql diff --git a/org.adempiere.server-feature/utils/unix/Mac_OS_X/StartupParameters.plist b/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/StartupParameters.plist similarity index 100% rename from org.adempiere.server-feature/utils/unix/Mac_OS_X/StartupParameters.plist rename to org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/StartupParameters.plist diff --git a/org.adempiere.server-feature/utils/unix/Mac_OS_X/adempiere b/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/adempiere similarity index 100% rename from org.adempiere.server-feature/utils/unix/Mac_OS_X/adempiere rename to org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/adempiere diff --git a/org.adempiere.server-feature/utils/unix/adempiere_Debian.sh b/org.adempiere.server-feature/utils.unix/unix/adempiere_Debian.sh similarity index 100% rename from org.adempiere.server-feature/utils/unix/adempiere_Debian.sh rename to org.adempiere.server-feature/utils.unix/unix/adempiere_Debian.sh diff --git a/org.adempiere.server-feature/utils/unix/adempiere_RedHat.sh b/org.adempiere.server-feature/utils.unix/unix/adempiere_RedHat.sh similarity index 100% rename from org.adempiere.server-feature/utils/unix/adempiere_RedHat.sh rename to org.adempiere.server-feature/utils.unix/unix/adempiere_RedHat.sh diff --git a/org.adempiere.server-feature/utils/unix/adempiere_as_service_in_linux.txt b/org.adempiere.server-feature/utils.unix/unix/adempiere_as_service_in_linux.txt similarity index 100% rename from org.adempiere.server-feature/utils/unix/adempiere_as_service_in_linux.txt rename to org.adempiere.server-feature/utils.unix/unix/adempiere_as_service_in_linux.txt diff --git a/org.adempiere.server-feature/utils/RUN_DBExport.bat b/org.adempiere.server-feature/utils.windows/RUN_DBExport.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBExport.bat rename to org.adempiere.server-feature/utils.windows/RUN_DBExport.bat diff --git a/org.adempiere.server-feature/utils/RUN_DBRestore.bat b/org.adempiere.server-feature/utils.windows/RUN_DBRestore.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBRestore.bat rename to org.adempiere.server-feature/utils.windows/RUN_DBRestore.bat diff --git a/org.adempiere.server-feature/utils/RUN_DBStart.bat b/org.adempiere.server-feature/utils.windows/RUN_DBStart.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBStart.bat rename to org.adempiere.server-feature/utils.windows/RUN_DBStart.bat diff --git a/org.adempiere.server-feature/utils/RUN_DBStop.bat b/org.adempiere.server-feature/utils.windows/RUN_DBStop.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_DBStop.bat rename to org.adempiere.server-feature/utils.windows/RUN_DBStop.bat diff --git a/org.adempiere.server-feature/utils/RUN_Env.bat b/org.adempiere.server-feature/utils.windows/RUN_Env.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Env.bat rename to org.adempiere.server-feature/utils.windows/RUN_Env.bat diff --git a/org.adempiere.server-feature/utils/RUN_GetAdempiereTemplate.bat b/org.adempiere.server-feature/utils.windows/RUN_GetAdempiereTemplate.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_GetAdempiereTemplate.bat rename to org.adempiere.server-feature/utils.windows/RUN_GetAdempiereTemplate.bat diff --git a/org.adempiere.server-feature/utils/RUN_ImportAdempiere.bat b/org.adempiere.server-feature/utils.windows/RUN_ImportAdempiere.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_ImportAdempiere.bat rename to org.adempiere.server-feature/utils.windows/RUN_ImportAdempiere.bat diff --git a/org.adempiere.server-feature/utils/RUN_ImportReference.bat b/org.adempiere.server-feature/utils.windows/RUN_ImportReference.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_ImportReference.bat rename to org.adempiere.server-feature/utils.windows/RUN_ImportReference.bat diff --git a/org.adempiere.server-feature/utils/RUN_Migrate.bat b/org.adempiere.server-feature/utils.windows/RUN_Migrate.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Migrate.bat rename to org.adempiere.server-feature/utils.windows/RUN_Migrate.bat diff --git a/org.adempiere.server-feature/utils/RUN_PutExportTemplate.bat b/org.adempiere.server-feature/utils.windows/RUN_PutExportTemplate.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_PutExportTemplate.bat rename to org.adempiere.server-feature/utils.windows/RUN_PutExportTemplate.bat diff --git a/org.adempiere.server-feature/utils/RUN_Server2.bat b/org.adempiere.server-feature/utils.windows/RUN_Server2.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Server2.bat rename to org.adempiere.server-feature/utils.windows/RUN_Server2.bat diff --git a/org.adempiere.server-feature/utils/RUN_Server2Stop.bat b/org.adempiere.server-feature/utils.windows/RUN_Server2Stop.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Server2Stop.bat rename to org.adempiere.server-feature/utils.windows/RUN_Server2Stop.bat diff --git a/org.adempiere.server-feature/utils/RUN_SignDatabaseBuild.bat b/org.adempiere.server-feature/utils.windows/RUN_SignDatabaseBuild.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_SignDatabaseBuild.bat rename to org.adempiere.server-feature/utils.windows/RUN_SignDatabaseBuild.bat diff --git a/org.adempiere.server-feature/utils/RUN_Start.bat b/org.adempiere.server-feature/utils.windows/RUN_Start.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Start.bat rename to org.adempiere.server-feature/utils.windows/RUN_Start.bat diff --git a/org.adempiere.server-feature/utils/RUN_Stop.bat b/org.adempiere.server-feature/utils.windows/RUN_Stop.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_Stop.bat rename to org.adempiere.server-feature/utils.windows/RUN_Stop.bat diff --git a/org.adempiere.server-feature/utils/RUN_TrlExport.bat b/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_TrlExport.bat rename to org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat diff --git a/org.adempiere.server-feature/utils/RUN_TrlImport.bat b/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_TrlImport.bat rename to org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat diff --git a/org.adempiere.server-feature/utils/RUN_WinEnvTemplate.bat b/org.adempiere.server-feature/utils.windows/RUN_WinEnvTemplate.bat similarity index 100% rename from org.adempiere.server-feature/utils/RUN_WinEnvTemplate.bat rename to org.adempiere.server-feature/utils.windows/RUN_WinEnvTemplate.bat diff --git a/org.adempiere.server-feature/utils/WinEnv.js b/org.adempiere.server-feature/utils.windows/WinEnv.js similarity index 100% rename from org.adempiere.server-feature/utils/WinEnv.js rename to org.adempiere.server-feature/utils.windows/WinEnv.js diff --git a/org.adempiere.server-feature/utils/myDBcopyTemplate.bat b/org.adempiere.server-feature/utils.windows/myDBcopyTemplate.bat similarity index 100% rename from org.adempiere.server-feature/utils/myDBcopyTemplate.bat rename to org.adempiere.server-feature/utils.windows/myDBcopyTemplate.bat diff --git a/org.adempiere.server-feature/utils/myEnvironmentTemplate.bat b/org.adempiere.server-feature/utils.windows/myEnvironmentTemplate.bat similarity index 100% rename from org.adempiere.server-feature/utils/myEnvironmentTemplate.bat rename to org.adempiere.server-feature/utils.windows/myEnvironmentTemplate.bat diff --git a/org.adempiere.server-feature/utils/oracleXE/01_add_missing_Translations.sql b/org.adempiere.server-feature/utils.windows/oracle/01_add_missing_Translations.sql similarity index 100% rename from org.adempiere.server-feature/utils/oracleXE/01_add_missing_Translations.sql rename to org.adempiere.server-feature/utils.windows/oracle/01_add_missing_Translations.sql diff --git a/org.adempiere.server-feature/utils/oracle/DBExport.bat b/org.adempiere.server-feature/utils.windows/oracle/DBExport.bat similarity index 100% rename from org.adempiere.server-feature/utils/oracle/DBExport.bat rename to org.adempiere.server-feature/utils.windows/oracle/DBExport.bat diff --git a/org.adempiere.server-feature/utils/oracle/DBExportFull.bat b/org.adempiere.server-feature/utils.windows/oracle/DBExportFull.bat similarity index 100% rename from org.adempiere.server-feature/utils/oracle/DBExportFull.bat rename to org.adempiere.server-feature/utils.windows/oracle/DBExportFull.bat diff --git a/org.adempiere.server-feature/utils/oracle/DBRestore.bat b/org.adempiere.server-feature/utils.windows/oracle/DBRestore.bat similarity index 100% rename from org.adempiere.server-feature/utils/oracle/DBRestore.bat rename to org.adempiere.server-feature/utils.windows/oracle/DBRestore.bat diff --git a/org.adempiere.server-feature/utils/oracle/ImportAdempiere.bat b/org.adempiere.server-feature/utils.windows/oracle/ImportAdempiere.bat similarity index 100% rename from org.adempiere.server-feature/utils/oracle/ImportAdempiere.bat rename to org.adempiere.server-feature/utils.windows/oracle/ImportAdempiere.bat diff --git a/org.adempiere.server-feature/utils/oracle/ImportReference.bat b/org.adempiere.server-feature/utils.windows/oracle/ImportReference.bat similarity index 100% rename from org.adempiere.server-feature/utils/oracle/ImportReference.bat rename to org.adempiere.server-feature/utils.windows/oracle/ImportReference.bat diff --git a/org.adempiere.server-feature/utils/oracle/Start.bat b/org.adempiere.server-feature/utils.windows/oracle/Start.bat similarity index 100% rename from org.adempiere.server-feature/utils/oracle/Start.bat rename to org.adempiere.server-feature/utils.windows/oracle/Start.bat diff --git a/org.adempiere.server-feature/utils/oracle/Stop.bat b/org.adempiere.server-feature/utils.windows/oracle/Stop.bat similarity index 100% rename from org.adempiere.server-feature/utils/oracle/Stop.bat rename to org.adempiere.server-feature/utils.windows/oracle/Stop.bat diff --git a/org.adempiere.server-feature/utils.windows/postgresql/01_add_missing_translations.sql b/org.adempiere.server-feature/utils.windows/postgresql/01_add_missing_translations.sql new file mode 100644 index 0000000000..4c40cbdeec --- /dev/null +++ b/org.adempiere.server-feature/utils.windows/postgresql/01_add_missing_translations.sql @@ -0,0 +1,69 @@ +CREATE OR REPLACE FUNCTION add_missing_translations() RETURNS void as $func$ +DECLARE + ins VARCHAR (2000); + sel VARCHAR (2000); + inssel VARCHAR (4001); + table_id NUMERIC; + t RECORD; + c RECORD; +BEGIN + + FOR t IN (SELECT ad_table_id, + SUBSTR (tablename, 1, LENGTH (tablename) - 4) as tablename + FROM AD_TABLE + WHERE tablename LIKE '%_Trl' AND isactive = 'Y' + AND isview = 'N') + LOOP + ins := + 'INSERT INTO ' + || t.tablename + || '_TRL (' + || 'ad_language,ad_client_id,ad_org_id,created,createdby,updated,updatedby,isactive,istranslated,' + || t.tablename + || '_id'; + sel := + 'SELECT l.ad_language,t.ad_client_id,t.ad_org_id,t.created,t.createdby,t.updated,t.updatedby,t.isactive,''N'' as istranslated,' + || t.tablename + || '_id'; + + SELECT ad_table_id + INTO table_id + FROM AD_TABLE + WHERE tablename = t.tablename; + + FOR c IN (SELECT col.columnname + FROM AD_COLUMN col INNER JOIN AD_TABLE tab + ON (col.ad_table_id = tab.ad_table_id) + WHERE col.ad_table_id = table_id + AND col.istranslated = 'Y' + AND col.isactive = 'Y' + ORDER BY 1) + LOOP + ins := TRIM (ins) || ',' || TRIM (c.columnname); + sel := TRIM (sel) || ',t.' || TRIM (c.columnname); + END LOOP; + + ins := TRIM (ins) || ')'; + sel := + TRIM (sel) + || ' from ' + || t.tablename + || ' t, ad_language l WHERE l.issystemlanguage=''Y'' AND NOT EXISTS (SELECT 1 FROM ' + || t.tablename + || '_TRL b WHERE b.' + || t.tablename + || '_id=t.' + || t.tablename + || '_id AND b.AD_LANGUAGE=l.AD_LANGUAGE)'; + inssel := TRIM (ins) || ' ' || TRIM (sel); + + EXECUTE inssel; + END LOOP; + +END; +$func$ LANGUAGE plpgsql; + +select add_missing_translations(); + +commit; + diff --git a/org.adempiere.server-feature/utils/postgresql/DBExport.bat b/org.adempiere.server-feature/utils.windows/postgresql/DBExport.bat similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/DBExport.bat rename to org.adempiere.server-feature/utils.windows/postgresql/DBExport.bat diff --git a/org.adempiere.server-feature/utils/postgresql/DBRestore.bat b/org.adempiere.server-feature/utils.windows/postgresql/DBRestore.bat similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/DBRestore.bat rename to org.adempiere.server-feature/utils.windows/postgresql/DBRestore.bat diff --git a/org.adempiere.server-feature/utils/postgresql/ImportAdempiere.bat b/org.adempiere.server-feature/utils.windows/postgresql/ImportAdempiere.bat similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/ImportAdempiere.bat rename to org.adempiere.server-feature/utils.windows/postgresql/ImportAdempiere.bat diff --git a/org.adempiere.server-feature/utils/postgresql/Start.bat b/org.adempiere.server-feature/utils.windows/postgresql/Start.bat similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/Start.bat rename to org.adempiere.server-feature/utils.windows/postgresql/Start.bat diff --git a/org.adempiere.server-feature/utils/postgresql/Stop.bat b/org.adempiere.server-feature/utils.windows/postgresql/Stop.bat similarity index 100% rename from org.adempiere.server-feature/utils/postgresql/Stop.bat rename to org.adempiere.server-feature/utils.windows/postgresql/Stop.bat diff --git a/org.adempiere.server-feature/utils.windows/postgresql/Test.sql b/org.adempiere.server-feature/utils.windows/postgresql/Test.sql new file mode 100644 index 0000000000..eac48ed4e7 --- /dev/null +++ b/org.adempiere.server-feature/utils.windows/postgresql/Test.sql @@ -0,0 +1,2 @@ +-- Connection Test +SELECT 'Success ' AS Connection; diff --git a/org.adempiere.server-feature/utils/windows/AdempiereService.exe b/org.adempiere.server-feature/utils.windows/windows/AdempiereService.exe similarity index 100% rename from org.adempiere.server-feature/utils/windows/AdempiereService.exe rename to org.adempiere.server-feature/utils.windows/windows/AdempiereService.exe diff --git a/org.adempiere.server-feature/utils/windows/Adempiere_Service_Install.bat b/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Install.bat similarity index 100% rename from org.adempiere.server-feature/utils/windows/Adempiere_Service_Install.bat rename to org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Install.bat diff --git a/org.adempiere.server-feature/utils/windows/Adempiere_Service_Uninstall.bat b/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Uninstall.bat similarity index 100% rename from org.adempiere.server-feature/utils/windows/Adempiere_Service_Uninstall.bat rename to org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Uninstall.bat diff --git a/org.adempiere.server-feature/utils/windows/license.txt b/org.adempiere.server-feature/utils.windows/windows/license.txt similarity index 100% rename from org.adempiere.server-feature/utils/windows/license.txt rename to org.adempiere.server-feature/utils.windows/windows/license.txt diff --git a/org.adempiere.server-feature/utils/.project b/org.adempiere.server-feature/utils/.project deleted file mode 100644 index dee43aa36a..0000000000 --- a/org.adempiere.server-feature/utils/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - utils - - - - - - - - diff --git a/org.adempiere.server-feature/utils/oracleXE/DBExport.bat b/org.adempiere.server-feature/utils/oracleXE/DBExport.bat deleted file mode 100644 index bc6e6583d2..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/DBExport.bat +++ /dev/null @@ -1,35 +0,0 @@ -@Echo Adempiere Database Export $Revision: 1.8 $ - -@Rem $Id: DBExport.bat,v 1.8 2005/04/27 17:45:01 jjanke Exp $ -@Rem -@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %ADEMPIERE_HOME%\data\ExpDat.dmp - -@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_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql - -@Rem The Export -@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 -@jar cvfM ExpDat.jar ExpDat.dmp ExpDat.log - -@goto end - -:environment -@Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\Adempiere -@Echo ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org - -:usage -@echo Usage: %0 -@echo Examples: %0 adempiere adempiere - -:end diff --git a/org.adempiere.server-feature/utils/oracleXE/DBExport.sh b/org.adempiere.server-feature/utils/oracleXE/DBExport.sh deleted file mode 100644 index e845560af3..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/DBExport.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -echo Adempiere Database Export $Revision: 1.5 $ - -# $Id: DBExport.sh,v 1.5 2005/12/20 07:12:17 jjanke Exp $ - -echo Saving database $1@$ADEMPIERE_DB_NAME to $ADEMPIERE_HOME/data/ExpDat.dmp - -if [ $# -eq 0 ] - then - echo "Usage: $0 " - echo "Example: $0 adempiere adempiere" - exit 1 -fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] - then - echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" - echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" - exit 1 -fi - -# Cleanup -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_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/org.adempiere.server-feature/utils/oracleXE/DBExportFull.bat b/org.adempiere.server-feature/utils/oracleXE/DBExportFull.bat deleted file mode 100644 index 874666c854..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/DBExportFull.bat +++ /dev/null @@ -1,34 +0,0 @@ -@Echo Adempiere Full Database Export $Revision: 1.6 $ - -@Rem $Id: DBExportFull.bat,v 1.6 2005/04/27 17:45:01 jjanke Exp $ - -@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %ADEMPIERE_HOME%\data\ExpDatFull.dmp - -@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_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql - - -@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 - -@goto end - -:environment -@Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\Adempiere -@Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org - -:usage -@echo Usage: %0 -@echo Examples: %0 system/manager - -:end diff --git a/org.adempiere.server-feature/utils/oracleXE/DBExportFull.sh b/org.adempiere.server-feature/utils/oracleXE/DBExportFull.sh deleted file mode 100644 index 13b701d8ad..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/DBExportFull.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -echo Adempiere Full Database Export $Revision: 1.3 $ - -# $Id: DBExportFull.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $ - -echo Saving database $1@$ADEMPIERE_DB_NAME to $ADEMPIERE_HOME/data/ExpDatFull.dmp - -if [ $# -eq 0 ] - then - echo "Usage: $0 " - echo "Example: $0 system/manager" - exit 1 -fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] - then - echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" - echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" - exit 1 -fi - -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/org.adempiere.server-feature/utils/oracleXE/DBRestore.bat b/org.adempiere.server-feature/utils/oracleXE/DBRestore.bat deleted file mode 100644 index 42993978c5..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/DBRestore.bat +++ /dev/null @@ -1,48 +0,0 @@ -@Echo Adempiere Database Restore $Revision: 1.6 $ - -@Rem $Id: DBRestore.bat,v 1.6 2005/08/27 02:27:10 jjanke Exp $ - -@Echo Restoring Adempiere DB from %ADEMPIERE_HOME%\data\ExpDat.dmp - -@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 -@if (%3) == () goto usage - -@echo ------------------------------------- -@echo Re-Create DB user -@echo ------------------------------------- -@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_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_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\AfterImport.sql - -@goto end - -:environment -@Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\Adempiere -@Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org - -:usage -@echo Usage: %0% -@echo Example: %0% system/manager adempiere adempiere - -:end diff --git a/org.adempiere.server-feature/utils/oracleXE/DBRestore.sh b/org.adempiere.server-feature/utils/oracleXE/DBRestore.sh deleted file mode 100644 index 192e3262a6..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/DBRestore.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# $Id: DBRestore.sh,v 1.8 2005/12/20 07:12:17 jjanke Exp $ -echo Adempiere Database Restore $Revision: 1.8 $ - -echo Restoring Adempiere DB from $ADEMPIERE_HOME/data/ExpDat.dmp - -if [ $# -le 2 ] - then - echo "Usage: $0 " - echo "Example: $0 system/manager adempiere adempiere" - exit 1 -fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] - then - echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" - echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" - exit 1 -fi - - -echo ------------------------------------- -echo Re-Create DB user -echo ------------------------------------- -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_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_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/org.adempiere.server-feature/utils/oracleXE/ExportReference.sh b/org.adempiere.server-feature/utils/oracleXE/ExportReference.sh deleted file mode 100644 index e6f9c5aa8e..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/ExportReference.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -echo Adempiere Database Export $Revision: 1.5 $ - -# $Id: DBExport.sh,v 1.5 2005/12/20 07:12:17 jjanke Exp $ - -echo Saving reference database reference@$ADEMPIERE_DB_NAME to $ADEMPIERE_HOME/data/Adempiere.dmp - -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] - then - echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" - echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" - exit 1 -fi - -# Export -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/org.adempiere.server-feature/utils/oracleXE/ImportAdempiere.bat b/org.adempiere.server-feature/utils/oracleXE/ImportAdempiere.bat deleted file mode 100644 index 16eda14090..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/ImportAdempiere.bat +++ /dev/null @@ -1,48 +0,0 @@ -@Echo Adempiere Database Import $Revision: 1.9 $ - -@Rem $Id: ImportAdempiere.bat,v 1.9 2005/09/24 01:50:41 jjanke Exp $ - -@Echo Importing Adempiere DB from %ADEMPIERE_HOME%\data\Adempiere.dmp (%ADEMPIERE_DB_NAME%) - -@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 -@if (%3) == () goto usage - -@echo ------------------------------------- -@echo Re-Create DB user -@echo ------------------------------------- -@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_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_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql - -@goto end - -:environment -@Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\Adempiere -@Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org - -:usage -@echo Usage: %0 -@echo Example: %0 system/manager Adempiere Adempiere - -:end diff --git a/org.adempiere.server-feature/utils/oracleXE/ImportAdempiere.sh b/org.adempiere.server-feature/utils/oracleXE/ImportAdempiere.sh deleted file mode 100644 index a0d3121559..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/ImportAdempiere.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -# $Id: ImportAdempiere.sh,v 1.10 2005/12/20 07:12:17 jjanke Exp $ -echo Adempiere Database Import $Revision: 1.10 $ - -echo Importing Adempiere DB from $ADEMPIERE_HOME/data/Adempiere.dmp - -if [ $# -le 2 ] - then - echo "Usage: $0 " - echo "Example: $0 system/manager adempiere adempiere" - exit 1 -fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] - then - echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" - echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" - exit 1 -fi - - -echo ------------------------------------- -echo Re-Create DB user -echo ------------------------------------- -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_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_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/org.adempiere.server-feature/utils/oracleXE/ImportReference.bat b/org.adempiere.server-feature/utils/oracleXE/ImportReference.bat deleted file mode 100644 index 0e1ea1c96a..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/ImportReference.bat +++ /dev/null @@ -1,41 +0,0 @@ -@Echo Adempiere Reference Database Import $Revision: 1.4 $ - -@Rem $Id: ImportReference.bat,v 1.4 2005/01/22 21:59:15 jjanke Exp $ - -@Echo Importing Reference DB from %ADEMPIERE_HOME%\data\Reference.dmp - -@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_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\CreateUser.sql Reference Adempiere - -@echo ------------------------------------- -@echo Import Reference -@echo ------------------------------------- -imp %1@%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_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\AfterImport.sql - -@goto end - -:environment -@Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\Adempiere -@Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org - -:usage -@echo Usage: %0 -@echo Examples: %0 system/manager - -:end diff --git a/org.adempiere.server-feature/utils/oracleXE/ImportReference.sh b/org.adempiere.server-feature/utils/oracleXE/ImportReference.sh deleted file mode 100644 index 7a35209721..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/ImportReference.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# $Id: ImportReference.sh,v 1.5 2005/01/22 21:59:15 jjanke Exp $ -echo Adempiere Reference Database Import $Revision: 1.5 $ - -echo Importing Reference DB from $ADEMPIERE_HOME/data/Reference.dmp - -if [ $# -eq 2 ] - then - echo "Usage: $0 " - echo "Example: $0 system/manager" - exit 1 -fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] - then - echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" - echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" - exit 1 -fi - - -echo ------------------------------------- -echo Re-Create new user -echo ------------------------------------- -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_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_PORT/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql - diff --git a/org.adempiere.server-feature/utils/oracleXE/PostMigration.sh b/org.adempiere.server-feature/utils/oracleXE/PostMigration.sh deleted file mode 100644 index 86f6598bc3..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/PostMigration.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# $Id: PostMigration.sh -echo Oracle Post Migration Scripts - -if [ $# -le 2 ] - then - echo "Usage: $0 " - echo "Example: $0 system/manager adempiere adempiere" - exit 1 -fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] - then - echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" - echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" - exit 1 -fi - -echo ------------------------------------- -echo Add missing translations -echo ------------------------------------- -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/org.adempiere.server-feature/utils/oracleXE/Start.bat b/org.adempiere.server-feature/utils/oracleXE/Start.bat deleted file mode 100644 index af58d01cf6..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/Start.bat +++ /dev/null @@ -1,13 +0,0 @@ -@Rem $Id: Start.bat,v 1.7 2005/01/22 21:59:15 jjanke Exp $ - -@Echo Starting Listener .... -lsnrctl start - -@Echo Starting Database .... -@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 - -@Echo ------------------------ -lsnrctl status diff --git a/org.adempiere.server-feature/utils/oracleXE/Start.sh b/org.adempiere.server-feature/utils/oracleXE/Start.sh deleted file mode 100644 index 4b0ba95781..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/Start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# $Id: Start.sh,v 1.6 2005/01/22 21:59:15 jjanke Exp $ - -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/org.adempiere.server-feature/utils/oracleXE/Stop.bat b/org.adempiere.server-feature/utils/oracleXE/Stop.bat deleted file mode 100644 index 6a663d6e44..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/Stop.bat +++ /dev/null @@ -1,11 +0,0 @@ -@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_PORT%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Stop.sql - -@Echo Stopping Listener .... -lsnrctl stop - -@Echo Stopping (optional) Agent .... -agentctl stop - diff --git a/org.adempiere.server-feature/utils/oracleXE/Stop.sh b/org.adempiere.server-feature/utils/oracleXE/Stop.sh deleted file mode 100644 index c1daf989a3..0000000000 --- a/org.adempiere.server-feature/utils/oracleXE/Stop.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# $Id: Stop.sh,v 1.7 2005/01/22 21:59:15 jjanke Exp $ - -# In a multi-instance environment set the environment first -# SET ORACLE_SID= -# export ORACLE_SID - -sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql -