Fixed platform specific build to include only script file that is relevant for that particular platform. Fixed folder layout and script for setup.

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

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

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=setup
-root.folder.setup-configuration=setup-configuration
+#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

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

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

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
+@REM Setup Adempiere.properties and AdempiereEnv.properties
-@Set JAVA=java
+adempiere --launcher.ini setup.ini -application org.adempiere.install.console.application
-@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
 
 @Echo ErrorLevel = %ERRORLEVEL%
 @IF NOT ERRORLEVEL = 1 GOTO NEXT
@@ -32,8 +14,8 @@ goto START
 @Exit
 
 :NEXT
-
+@REM Setup Tomcat
-@"%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
+adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 @Echo .
 @Echo For problems, check log file in base directory

org.adempiere.server-feature/console-setup.sh

@@ -1,34 +1,12 @@
 #!/bin/sh
 #
-echo Install Adempiere Server
+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
+# Setup Adempiere.properties and AdempiereEnv.properties
-  JAVA=$JAVA_HOME/bin/java
+./adempiere --launcher.ini setup.ini -application org.adempiere.install.console.application
-  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 Tomcat
-echo ===================================
+./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
-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 '{}' \;
 
 echo .
 echo For problems, check log file in base directory

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

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

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
 
-
+@REM Setup Adempiere.properties and AdempiereEnv.properties
-@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK
+adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog
-@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
 
 @Echo ErrorLevel = %ERRORLEVEL%
 @IF NOT ERRORLEVEL = 1 GOTO NEXT
@@ -32,8 +13,8 @@ goto START
 @Exit
 
 :NEXT
-
+@REM Setup Tomcat
-@"%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
+adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 @Echo .
 @Echo For problems, check log file in base directory

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

org.adempiere.server-feature/setup.sh

@@ -1,34 +1,12 @@
 #!/bin/sh
 #
-echo Install Adempiere Server
+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
+# Setup Adempiere.properties and AdempiereEnv.properties
-  JAVA=$JAVA_HOME/bin/java
+./adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application
-  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 Tomcat
-echo ===================================
+./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
-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 '{}' \;
 
 echo .
 echo For problems, check log file in base directory

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
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar
-#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
 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

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;
+

org.adempiere.server-feature/utils.windows/postgresql/Test.sql

@@ -0,0 +1,2 @@
+-- Connection Test
+SELECT 'Success    ' AS Connection;

org.adempiere.server-feature/utils/.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>utils</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

org.adempiere.server-feature/utils/oracleXE/DBExport.bat

@@ -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 <userAccount>
-@echo Examples:	%0 adempiere adempiere
-
-:end

org.adempiere.server-feature/utils/oracleXE/DBExport.sh

@@ -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 <userAccount>"
-    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