From 668e61686fde1a9b07af77d28bacdbff4ea6705c Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 6 Jun 2012 22:13:34 +0800 Subject: [PATCH 1/4] IDEMPIERE-166 Rebranding of logo and product name --- db/database/Startup/oracle/Start.sql | 2 +- db/database/Startup/oracle/Stop.sql | 2 +- db/database/Startup/oracleXE/Start.sql | 2 +- db/database/Startup/oracleXE/Stop.sql | 2 +- org.adempiere.base/plugin.xml | 13 + .../org.compiere.db.AdempiereDatabase.exsd | 2 +- .../base/PostMigrationApplication.java | 77 +++ .../src/org/compiere/Adempiere.java | 2 +- .../src/org/compiere/db/CConnection.java | 2 +- .../src/org/compiere/util/CLogFile.java | 38 +- .../src/org/compiere/util/CLogFilter.java | 2 +- .../src/org/compiere/util/CLogFormatter.java | 6 +- .../src/org/compiere/util/CLogMgt.java | 2 +- .../src/org/compiere/util/CLogger.java | 4 +- .../src/org/compiere/util/DB.java | 2 +- .../src/org/compiere/util/Ini.java | 40 +- .../src/org/compiere/util/Msg.java | 2 +- .../src/org/compiere/util/WebEnv.java | 2 +- .../src/test/AdempiereTestCase.java | 4 +- org.adempiere.extend/testTemplate.properties | 2 +- ...erties => idempiereEnvTemplate.properties} | 6 +- org.adempiere.install/build.xml | 4 +- .../compiere/install/ConfigurationData.java | 32 +- .../compiere/install/ConfigurationPanel.java | 2 +- .../src/org/compiere/install/KeyStoreMgt.java | 6 +- .../src/org/compiere/install/SetupRes.java | 20 +- .../src/org/compiere/install/SetupRes_ca.java | 20 +- .../src/org/compiere/install/SetupRes_da.java | 8 +- .../src/org/compiere/install/SetupRes_de.java | 22 +- .../src/org/compiere/install/SetupRes_el.java | 20 +- .../src/org/compiere/install/SetupRes_es.java | 20 +- .../src/org/compiere/install/SetupRes_fr.java | 20 +- .../src/org/compiere/install/SetupRes_hr.java | 18 +- .../src/org/compiere/install/SetupRes_hu.java | 20 +- .../src/org/compiere/install/SetupRes_in.java | 20 +- .../src/org/compiere/install/SetupRes_it.java | 20 +- .../src/org/compiere/install/SetupRes_my.java | 18 +- .../src/org/compiere/install/SetupRes_no.java | 20 +- .../src/org/compiere/install/SetupRes_pl.java | 22 +- .../src/org/compiere/install/SetupRes_ro.java | 20 +- .../src/org/compiere/install/SetupRes_ru.java | 10 +- .../src/org/compiere/install/SetupRes_sl.java | 18 +- .../src/org/compiere/install/SetupRes_sv.java | 18 +- .../src/org/compiere/install/SetupRes_zh.java | 20 +- .../org/compiere/install/SetupRes_zh_CN.java | 20 +- .../src/org/compiere/install/SilentSetup.java | 8 +- .../install/console/ConfigurationConsole.java | 4 +- .../org/adempiere/pipo2/PackInHandler.java | 10 +- .../src/org/adempiere/pipo2/PackOut.java | 12 +- .../buckminster.cspec | 470 ------------------ .../buckminster.cspex | 4 +- org.adempiere.server-feature/build.properties | 12 +- org.adempiere.server-feature/build.xml | 8 +- .../console-setup-alt.bat | 4 +- .../console-setup-alt.sh | 4 +- .../console-setup.bat | 8 +- org.adempiere.server-feature/console-setup.sh | 8 +- org.adempiere.server-feature/feature.xml | 2 +- ...mpiere-server.bat => idempiere-server.bat} | 2 +- ...dempiere-server.sh => idempiere-server.sh} | 2 +- org.adempiere.server-feature/product.ant | 2 +- org.adempiere.server-feature/server.product | 4 +- org.adempiere.server-feature/setup-alt.bat | 4 +- org.adempiere.server-feature/setup-alt.sh | 4 +- org.adempiere.server-feature/setup.bat | 8 +- org.adempiere.server-feature/setup.sh | 8 +- .../utils.unix/RUN_DBExport.sh | 10 +- .../utils.unix/RUN_DBExportdp.sh | 10 +- .../utils.unix/RUN_DBRestore.sh | 12 +- .../utils.unix/RUN_DBRestoredp.sh | 12 +- .../utils.unix/RUN_DBStart.sh | 6 +- .../utils.unix/RUN_DBStop.sh | 6 +- .../utils.unix/RUN_Env.sh | 10 +- .../utils.unix/RUN_ExportReference.sh | 6 +- .../utils.unix/RUN_GetAdempiereTemplate.sh | 26 - ...ortAdempiere.sh => RUN_ImportIdempiere.sh} | 20 +- .../utils.unix/RUN_ImportReference.sh | 12 +- .../utils.unix/RUN_Migrate.sh | 5 - .../utils.unix/RUN_PostMigration.sh | 63 +-- .../utils.unix/RUN_PutExportTemplate.sh | 25 - .../utils.unix/RUN_Server2.sh | 10 +- .../utils.unix/RUN_Server2Stop.sh | 8 +- .../utils.unix/RUN_SignDatabaseBuild.sh | 18 - .../utils.unix/RUN_TrlExport.sh | 8 +- .../utils.unix/RUN_TrlImport.sh | 8 +- .../utils.unix/RUN_UnixEnvTemplate.sh | 6 +- .../utils.unix/myDBcopyTemplate.sh | 4 +- .../utils.unix/myEnvironmentTemplate.sh | 22 +- .../utils.unix/oracle/DBExport.sh | 12 +- .../utils.unix/oracle/DBExportFull.sh | 10 +- .../utils.unix/oracle/DBExportFulldp.sh | 14 +- .../utils.unix/oracle/DBExportdp.sh | 16 +- .../utils.unix/oracle/DBRestore.sh | 16 +- .../utils.unix/oracle/DBRestoredp.sh | 18 +- .../utils.unix/oracle/ExportReference.sh | 10 +- ...{ImportAdempiere.sh => ImportIdempiere.sh} | 22 +- .../utils.unix/oracle/ImportReference.sh | 14 +- .../utils.unix/oracle/PostMigration.sh | 10 +- .../utils.unix/oracle/Start.sh | 2 +- .../utils.unix/oracle/Stop.sh | 2 +- .../utils.unix/postgresql/DBExport.sh | 10 +- .../utils.unix/postgresql/DBRestore.sh | 8 +- .../utils.unix/postgresql/ExportReference.sh | 10 +- ...{ImportAdempiere.sh => ImportIdempiere.sh} | 18 +- .../utils.unix/postgresql/PostMigration.sh | 14 +- .../unix/MAC_OS_X/StartupParameters.plist | 10 +- .../unix/MAC_OS_X/{adempiere => idempiere} | 46 +- ...dempiere_Debian.sh => idempiere_Debian.sh} | 76 +-- ...dempiere_RedHat.sh => idempiere_RedHat.sh} | 64 +-- ....txt => idempiere_as_service_in_linux.txt} | 12 +- .../utils.windows/RUN_DBExport.bat | 6 +- .../utils.windows/RUN_DBExportdp.bat | 6 +- .../utils.windows/RUN_DBRestore.bat | 10 +- .../utils.windows/RUN_DBRestoredp.bat | 10 +- .../utils.windows/RUN_DBStart.bat | 6 +- .../utils.windows/RUN_DBStop.bat | 6 +- .../utils.windows/RUN_Env.bat | 4 +- .../RUN_GetAdempiereTemplate.bat | 22 - .../utils.windows/RUN_ImportAdempiere.bat | 18 - .../utils.windows/RUN_ImportIdempiere.bat | 16 + .../utils.windows/RUN_ImportReference.bat | 10 +- .../utils.windows/RUN_Migrate.bat | 1 - .../utils.windows/RUN_PostMigration.bat | 6 + .../utils.windows/RUN_PutExportTemplate.bat | 23 - .../utils.windows/RUN_Server2.bat | 8 +- .../utils.windows/RUN_Server2Stop.bat | 8 +- .../utils.windows/RUN_SignDatabaseBuild.bat | 14 - .../utils.windows/RUN_Start.bat | 6 +- .../utils.windows/RUN_Stop.bat | 6 +- .../utils.windows/RUN_TrlExport.bat | 6 +- .../utils.windows/RUN_TrlImport.bat | 6 +- .../utils.windows/RUN_WinEnvTemplate.bat | 2 +- .../utils.windows/WinEnv.js | 8 +- .../utils.windows/myDBcopyTemplate.bat | 8 +- .../utils.windows/myEnvironmentTemplate.bat | 16 +- .../utils.windows/oracle/DBExport.bat | 12 +- .../utils.windows/oracle/DBExportFull.bat | 12 +- .../utils.windows/oracle/DBExportFulldp.bat | 10 +- .../utils.windows/oracle/DBExportdp.bat | 12 +- .../utils.windows/oracle/DBRestore.bat | 14 +- .../utils.windows/oracle/DBRestoredp.bat | 14 +- ...mportAdempiere.bat => ImportIdempiere.bat} | 18 +- .../utils.windows/oracle/ImportReference.bat | 12 +- .../utils.windows/oracle/Start.bat | 2 +- .../utils.windows/oracle/Stop.bat | 2 +- .../utils.windows/postgresql/DBExport.bat | 10 +- .../utils.windows/postgresql/DBRestore.bat | 8 +- ...mportAdempiere.bat => ImportIdempiere.bat} | 22 +- .../windows/Adempiere_Service_Install.bat | 25 - .../windows/Adempiere_Service_Uninstall.bat | 8 - ...mpiereService.exe => idempiereService.exe} | Bin .../windows/idempiere_Service_Install.bat | 25 + .../windows/idempiere_Service_Uninstall.bat | 8 + org.adempiere.server/index.html | 4 +- .../org/adempiere/server/Application.java | 2 +- .../WEB-INF/src/metainfo/zk/lang-addon.xml | 2 +- .../org/adempiere/webui/AdempiereWebUI.java | 4 +- .../adempiere/webui/part/WindowContainer.java | 1 + .../adempiere/webui/session/WebUIServlet.java | 2 +- org.adempiere.ui.zk/WEB-INF/web.xml | 2 +- org.adempiere.ui.zk/WEB-INF/zk.xml | 19 +- .../customize.html | 2 +- .../WEB-INF/web-original.xml | 341 ------------- .../postgresql/config/ConfigPostgreSQL.java | 1 + 164 files changed, 913 insertions(+), 1854 deletions(-) create mode 100644 org.adempiere.base/src/org/adempiere/base/PostMigrationApplication.java rename org.adempiere.install/Adempiere/{AdempiereEnvTemplate.properties => idempiereEnvTemplate.properties} (92%) delete mode 100644 org.adempiere.server-feature/buckminster.cspec rename org.adempiere.server-feature/{adempiere-server.bat => idempiere-server.bat} (91%) rename org.adempiere.server-feature/{adempiere-server.sh => idempiere-server.sh} (94%) delete mode 100644 org.adempiere.server-feature/utils.unix/RUN_GetAdempiereTemplate.sh rename org.adempiere.server-feature/utils.unix/{RUN_ImportAdempiere.sh => RUN_ImportIdempiere.sh} (53%) delete mode 100644 org.adempiere.server-feature/utils.unix/RUN_Migrate.sh delete mode 100644 org.adempiere.server-feature/utils.unix/RUN_PutExportTemplate.sh delete mode 100644 org.adempiere.server-feature/utils.unix/RUN_SignDatabaseBuild.sh rename org.adempiere.server-feature/utils.unix/oracle/{ImportAdempiere.sh => ImportIdempiere.sh} (64%) rename org.adempiere.server-feature/utils.unix/postgresql/{ImportAdempiere.sh => ImportIdempiere.sh} (73%) rename org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/{adempiere => idempiere} (66%) rename org.adempiere.server-feature/utils.unix/unix/{adempiere_Debian.sh => idempiere_Debian.sh} (67%) rename org.adempiere.server-feature/utils.unix/unix/{adempiere_RedHat.sh => idempiere_RedHat.sh} (70%) rename org.adempiere.server-feature/utils.unix/unix/{adempiere_as_service_in_linux.txt => idempiere_as_service_in_linux.txt} (68%) delete mode 100644 org.adempiere.server-feature/utils.windows/RUN_GetAdempiereTemplate.bat delete mode 100644 org.adempiere.server-feature/utils.windows/RUN_ImportAdempiere.bat create mode 100644 org.adempiere.server-feature/utils.windows/RUN_ImportIdempiere.bat delete mode 100644 org.adempiere.server-feature/utils.windows/RUN_Migrate.bat create mode 100644 org.adempiere.server-feature/utils.windows/RUN_PostMigration.bat delete mode 100644 org.adempiere.server-feature/utils.windows/RUN_PutExportTemplate.bat delete mode 100644 org.adempiere.server-feature/utils.windows/RUN_SignDatabaseBuild.bat rename org.adempiere.server-feature/utils.windows/oracle/{ImportAdempiere.bat => ImportIdempiere.bat} (69%) rename org.adempiere.server-feature/utils.windows/postgresql/{ImportAdempiere.bat => ImportIdempiere.bat} (70%) delete mode 100644 org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Install.bat delete mode 100644 org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Uninstall.bat rename org.adempiere.server-feature/utils.windows/windows/{AdempiereService.exe => idempiereService.exe} (100%) create mode 100644 org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Install.bat create mode 100644 org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Uninstall.bat delete mode 100644 org.adempiere.webstore/WEB-INF/web-original.xml diff --git a/db/database/Startup/oracle/Start.sql b/db/database/Startup/oracle/Start.sql index 3e3399cab4..00e3ea2159 100644 --- a/db/database/Startup/oracle/Start.sql +++ b/db/database/Startup/oracle/Start.sql @@ -10,7 +10,7 @@ * Title: Start Database * Description: * Start the script via - * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql + * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql ************************************************************************/ set pause off set echo on diff --git a/db/database/Startup/oracle/Stop.sql b/db/database/Startup/oracle/Stop.sql index 755494eb83..27476e80fa 100644 --- a/db/database/Startup/oracle/Stop.sql +++ b/db/database/Startup/oracle/Stop.sql @@ -10,7 +10,7 @@ * Title: Stop Database and save configuration in trace * Description: * Start the script via - * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql + * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql ************************************************************************/ set pause off set echo on diff --git a/db/database/Startup/oracleXE/Start.sql b/db/database/Startup/oracleXE/Start.sql index 3e3399cab4..00e3ea2159 100644 --- a/db/database/Startup/oracleXE/Start.sql +++ b/db/database/Startup/oracleXE/Start.sql @@ -10,7 +10,7 @@ * Title: Start Database * Description: * Start the script via - * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql + * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql ************************************************************************/ set pause off set echo on diff --git a/db/database/Startup/oracleXE/Stop.sql b/db/database/Startup/oracleXE/Stop.sql index 755494eb83..27476e80fa 100644 --- a/db/database/Startup/oracleXE/Stop.sql +++ b/db/database/Startup/oracleXE/Stop.sql @@ -10,7 +10,7 @@ * Title: Stop Database and save configuration in trace * Description: * Start the script via - * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql + * sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql ************************************************************************/ set pause off set echo on diff --git a/org.adempiere.base/plugin.xml b/org.adempiere.base/plugin.xml index dfd2ea6805..41d31e82ee 100644 --- a/org.adempiere.base/plugin.xml +++ b/org.adempiere.base/plugin.xml @@ -55,5 +55,18 @@ + + + + + + diff --git a/org.adempiere.base/schema/org.compiere.db.AdempiereDatabase.exsd b/org.adempiere.base/schema/org.compiere.db.AdempiereDatabase.exsd index 980fc4eece..eb1cc7170c 100644 --- a/org.adempiere.base/schema/org.compiere.db.AdempiereDatabase.exsd +++ b/org.adempiere.base/schema/org.compiere.db.AdempiereDatabase.exsd @@ -6,7 +6,7 @@ - Extension point for persistence framework to database interface. The id attribute of the database element in your extension definition must match the database type stored in Adempiere.properties . + Extension point for persistence framework to database interface. The id attribute of the database element in your extension definition must match the database type stored in idempiere.properties . To support a database in adempiere, you need to extend this extension point and the org.adempiere.install.IDatabaseConfig extension point from the org.adempiere.install bundle. The id attribute of the two extension must match ( case sensitive ). diff --git a/org.adempiere.base/src/org/adempiere/base/PostMigrationApplication.java b/org.adempiere.base/src/org/adempiere/base/PostMigrationApplication.java new file mode 100644 index 0000000000..bbd00dc2ca --- /dev/null +++ b/org.adempiere.base/src/org/adempiere/base/PostMigrationApplication.java @@ -0,0 +1,77 @@ +/****************************************************************************** + * Product: Adempiere ERP & CRM Smart Business Solution * + * Copyright (C) 2010 Heng Sin Low * + * This program is free software; you can redistribute it and/or modify it * + * under the terms version 2 of the GNU General Public License as published * + * by the Free Software Foundation. This program is distributed in the hope * + * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * + * See the GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., * + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * + *****************************************************************************/ +package org.adempiere.base; + +import java.util.logging.Level; + +import org.adempiere.util.ProcessUtil; +import org.compiere.Adempiere; +import org.compiere.process.ProcessInfo; +import org.compiere.util.CLogMgt; +import org.compiere.util.Env; +import org.eclipse.equinox.app.IApplication; +import org.eclipse.equinox.app.IApplicationContext; + +/** + * @author hengsin + * + */ +public class PostMigrationApplication implements IApplication { + + /* (non-Javadoc) + * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) + */ + @Override + public Object start(IApplicationContext context) throws Exception { + Adempiere.startup(false); + CLogMgt.setLevel(Level.FINE); + addMissingTranslation(); + roleAccessUpdate(); + checkSequence(); + + return IApplication.EXIT_OK; + } + + private void checkSequence() { + ProcessInfo pi = new ProcessInfo("Sequence Check", 258); + pi.setAD_Client_ID(0); + pi.setAD_User_ID(100); + pi.setClassName("org.compiere.process.SequenceCheck"); + ProcessUtil.startJavaProcess(Env.getCtx(), pi, null); + } + + private void roleAccessUpdate() { + ProcessInfo pi = new ProcessInfo("Role Access Update", 295); + pi.setAD_Client_ID(0); + pi.setAD_User_ID(100); + pi.setClassName("org.compiere.process.RoleAccessUpdate"); + ProcessUtil.startJavaProcess(Env.getCtx(), pi, null); + } + + private void addMissingTranslation() { + ProcessInfo pi = new ProcessInfo("Synchronize Terminology", 172); + pi.setAD_Client_ID(0); + pi.setAD_User_ID(100); + pi.setClassName("org.compiere.process.SynchronizeTerminology"); + ProcessUtil.startJavaProcess(Env.getCtx(), pi, null); + } + + /* (non-Javadoc) + * @see org.eclipse.equinox.app.IApplication#stop() + */ + @Override + public void stop() { + } + +} diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java index d074d8abae..59ed37c18c 100644 --- a/org.adempiere.base/src/org/compiere/Adempiere.java +++ b/org.adempiere.base/src/org/compiere/Adempiere.java @@ -397,7 +397,7 @@ public final class Adempiere // Try Environment String retValue = Ini.getAdempiereHome(); if (retValue == null) - retValue = File.separator + "Adempiere"; + retValue = File.separator + "idempiere"; return retValue; } // getHome diff --git a/org.adempiere.base/src/org/compiere/db/CConnection.java b/org.adempiere.base/src/org/compiere/db/CConnection.java index 396e19324d..32a13ec1f6 100644 --- a/org.adempiere.base/src/org/compiere/db/CConnection.java +++ b/org.adempiere.base/src/org/compiere/db/CConnection.java @@ -1234,7 +1234,7 @@ public class CConnection implements Serializable, Cloneable } catch (NoClassDefFoundError ee) { - System.err.println("Environment Error - Check Adempiere.properties - " + ee); + System.err.println("Environment Error - Check idempiere.properties - " + ee); if (Ini.isClient()) { if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog diff --git a/org.adempiere.base/src/org/compiere/util/CLogFile.java b/org.adempiere.base/src/org/compiere/util/CLogFile.java index f04e27609e..def98f9b4c 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogFile.java +++ b/org.adempiere.base/src/org/compiere/util/CLogFile.java @@ -26,7 +26,7 @@ import java.util.logging.LogRecord; /** - * Adempiere Log File Handler + * idempiere Log File Handler * * @author Jorg Janke * @version $Id: CLogFile.java,v 1.3 2006/07/30 00:54:35 jjanke Exp $ @@ -35,22 +35,22 @@ public class CLogFile extends Handler { /************************************************************************** * Constructor - * @param adempiereHome adempiere home + * @param idempiereHome idempiere home * @param createLogDir create log directory if missing * @param isClient client */ - public CLogFile (String adempiereHome, boolean createLogDir, boolean isClient) + public CLogFile (String idempiereHome, boolean createLogDir, boolean isClient) { // - if (adempiereHome != null && adempiereHome.length() > 0) - m_adempiereHome = adempiereHome; + if (idempiereHome != null && idempiereHome.length() > 0) + m_idempiereHome = idempiereHome; else - m_adempiereHome = Ini.findAdempiereHome(); - initialize(m_adempiereHome, createLogDir, isClient); + m_idempiereHome = Ini.findAdempiereHome(); + initialize(m_idempiereHome, createLogDir, isClient); } // CLogFile - /** Adempiere Home */ - private String m_adempiereHome = null; + /** idempiere Home */ + private String m_idempiereHome = null; /** Printed header */ private boolean m_doneHeader = false; /** Output file */ @@ -64,11 +64,11 @@ public class CLogFile extends Handler /** * Initialize - * @param adempiereHome log file base directory name + * @param idempiereHome log file base directory name * @param createLogDir create log directory * @param isClient client */ - private void initialize(String adempiereHome, boolean createLogDir, boolean isClient) + private void initialize(String idempiereHome, boolean createLogDir, boolean isClient) { // System.out.println("CLogFile.initialize"); // Close Old File @@ -76,7 +76,7 @@ public class CLogFile extends Handler close(); m_doneHeader = false; // New File Name - if (!createFile(adempiereHome, createLogDir, isClient)) + if (!createFile(idempiereHome, createLogDir, isClient)) return; // New Writer try @@ -111,7 +111,7 @@ public class CLogFile extends Handler String fileName = baseDirName; try { - // Test AdempiereHome + // Test idempiereHome if (fileName != null) { File dir = new File(fileName); @@ -121,7 +121,7 @@ public class CLogFile extends Handler fileName = null; } } - // Test/Create AdempiereHome/log + // Test/Create idempiereHome/log if (fileName != null && createLogDir) { fileName += File.separator + "log"; @@ -134,7 +134,7 @@ public class CLogFile extends Handler fileName = null; } } - // Test/Create AdempiereHome/log/file + // Test/Create idempiereHome/log/file if (fileName != null) { fileName += File.separator; @@ -157,7 +157,7 @@ public class CLogFile extends Handler } if (m_file == null) { // Fallback create temp file m_fileNameDate = getFileNameDate(System.currentTimeMillis()); - m_file = File.createTempFile("adempiere"+m_fileNameDate + "_", ".log"); + m_file = File.createTempFile("idempiere"+m_fileNameDate + "_", ".log"); } } catch (Exception ex) @@ -199,7 +199,7 @@ public class CLogFile extends Handler */ public void rotateLog () { - initialize(m_adempiereHome, true, Ini.isClient()); + initialize(m_idempiereHome, true, Ini.isClient()); } // rotateLog /** @@ -352,7 +352,7 @@ public class CLogFile extends Handler return sb.toString (); } // toString - public static CLogFile get(boolean create, String adempiereHome, boolean isClient) { + public static CLogFile get(boolean create, String idempiereHome, boolean isClient) { Handler[] handlers = CLogMgt.getHandlers(); for (Handler handler : handlers) { @@ -361,7 +361,7 @@ public class CLogFile extends Handler } if (create) { - CLogFile handler = new CLogFile(adempiereHome, true, isClient); + CLogFile handler = new CLogFile(idempiereHome, true, isClient); CLogMgt.addHandler(handler); return handler; } diff --git a/org.adempiere.base/src/org/compiere/util/CLogFilter.java b/org.adempiere.base/src/org/compiere/util/CLogFilter.java index 6f0266618c..286dcdb95a 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogFilter.java +++ b/org.adempiere.base/src/org/compiere/util/CLogFilter.java @@ -22,7 +22,7 @@ import java.util.logging.LogRecord; /** - * Adempiere Log Filter + * idempiere Log Filter * * @author Jorg Janke * @version $Id: CLogFilter.java,v 1.2 2006/07/30 00:54:36 jjanke Exp $ diff --git a/org.adempiere.base/src/org/compiere/util/CLogFormatter.java b/org.adempiere.base/src/org/compiere/util/CLogFormatter.java index 61bd6de2e0..ee3bf141c9 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogFormatter.java +++ b/org.adempiere.base/src/org/compiere/util/CLogFormatter.java @@ -27,7 +27,7 @@ import java.util.logging.LogRecord; /** - * Adempiere Log Formatter + * idempiere Log Formatter * * @author Jorg Janke * @version $Id: CLogFormatter.java,v 1.2 2006/07/30 00:54:36 jjanke Exp $ @@ -158,7 +158,7 @@ public class CLogFormatter extends Formatter StringBuffer sb = new StringBuffer() .append("*** ") .append(new Timestamp(System.currentTimeMillis())) - .append(" Adempiere Log (").append(className) + .append(" idempiere Log (").append(className) .append(") ***").append(NL); return sb.toString(); } // getHead @@ -178,7 +178,7 @@ public class CLogFormatter extends Formatter .append(NL) .append("*** ") .append(new Timestamp(System.currentTimeMillis())) - .append(" Adempiere Log (").append(className) + .append(" idempiere Log (").append(className) .append(") ***").append(NL); return sb.toString(); } // getTail diff --git a/org.adempiere.base/src/org/compiere/util/CLogMgt.java b/org.adempiere.base/src/org/compiere/util/CLogMgt.java index 7f6e381557..71b4f74e4d 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogMgt.java +++ b/org.adempiere.base/src/org/compiere/util/CLogMgt.java @@ -41,7 +41,7 @@ import org.compiere.model.MClient; /** - * Adempiere Log Management. + * idempiere Log Management. * * @author Jorg Janke * @version $Id: CLogMgt.java,v 1.4 2006/07/30 00:54:36 jjanke Exp $ diff --git a/org.adempiere.base/src/org/compiere/util/CLogger.java b/org.adempiere.base/src/org/compiere/util/CLogger.java index 3c29b40119..9181a43b65 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogger.java +++ b/org.adempiere.base/src/org/compiere/util/CLogger.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; /** - * Adempiere Logger + * idempiere Logger * * @author Jorg Janke * @version $Id: CLogger.java,v 1.3 2006/08/09 16:38:47 jjanke Exp $ @@ -75,7 +75,7 @@ public class CLogger extends Logger implements Serializable } // getLogger /** - * Get default Adempiere Logger. + * Get default idempiere Logger. * Need to be used in serialized objects * @return logger */ diff --git a/org.adempiere.base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java index 4f972afac9..8250810883 100644 --- a/org.adempiere.base/src/org/compiere/util/DB.java +++ b/org.adempiere.base/src/org/compiere/util/DB.java @@ -186,7 +186,7 @@ public final class DB String envName = Ini.getAdempiereHome(); if (envName == null) return; - envName += File.separator + "AdempiereEnv.properties"; + envName += File.separator + "idempiereEnv.properties"; File envFile = new File(envName); if (!envFile.exists()) return; diff --git a/org.adempiere.base/src/org/compiere/util/Ini.java b/org.adempiere.base/src/org/compiere/util/Ini.java index ed088d3a82..7e9ae05d39 100644 --- a/org.adempiere.base/src/org/compiere/util/Ini.java +++ b/org.adempiere.base/src/org/compiere/util/Ini.java @@ -40,8 +40,6 @@ import javax.jnlp.FileContents; import javax.jnlp.PersistenceService; import javax.jnlp.ServiceManager; import javax.jnlp.UnavailableServiceException; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.compiere.model.ModelValidationEngine; @@ -65,7 +63,7 @@ public final class Ini implements Serializable private static final long serialVersionUID = 3666529972922769528L; /** Property file name */ - public static final String ADEMPIERE_PROPERTY_FILE = "Adempiere.properties"; + public static final String IDEMPIERE_PROPERTY_FILE = "idempiere.properties"; /** Apps User ID */ public static final String P_UID = "ApplicationUserID"; @@ -524,9 +522,9 @@ public final class Ini implements Serializable * Return File Name of INI file * 
 	 *  Examples:
-	 *	    C:\WinNT\Profiles\jjanke\Adempiere.properties
-	 *      D:\Adempiere\Adempiere.properties
-	 *      Adempiere.properties
+	 *	    C:\WinNT\Profiles\jjanke\idempiere.properties
+	 *      D:\idempiere\idempiere.properties
+	 *      idempiere.properties
 	 *
* Can be overwritten by -DPropertyFile=myFile allowing multiple * configurations / property files. @@ -553,7 +551,7 @@ public final class Ini implements Serializable if (base == null) base = ""; // - return base + ADEMPIERE_PROPERTY_FILE; + return base + IDEMPIERE_PROPERTY_FILE; } // getFileName @@ -678,8 +676,8 @@ public final class Ini implements Serializable /** System environment prefix */ public static final String ENV_PREFIX = "env."; - /** System Property Value of ADEMPIERE_HOME */ - public static final String ADEMPIERE_HOME = "ADEMPIERE_HOME"; + /** System Property Value of IDEMPIERE_HOME */ + public static final String IDEMPIERE_HOME = "IDEMPIERE_HOME"; /** IsClient Internal marker */ private static boolean s_client = false; @@ -734,14 +732,14 @@ public final class Ini implements Serializable } // isLoaded /** - * Get Adempiere Home from Environment - * @return AdempiereHome or null + * Get Idempiere Home from Environment + * @return idempiereHome or null */ public static String getAdempiereHome() { - String env = System.getProperty (ENV_PREFIX + ADEMPIERE_HOME); + String env = System.getProperty (ENV_PREFIX + IDEMPIERE_HOME); if (env == null || env.trim().length() == 0) - env = System.getProperty (ADEMPIERE_HOME); + env = System.getProperty (IDEMPIERE_HOME); if (env == null || env.trim().length() == 0) { //client - user home, server - current working directory @@ -758,23 +756,23 @@ public final class Ini implements Serializable } } if (env == null || env.trim().length() == 0 ) // Fallback - env = File.separator + "Adempiere"; + env = File.separator + "idempiere"; return env; } // getAdempiereHome /** - * Set Adempiere Home - * @param AdempiereHome ADEMPIERE_HOME + * Set Idempiere Home + * @param idempiereHome IDEMPIERE_HOME */ - public static void setAdempiereHome (String AdempiereHome) + public static void setAdempiereHome (String idempiereHome) { - if (AdempiereHome != null && AdempiereHome.length() > 0) - System.setProperty (ADEMPIERE_HOME, AdempiereHome); + if (idempiereHome != null && idempiereHome.length() > 0) + System.setProperty (IDEMPIERE_HOME, idempiereHome); } // setAdempiereHome /** - * Find Adempiere Home - * @return adempiere home or null + * Find Idempiere Home + * @return idempiere home or null */ public static String findAdempiereHome() { diff --git a/org.adempiere.base/src/org/compiere/util/Msg.java b/org.adempiere.base/src/org/compiere/util/Msg.java index 725ad3a655..1efddd0433 100644 --- a/org.adempiere.base/src/org/compiere/util/Msg.java +++ b/org.adempiere.base/src/org/compiere/util/Msg.java @@ -221,7 +221,7 @@ public final class Msg return File.separator; if (text.equals(";") || text.equals(":")) return File.pathSeparator; - if (text.equals("ADEMPIERE_HOME")) + if (text.equals("IDEMPIERE_HOME")) return Adempiere.getAdempiereHome(); if (text.equals("bat") || text.equals("sh")) { diff --git a/org.adempiere.base/src/org/compiere/util/WebEnv.java b/org.adempiere.base/src/org/compiere/util/WebEnv.java index e7b6779c71..e0fa53ffe8 100644 --- a/org.adempiere.base/src/org/compiere/util/WebEnv.java +++ b/org.adempiere.base/src/org/compiere/util/WebEnv.java @@ -163,7 +163,7 @@ public class WebEnv File file = new File(propertyFile); if (!file.exists()) { - throw new java.lang.IllegalStateException("Adempiere.properties is not setup. PropertyFile="+propertyFile); + throw new java.lang.IllegalStateException("idempiere.properties is not setup. PropertyFile="+propertyFile); } try { diff --git a/org.adempiere.extend/src/test/AdempiereTestCase.java b/org.adempiere.extend/src/test/AdempiereTestCase.java index 30acdedff6..1260481f08 100644 --- a/org.adempiere.extend/src/test/AdempiereTestCase.java +++ b/org.adempiere.extend/src/test/AdempiereTestCase.java @@ -44,7 +44,7 @@ public class AdempiereTestCase extends TestCase // Filename public final String fileName_Key = "AdempiereProperties"; - private String fileName_DefaultValue = "Adempiere.properties"; + private String fileName_DefaultValue = "idempiere.properties"; private String fileName_Value = ""; // IsClient @@ -152,7 +152,7 @@ public class AdempiereTestCase extends TestCase m_Ctx.setProperty("#AD_Client_ID", new Integer(AD_Client_ID_Value).toString()); if (fileName_Value.length() < 1) { - assertEquals("Please specify path to Adempiere.properties file!", true, false); + assertEquals("Please specify path to idempiere.properties file!", true, false); } System.setProperty("PropertyFile", fileName_Value); diff --git a/org.adempiere.extend/testTemplate.properties b/org.adempiere.extend/testTemplate.properties index 30b93073e3..215ae681f5 100644 --- a/org.adempiere.extend/testTemplate.properties +++ b/org.adempiere.extend/testTemplate.properties @@ -1,4 +1,4 @@ -AdempiereProperties=C:/Adempiere/Adempiere.properties +AdempiereProperties=C:/idempiere/idempiere.properties isClient=Y AD_Client_ID=11 #AD_Client_ID=1000006 diff --git a/org.adempiere.install/Adempiere/AdempiereEnvTemplate.properties b/org.adempiere.install/Adempiere/idempiereEnvTemplate.properties similarity index 92% rename from org.adempiere.install/Adempiere/AdempiereEnvTemplate.properties rename to org.adempiere.install/Adempiere/idempiereEnvTemplate.properties index a89f72567a..84766f81a5 100644 --- a/org.adempiere.install/Adempiere/AdempiereEnvTemplate.properties +++ b/org.adempiere.install/Adempiere/idempiereEnvTemplate.properties @@ -1,7 +1,7 @@ -#AdempiereEnv.properties Template +#idempiereEnv.properties Template -#Adempiere home -ADEMPIERE_HOME=C\:\\Adempiere +#idempiere home +IDEMPIERE_HOME=C\:\\idempiere #Java home JAVA_HOME=C\:\\Program Files\\Java\\jdk1.5.0_09 diff --git a/org.adempiere.install/build.xml b/org.adempiere.install/build.xml index fa02272fb4..1a09a8d37a 100644 --- a/org.adempiere.install/build.xml +++ b/org.adempiere.install/build.xml @@ -9,7 +9,7 @@ - + @@ -18,7 +18,7 @@ description="setup tomcat"> - + diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java index e528aaec7b..63dd2973f9 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java @@ -102,14 +102,14 @@ public class ConfigurationData /** Properties File name */ - public static final String ADEMPIERE_ENV_FILE = "AdempiereEnv.properties"; + public static final String IDEMPIERE_ENV_FILE = "idempiereEnv.properties"; /** Adempiere Home */ - public static final String ADEMPIERE_HOME = "ADEMPIERE_HOME"; + public static final String IDEMPIERE_HOME = "IDEMPIERE_HOME"; /** */ public static final String JAVA_HOME = "JAVA_HOME"; /** */ - public static final String ADEMPIERE_JAVA_OPTIONS = "ADEMPIERE_JAVA_OPTIONS"; + public static final String IDEMPIERE_JAVA_OPTIONS = "IDEMPIERE_JAVA_OPTIONS"; /** Default Keysore Password */ public static final String KEYSTORE_PASSWORD = "myPassword"; @@ -214,13 +214,13 @@ public class ConfigurationData */ public boolean load() { - // Load C:\Adempiere\AdempiereEnv.properties - String adempiereHome = System.getProperty(ADEMPIERE_HOME); + // Load C:\idempiere\idempiereEnv.properties + String adempiereHome = System.getProperty(IDEMPIERE_HOME); if (adempiereHome == null || adempiereHome.length() == 0) adempiereHome = System.getProperty("user.dir"); boolean envLoaded = false; - String fileName = adempiereHome + File.separator + ADEMPIERE_ENV_FILE; + String fileName = adempiereHome + File.separator + IDEMPIERE_ENV_FILE; File env = new File (fileName); if (env.exists()) { @@ -245,7 +245,7 @@ public class ConfigurationData if (loaded.containsKey(JAVA_HOME)) setJavaHome((String)loaded.get(JAVA_HOME)); // - setAdempiereHome((String)p_properties.get(ADEMPIERE_HOME)); + setAdempiereHome((String)p_properties.get(IDEMPIERE_HOME)); String s = (String)p_properties.get(ADEMPIERE_KEYSTOREPASS); if (s == null || s.length() == 0) { @@ -341,8 +341,8 @@ public class ConfigurationData p_properties.setProperty(ADEMPIERE_FTP_PREFIX, "my"); } // Default Java Options - if (!p_properties.containsKey(ADEMPIERE_JAVA_OPTIONS)) - p_properties.setProperty(ADEMPIERE_JAVA_OPTIONS, "-Xms64M -Xmx512M"); + if (!p_properties.containsKey(IDEMPIERE_JAVA_OPTIONS)) + p_properties.setProperty(IDEMPIERE_JAVA_OPTIONS, "-Xms64M -Xmx512M"); // Web Alias if (!p_properties.containsKey(ADEMPIERE_WEB_ALIAS) && localhost != null) p_properties.setProperty(ADEMPIERE_WEB_ALIAS, localhost.getCanonicalHostName()); @@ -437,8 +437,8 @@ public class ConfigurationData if (!pass) return error; log.info("OK: AdempiereHome = " + m_adempiereHome); - p_properties.setProperty(ADEMPIERE_HOME, m_adempiereHome.getAbsolutePath()); - System.setProperty(ADEMPIERE_HOME, m_adempiereHome.getAbsolutePath()); + p_properties.setProperty(IDEMPIERE_HOME, m_adempiereHome.getAbsolutePath()); + System.setProperty(IDEMPIERE_HOME, m_adempiereHome.getAbsolutePath()); // KeyStore String fileName = KeyStoreMgt.getKeystoreFileName(m_adempiereHome.getAbsolutePath()); @@ -808,15 +808,15 @@ public class ConfigurationData // Before we save, load Ini Ini.setClient(false); - String fileName = m_adempiereHome.getAbsolutePath() + File.separator + Ini.ADEMPIERE_PROPERTY_FILE; + String fileName = m_adempiereHome.getAbsolutePath() + File.separator + Ini.IDEMPIERE_PROPERTY_FILE; Ini.loadProperties(fileName); // Save Environment - fileName = m_adempiereHome.getAbsolutePath() + File.separator + ADEMPIERE_ENV_FILE; + fileName = m_adempiereHome.getAbsolutePath() + File.separator + IDEMPIERE_ENV_FILE; try { FileOutputStream fos = new FileOutputStream(new File(fileName)); - p_properties.store(fos, ADEMPIERE_ENV_FILE); + p_properties.store(fos, IDEMPIERE_ENV_FILE); fos.flush(); fos.close(); } @@ -898,7 +898,7 @@ public class ConfigurationData { return p_panel != null ? p_panel.fAdempiereHome.getText() - : (String)p_properties.get(ADEMPIERE_HOME); + : (String)p_properties.get(IDEMPIERE_HOME); } // getAdempiereHome /** @@ -910,7 +910,7 @@ public class ConfigurationData if (p_panel != null) p_panel.fAdempiereHome.setText(adempiereHome); else - updateProperty(ADEMPIERE_HOME, adempiereHome); + updateProperty(IDEMPIERE_HOME, adempiereHome); } // setAdempiereHome /** diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java index 1bfeb68593..113c131f94 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java @@ -211,7 +211,7 @@ public class ConfigurationPanel extends JPanel implements ActionListener, IDBCon fKeyStore.setText(""); okKeyStore.setEnabled(false); - sectionLabel = new JLabel("Adempiere"); + sectionLabel = new JLabel("iDempiere"); sectionLabel.setForeground(titledBorder.getTitleColor()); separator = new JSeparator(); this.add(sectionLabel, new GridBagConstraints(0, 3, 7, 1, 0.0, 0.0 diff --git a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java index b7c2511235..2a75676dc6 100644 --- a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java +++ b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java @@ -72,12 +72,12 @@ public class KeyStoreMgt private String organization; - /** Directory below ADEMPIERE_HOME */ + /** Directory below IDEMPIERE_HOME */ public static String KEYSTORE_DIRECTORY = "keystore"; /** Name of KeyStore */ public static String KEYSTORE_NAME = "myKeystore"; /** Certificate Alias */ - public static String CERTIFICATE_ALIAS = "adempiere"; + public static String CERTIFICATE_ALIAS = "idempiere"; /** @@ -465,7 +465,7 @@ public class KeyStoreMgt /** * Get Keystore File Name - * @param baseDir ADEMPIERE_HOME + * @param baseDir IDEMPIERE_HOME * @return file name */ public static String getKeystoreFileName (String baseDir) diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes.java b/org.adempiere.install/src/org/compiere/install/SetupRes.java index d09c147e82..1080c031dc 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes.java @@ -28,16 +28,16 @@ public class SetupRes extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Adempiere Server Setup" }, + { "AdempiereServerSetup", "iDempiere Server Setup" }, { "Ok", "Ok" }, { "File", "File" }, { "Exit", "Exit" }, { "Help", "Help" }, { "PleaseCheck", "Please Check" }, - { "UnableToConnect", "Unable get help from Adempiere Web Site" }, + { "UnableToConnect", "Unable get help from iDempiere Web Site" }, // - { "AdempiereHomeInfo", "Adempiere Home is the main Folder" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home is the main Folder" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Web (HTML) Port" }, { "WebPort", "Web Port" }, { "AppsServerInfo", "Application Server Name" }, @@ -48,9 +48,9 @@ public class SetupRes extends ListResourceBundle { "DatabaseName", "Database Name" }, { "DatabasePortInfo", "Database Listener Port" }, { "DatabasePort", "Database Port" }, - { "DatabaseUserInfo", "Database Adempiere User ID" }, + { "DatabaseUserInfo", "Database iDempiere User ID" }, { "DatabaseUser", "Database User" }, - { "DatabasePasswordInfo", "Database Adempiere User Password" }, + { "DatabasePasswordInfo", "Database iDempiere User Password" }, { "DatabasePassword", "Database Password" }, { "TNSNameInfo", "Discovered Databases" }, { "TNSName", "Database Search" }, @@ -58,7 +58,7 @@ public class SetupRes extends ListResourceBundle { "SystemPassword", "DB Admin Password" }, { "MailServerInfo", "Mail Server" }, { "MailServer", "Mail Server" }, - { "AdminEMailInfo", "Adempiere Administrator EMail" }, + { "AdminEMailInfo", "iDempiere Administrator EMail" }, { "AdminEMail", "Admin EMail" }, { "DatabaseServerInfo", "Database Server Name" }, { "DatabaseServer", "Database Server" }, @@ -66,9 +66,9 @@ public class SetupRes extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Application Server JNP Port" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "Adempiere Mail User" }, + { "MailUserInfo", "iDempiere Mail User" }, { "MailUser", "Mail User" }, - { "MailPasswordInfo", "Adempiere Mail User Password" }, + { "MailPasswordInfo", "iDempiere Mail User Password" }, { "MailPassword", "Mail Password" }, { "KeyStorePassword", "KeyStore Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, @@ -89,7 +89,7 @@ public class SetupRes extends ListResourceBundle // { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java index 115cf358f0..f6eac180a6 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java @@ -29,16 +29,16 @@ public class SetupRes_ca extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Configuraci\u00f3 Servidor Adempiere" }, + { "AdempiereServerSetup", "Configuraci\u00f3 Servidor iDempiere" }, { "Ok", "Acceptar" }, { "File", "Fitxer" }, { "Exit", "Sortir" }, { "Help", "Ajuda" }, { "PleaseCheck", "Sisplau Comproveu" }, - { "UnableToConnect", "No s'ha pogut obtenir ajuda de la web d'Adempiere" }, + { "UnableToConnect", "No s'ha pogut obtenir ajuda de la web d'idempiere" }, // - { "AdempiereHomeInfo", "Adempiere Home \u00e9s la Carpeta Principal" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home \u00e9s la Carpeta Principal" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Port Web (HTML)" }, { "WebPort", "Port Web" }, { "AppsServerInfo", "Nom Servidor Aplicaci\u00f3" }, @@ -49,9 +49,9 @@ public class SetupRes_ca extends ListResourceBundle { "DatabaseName", "Nom Base de Dades" }, { "DatabasePortInfo", "Port Escolta Base de Dades" }, { "DatabasePort", "Port Base de Dades" }, - { "DatabaseUserInfo", "ID Usuari Base de Dades Adempiere" }, + { "DatabaseUserInfo", "ID Usuari Base de Dades iDempiere" }, { "DatabaseUser", "Usuari Base de Dades" }, - { "DatabasePasswordInfo", "Contrasenya Usuari Base de Dades Adempiere" }, + { "DatabasePasswordInfo", "Contrasenya Usuari Base de Dades iDempiere" }, { "DatabasePassword", "Contrasenya Base de Dades" }, { "TNSNameInfo", "Bases de Dades Trobades" }, { "TNSName", "Buscar Bases de Dades" }, @@ -59,7 +59,7 @@ public class SetupRes_ca extends ListResourceBundle { "SystemPassword", "Contrasenya System" }, { "MailServerInfo", "Servidor Correu" }, { "MailServer", "Servidor Correu" }, - { "AdminEMailInfo", "Email Administrador Adempiere" }, + { "AdminEMailInfo", "Email Administrador iDempiere" }, { "AdminEMail", "Email Admin" }, { "DatabaseServerInfo", "Nom Servidor Base de Dades" }, { "DatabaseServer", "Servidor Base de Dades" }, @@ -67,9 +67,9 @@ public class SetupRes_ca extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Port JNP Servidor Aplicaci\u00f3" }, { "JNPPort", "Port JNP" }, - { "MailUserInfo", "Usuari Correu Adempiere" }, + { "MailUserInfo", "Usuari Correu iDempiere" }, { "MailUser", "Usuari Correu" }, - { "MailPasswordInfo", "Contrasenya Usuari Correu Adempiere" }, + { "MailPasswordInfo", "Contrasenya Usuari Correu iDempiere" }, { "MailPassword", "Contrasenya Correu" }, { "KeyStorePassword", "Contrasenya Key Store" }, { "KeyStorePasswordInfo", "Contrasenya per SSL Key Store" }, @@ -90,7 +90,7 @@ public class SetupRes_ca extends ListResourceBundle // { "ServerError", "Error Configuraci\u00f3 Servidor" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Servidor Aplicaci\u00f3" }, { "ErrorWebPort", "Error Port Web" }, { "ErrorJNPPort", "Error Port JNP" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_da.java b/org.adempiere.install/src/org/compiere/install/SetupRes_da.java index bf5363e462..be8a12794b 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_da.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_da.java @@ -28,7 +28,7 @@ public class SetupRes_da extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Adempiere: Opsætning af server" }, + { "AdempiereServerSetup", "iDempiere: Opsætning af server" }, { "Ok", "OK" }, { "File", "Fil" }, { "Exit", "Afslut" }, @@ -36,8 +36,8 @@ public class SetupRes_da extends ListResourceBundle { "PleaseCheck", "Kontrollér" }, { "UnableToConnect", "Kan ikke hente hjælp fra Adempieres web-sted" }, - { "AdempiereHomeInfo", "Adempiere Home er hovedmappen" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home er hovedmappen" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Web (HTML)-port" }, { "WebPort", "Web-port" }, { "AppsServerInfo", "Programserverens navn" }, @@ -89,7 +89,7 @@ public class SetupRes_da extends ListResourceBundle { "ServerError", "Fejl: Serverops�tning" }, { "ErrorJavaHome", "Fejl: Java Home" }, - { "ErrorAdempiereHome", "Fejl: Adempiere Home" }, + { "ErrorAdempiereHome", "Fejl: iDempiere Home" }, { "ErrorAppsServer", "Fejl: Prog.-server" }, { "ErrorWebPort", "Fejl: Web-port" }, { "ErrorJNPPort", "Fejl: JNP-port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_de.java b/org.adempiere.install/src/org/compiere/install/SetupRes_de.java index 4ede141814..1e0c4a69b3 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_de.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_de.java @@ -28,16 +28,16 @@ public class SetupRes_de extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "ADempiere Server-Einrichtung" }, + { "AdempiereServerSetup", "iDempiere Server-Einrichtung" }, { "Ok", "Ok" }, { "File", "Datei" }, { "Exit", "Ende" }, { "Help", "Hilfe" }, { "PleaseCheck", "Bitte prüfen" }, - { "UnableToConnect", "Keine Verbindung zur ADempiere-Webseite" }, + { "UnableToConnect", "Keine Verbindung zur iDempiere-Webseite" }, // - { "AdempiereHomeInfo", "ADempiere-Hauptverzeichnis" }, - { "AdempiereHome", "ADempiere-Home" }, + { "AdempiereHomeInfo", "iDempiere-Hauptverzeichnis" }, + { "AdempiereHome", "iDempiere-Home" }, { "WebPortInfo", "Web-Port (HTML)" }, { "WebPort", "Web-Port" }, { "AppsServerInfo", "Name des Applikations-Servers" }, @@ -48,9 +48,9 @@ public class SetupRes_de extends ListResourceBundle { "DatabaseName", "Datenbank-Name" }, { "DatabasePortInfo", "Listener-Port Datenbank" }, { "DatabasePort", "Datenbank-Port" }, - { "DatabaseUserInfo", "Name ADempiere-DB-User" }, - { "DatabaseUser", "ADempiere-DB-User" }, - { "DatabasePasswordInfo", "Passwort ADempiere-DB-User" }, + { "DatabaseUserInfo", "Name iDempiere-DB-User" }, + { "DatabaseUser", "iDempiere-DB-User" }, + { "DatabasePasswordInfo", "Passwort iDempiere-DB-User" }, { "DatabasePassword", "DB-User-Passwort" }, { "DatabaseRestrictedInfo", "Einstellung: DB-Zugriff ist eingeschränkt" }, { "DatabaseRestricted", "Zugriff eingeschränkt" }, @@ -60,7 +60,7 @@ public class SetupRes_de extends ListResourceBundle { "SystemPassword", "DB-Admin-Passwort" }, { "MailServerInfo", "Name E-Mail-Server" }, { "MailServer", "E-Mail-Server" }, - { "AdminEMailInfo", "ADempiere Administrator-E-Mail" }, + { "AdminEMailInfo", "iDempiere Administrator-E-Mail" }, { "AdminEMail", "Admin-E-Mail" }, { "DatabaseServerInfo", "Name Datenbank-Server" }, { "DatabaseServer", "Datenbank-Server" }, @@ -68,9 +68,9 @@ public class SetupRes_de extends ListResourceBundle { "JavaHome", "Java-Home" }, { "JNPPortInfo", "JNP-Port Applikations-Server" }, { "JNPPort", "JNP-Port" }, - { "MailUserInfo", "Name ADempiere-Mail-User" }, + { "MailUserInfo", "Name iDempiere-Mail-User" }, { "MailUser", "Mail-User" }, - { "MailPasswordInfo", "Passwort ADempiere-Mail-User" }, + { "MailPasswordInfo", "Passwort iDempiere-Mail-User" }, { "MailPassword", "Mail-Password" }, { "KeyStorePassword", "KeyStore-Passwort" }, { "KeyStorePasswordInfo", "Passwort SSL-Key-Store" }, @@ -91,7 +91,7 @@ public class SetupRes_de extends ListResourceBundle // { "ServerError", "Fehler bei Server-Konfiguration" }, { "ErrorJavaHome", "Fehler bei Java-Home" }, - { "ErrorAdempiereHome", "Fehler bei ADempiere-Home" }, + { "ErrorAdempiereHome", "Fehler bei iDempiere-Home" }, { "ErrorAppsServer", "Fehler bei Applikations-Server" }, { "ErrorWebPort", "Fehler bei Web-Port" }, { "ErrorJNPPort", "Fehler bei JNP-Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_el.java b/org.adempiere.install/src/org/compiere/install/SetupRes_el.java index d6ce724565..b007958f5e 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_el.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_el.java @@ -28,16 +28,16 @@ public class SetupRes_el extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Adempiere Server Setup" }, + { "AdempiereServerSetup", "iDempiere Server Setup" }, { "Ok", "Ok" }, { "File", "File" }, { "Exit", "Exit" }, { "Help", "Help" }, { "PleaseCheck", "Please Check" }, - { "UnableToConnect", "Unable get help from Adempiere Web Site" }, + { "UnableToConnect", "Unable get help from iDempiere Web Site" }, - { "AdempiereHomeInfo", "Adempiere Home is the main Folder" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home is the main Folder" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Web (HTML) Port" }, { "WebPort", "Web Port" }, { "AppsServerInfo", "Application Server Name" }, @@ -48,9 +48,9 @@ public class SetupRes_el extends ListResourceBundle { "DatabaseName", "Database Name" }, { "DatabasePortInfo", "Database Listener Port" }, { "DatabasePort", "Database Port" }, - { "DatabaseUserInfo", "Database Adempiere User ID" }, + { "DatabaseUserInfo", "Database iDempiere User ID" }, { "DatabaseUser", "Database User" }, - { "DatabasePasswordInfo", "Database Adempiere User Password" }, + { "DatabasePasswordInfo", "Database iDempiere User Password" }, { "DatabasePassword", "Database Password" }, { "TNSNameInfo", "Discovered Databases" }, { "TNSName", "Database Search" }, @@ -58,7 +58,7 @@ public class SetupRes_el extends ListResourceBundle { "SystemPassword", "System Password" }, { "MailServerInfo", "Mail Server" }, { "MailServer", "Mail Server" }, - { "AdminEMailInfo", "Adempiere Administrator EMail" }, + { "AdminEMailInfo", "iDempiere Administrator EMail" }, { "AdminEMail", "Admin EMail" }, { "DatabaseServerInfo", "Database Server Name" }, { "DatabaseServer", "Database Server" }, @@ -66,9 +66,9 @@ public class SetupRes_el extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Application Server JNP Port" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "Adempiere Mail User" }, + { "MailUserInfo", "iDempiere Mail User" }, { "MailUser", "Mail User" }, - { "MailPasswordInfo", "Adempiere Mail User Password" }, + { "MailPasswordInfo", "iDempiere Mail User Password" }, { "MailPassword", "Mail Password" }, { "KeyStorePassword", "KeyStore Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, @@ -89,7 +89,7 @@ public class SetupRes_el extends ListResourceBundle { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_es.java b/org.adempiere.install/src/org/compiere/install/SetupRes_es.java index 77b31d9ed9..cdcc8ee97a 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_es.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_es.java @@ -29,16 +29,16 @@ public class SetupRes_es extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Configuraci\u00f3n Servidor Adempiere" }, + { "AdempiereServerSetup", "Configuraci\u00f3n Servidor iDempiere" }, { "Ok", "Aceptar" }, { "File", "Archivo" }, { "Exit", "Salir" }, { "Help", "Ayuda" }, { "PleaseCheck", "Por favor compruebe" }, - { "UnableToConnect", "No se ha podido obtener ayuda de la web de Adempiere" }, + { "UnableToConnect", "No se ha podido obtener ayuda de la web de iDempiere" }, // - { "AdempiereHomeInfo", "Adempiere Home es la carpeta principal" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home es la carpeta principal" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Puerto Web (HTML)" }, { "WebPort", "Puerto Web" }, { "AppsServerInfo", "Nombre Servidor Aplicaci\u00f3n" }, @@ -49,9 +49,9 @@ public class SetupRes_es extends ListResourceBundle { "DatabaseName", "Nombre Base de Datos" }, { "DatabasePortInfo", "Puerto Escucha Base de Datos" }, { "DatabasePort", "Puerto Base de Datos" }, - { "DatabaseUserInfo", "ID Usuario Base de Datos Adempiere" }, + { "DatabaseUserInfo", "ID Usuario Base de Datos iDempiere" }, { "DatabaseUser", "Usuario Base de Datos" }, - { "DatabasePasswordInfo", "Contrase\u00f1a Usuario Base de Datos Adempiere" }, + { "DatabasePasswordInfo", "Contrase\u00f1a Usuario Base de Datos iDempiere" }, { "DatabasePassword", "Contrase\u00f1a Base de Datos" }, { "TNSNameInfo", "Bases de Datos Encontradas" }, { "TNSName", "Buscar Bases de Datos" }, @@ -59,7 +59,7 @@ public class SetupRes_es extends ListResourceBundle { "SystemPassword", "Contrase\u00f1a Admin BD" }, { "MailServerInfo", "Servidor Correo" }, { "MailServer", "Servidor Correo" }, - { "AdminEMailInfo", "Email Administrador Adempiere" }, + { "AdminEMailInfo", "Email Administrador iDempiere" }, { "AdminEMail", "Email Admin" }, { "DatabaseServerInfo", "Nombre Servidor Base de Datos" }, { "DatabaseServer", "Servidor Base de Datos" }, @@ -67,9 +67,9 @@ public class SetupRes_es extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Puerto JNP Servidor Aplicaci\u00f3n" }, { "JNPPort", "Puerto JNP" }, - { "MailUserInfo", "Usuario Correo Adempiere" }, + { "MailUserInfo", "Usuario Correo iDempiere" }, { "MailUser", "Usuario Correo" }, - { "MailPasswordInfo", "Contrase\u00f1a Usuario Correo Adempiere" }, + { "MailPasswordInfo", "Contrase\u00f1a Usuario Correo iDempiere" }, { "MailPassword", "Contrase\u00f1a Correo" }, { "KeyStorePassword", "Contrase\u00f1a Key Store" }, { "KeyStorePasswordInfo", "Contrase\u00f1a para SSL Key Store" }, @@ -90,7 +90,7 @@ public class SetupRes_es extends ListResourceBundle // { "ServerError", "Error Configuraci\u00f3n Servidor" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Servidor Aplicaci\u00f3n" }, { "ErrorWebPort", "Error Puerto Web" }, { "ErrorJNPPort", "Error Puerto JNP" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java index 07f8479237..a1d2b91b14 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java @@ -29,16 +29,16 @@ public class SetupRes_fr extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Configuration du serveur Adempiere" }, + { "AdempiereServerSetup", "Configuration du serveur iDempiere" }, { "Ok", "Ok" }, { "File", "Fichier" }, { "Exit", "Sortir" }, { "Help", "Aide" }, { "PleaseCheck", "Verifiez" }, - { "UnableToConnect", "Impossible d'obtenir de l'aide depuis le site web Adempiere" }, + { "UnableToConnect", "Impossible d'obtenir de l'aide depuis le site web iDempiere" }, // - { "AdempiereHomeInfo", "R\u00E9pertoire racine d'Adempiere est le repertoire principale" }, - { "AdempiereHome", "R\u00E9pertoire racine d'Adempiere" }, + { "AdempiereHomeInfo", "R\u00E9pertoire racine d'iDempiere est le repertoire principale" }, + { "AdempiereHome", "R\u00E9pertoire racine d'iDempiere" }, { "WebPortInfo", "Port Web (HTML)" }, { "WebPort", "Port Web" }, { "AppsServerInfo", "Nom du serveur d'application" }, @@ -49,9 +49,9 @@ public class SetupRes_fr extends ListResourceBundle { "DatabaseName", "Nom de la base de donn\u00E9es" }, { "DatabasePortInfo", "Port d'\u00E9coute de la base de donn\u00E9es" }, { "DatabasePort", "Port de la base de donn\u00E9es" }, - { "DatabaseUserInfo", "ID de l'utilisateur de la base de donn\u00E9es Adempiere" }, + { "DatabaseUserInfo", "ID de l'utilisateur de la base de donn\u00E9es iDempiere" }, { "DatabaseUser", "Utilisateur de la base de donn\u00E9es" }, - { "DatabasePasswordInfo", "Mot de passe de la base de donn\u00E9es Adempiere" }, + { "DatabasePasswordInfo", "Mot de passe de la base de donn\u00E9es iDempiere" }, { "DatabasePassword", "Mot de passe de la base de donn\u00E9es" }, { "TNSNameInfo", "D\u00E9couverte de bases de donn\u00E9ees (TNS)" }, { "TNSName", "Recherche de bases de donn\u00E9ees" }, @@ -59,7 +59,7 @@ public class SetupRes_fr extends ListResourceBundle { "SystemPassword", "Mot de passe utilisateur System" }, { "MailServerInfo", "Serveur de courrier" }, { "MailServer", "Serveur de courrier" }, - { "AdminEMailInfo", "Courriel de l'administrateur Adempiere" }, + { "AdminEMailInfo", "Courriel de l'administrateur iDempiere" }, { "AdminEMail", "Courriel de l'administreur" }, { "DatabaseServerInfo", "Nom du serveur de base de donn\u00E9es" }, { "DatabaseServer", "Serveur de base de donn\u00E9es" }, @@ -67,9 +67,9 @@ public class SetupRes_fr extends ListResourceBundle { "JavaHome", "R\u00E9pertoire Java" }, { "JNPPortInfo", "Port JPN du serveur d'application" }, { "JNPPort", "Port JNP" }, - { "MailUserInfo", "Utilisateur courriel Adempiere" }, + { "MailUserInfo", "Utilisateur courriel iDempiere" }, { "MailUser", "Utilisateur courriel" }, - { "MailPasswordInfo", "Mot de passe de l'utilisateur Adempiere" }, + { "MailPasswordInfo", "Mot de passe de l'utilisateur iDempiere" }, { "MailPassword", "Mot de passe courriel" }, { "KeyStorePassword", "Mot de passe KeyStore" }, { "KeyStorePasswordInfo", "Mot de passe pour le KeyStore SSL" }, @@ -90,7 +90,7 @@ public class SetupRes_fr extends ListResourceBundle // { "ServerError", "Erreur de la configuration du serveur" }, { "ErrorJavaHome", "Erreur sur le r\u00E9pertoire Java" }, - { "ErrorAdempiereHome", "Erreur sur le r\u00E9pertoire Adempiere" }, + { "ErrorAdempiereHome", "Erreur sur le r\u00E9pertoire iDempiere" }, { "ErrorAppsServer", "Erreur Serveur Apps" }, { "ErrorWebPort", "Erreur port Web" }, { "ErrorJNPPort", "Erreur port JNP" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java index 38ff2f704e..abe257257d 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java @@ -29,16 +29,16 @@ public class SetupRes_hr extends ListResourceBundle /** Translation Info */ /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Postavke Adempiere servera" }, + { "AdempiereServerSetup", "Postavke iDempiere servera" }, { "Ok", "U redu" }, { "File", "Datoteka" }, { "Exit", "Izlaz" }, { "Help", "Pomo\u0107" }, { "PleaseCheck", "Molim provjeriti" }, - { "UnableToConnect", "GreÅ¡ka u spajanju na Adempiere web pomo\u0107" }, + { "UnableToConnect", "GreÅ¡ka u spajanju na iDempiere web pomo\u0107" }, // - { "AdempiereHomeInfo", "Adempiere Home je glavni direktorij" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home je glavni direktorij" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Web (HTML) Port" }, { "WebPort", "Web Port" }, { "AppsServerInfo", "Naziv servera aplikacije" }, @@ -49,7 +49,7 @@ public class SetupRes_hr extends ListResourceBundle { "DatabaseName", "Naziv baze (SID)" }, { "DatabasePortInfo", "Database Listener Port" }, { "DatabasePort", "Port baze" }, - { "DatabaseUserInfo", "Database Adempiere User ID" }, + { "DatabaseUserInfo", "Database iDempiere User ID" }, { "DatabaseUser", "Korisnik baze" }, { "DatabasePasswordInfo", "Lozinka korisnika baze" }, { "DatabasePassword", "Lozinka baze" }, @@ -59,7 +59,7 @@ public class SetupRes_hr extends ListResourceBundle { "SystemPassword", "System lozinka" }, { "MailServerInfo", "Mail Server" }, { "MailServer", "Mail Server" }, - { "AdminEMailInfo", "Adempiere Administrator EMail" }, + { "AdminEMailInfo", "iDempiere Administrator EMail" }, { "AdminEMail", "Admin EMail" }, { "DatabaseServerInfo", "Naziv servera baze" }, { "DatabaseServer", "Server baze" }, @@ -67,9 +67,9 @@ public class SetupRes_hr extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Application Server JNP Port" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "Adempiere Mail korisnik" }, + { "MailUserInfo", "iDempiere Mail korisnik" }, { "MailUser", "Mail korisnik" }, - { "MailPasswordInfo", "Adempiere Mail lozinka korisnika" }, + { "MailPasswordInfo", "iDempiere Mail lozinka korisnika" }, { "MailPassword", "Mail lozinka" }, { "KeyStorePassword", "Key Store Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, @@ -90,7 +90,7 @@ public class SetupRes_hr extends ListResourceBundle // { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java b/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java index f0a774f9d7..66d986c723 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java @@ -28,16 +28,16 @@ public class SetupRes_hu extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Adempiere Szerver Beállítása" }, + { "AdempiereServerSetup", "iDempiere Szerver Beállítása" }, { "Ok", "Ok" }, { "File", "Fájl" }, { "Exit", "Kilépés" }, { "Help", "Súgó" }, { "PleaseCheck", "Kérem ellenőrizze" }, - { "UnableToConnect", "Nem sikerült elérni a súgót az Adempiere web oldalán" }, + { "UnableToConnect", "Nem sikerült elérni a súgót az iDempiere web oldalán" }, // - { "AdempiereHomeInfo", "Adempiere Home is the main Folder" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home is the main Folder" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Web (HTML) Port" }, { "WebPort", "Web Port" }, { "AppsServerInfo", "Application Server Name" }, @@ -48,9 +48,9 @@ public class SetupRes_hu extends ListResourceBundle { "DatabaseName", "Database Name" }, { "DatabasePortInfo", "Database Listener Port" }, { "DatabasePort", "Database Port" }, - { "DatabaseUserInfo", "Database Adempiere User ID" }, + { "DatabaseUserInfo", "Database iDempiere User ID" }, { "DatabaseUser", "Database User" }, - { "DatabasePasswordInfo", "Database Adempiere User Password" }, + { "DatabasePasswordInfo", "Database iDempiere User Password" }, { "DatabasePassword", "Database Password" }, { "TNSNameInfo", "Discovered Databases" }, { "TNSName", "Database Search" }, @@ -58,7 +58,7 @@ public class SetupRes_hu extends ListResourceBundle { "SystemPassword", "System Password" }, { "MailServerInfo", "Mail Server" }, { "MailServer", "Mail Server" }, - { "AdminEMailInfo", "Adempiere Administrator EMail" }, + { "AdminEMailInfo", "iDempiere Administrator EMail" }, { "AdminEMail", "Admin EMail" }, { "DatabaseServerInfo", "Database Server Name" }, { "DatabaseServer", "Database Server" }, @@ -66,9 +66,9 @@ public class SetupRes_hu extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Application Server JNP Port" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "Adempiere Mail User" }, + { "MailUserInfo", "iDempiere Mail User" }, { "MailUser", "Mail User" }, - { "MailPasswordInfo", "Adempiere Mail User Password" }, + { "MailPasswordInfo", "iDempiere Mail User Password" }, { "MailPassword", "Mail Password" }, { "KeyStorePassword", "KeyStore Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, @@ -89,7 +89,7 @@ public class SetupRes_hu extends ListResourceBundle // { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_in.java b/org.adempiere.install/src/org/compiere/install/SetupRes_in.java index 7b50b9c124..d80557c34c 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_in.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_in.java @@ -28,16 +28,16 @@ public class SetupRes_in extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Setup Adempiere Server" }, + { "AdempiereServerSetup", "Setup iDempiere Server" }, { "Ok", "Ok" }, { "File", "File" }, { "Exit", "Keluar" }, { "Help", "Bantuan" }, { "PleaseCheck", "Mohon diperiksa" }, - { "UnableToConnect", "Koneksi gagal. Saat ini bantuan tidak bisa didapatkan dari situs web Adempiere" }, + { "UnableToConnect", "Koneksi gagal. Saat ini bantuan tidak bisa didapatkan dari situs web iDempiere" }, // - { "AdempiereHomeInfo", "Adempiere Home adalah direktori utama" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home adalah direktori utama" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Port Web (HTML)" }, { "WebPort", "Port Web" }, { "AppsServerInfo", "Nama Server Aplikasi" }, @@ -48,9 +48,9 @@ public class SetupRes_in extends ListResourceBundle { "DatabaseName", "Nama Database" }, { "DatabasePortInfo", "Port Database Listener" }, { "DatabasePort", "Port Database" }, - { "DatabaseUserInfo", "ID Pengguna untuk database Adempiere" }, + { "DatabaseUserInfo", "ID Pengguna untuk database iDempiere" }, { "DatabaseUser", "Pengguna Database" }, - { "DatabasePasswordInfo", "Kata sandi pengguna untuk database Adempiere" }, + { "DatabasePasswordInfo", "Kata sandi pengguna untuk database iDempiere" }, { "DatabasePassword", "Kata Sandi Database" }, { "TNSNameInfo", "Database-database yang ditemukan" }, { "TNSName", "Pilih Database" }, @@ -58,7 +58,7 @@ public class SetupRes_in extends ListResourceBundle { "SystemPassword", "Kata Sandi Sistem" }, { "MailServerInfo", "Server Mail" }, { "MailServer", "Server Mail" }, - { "AdminEMailInfo", "Email Adempiere Administrator" }, + { "AdminEMailInfo", "Email iDempiere Administrator" }, { "AdminEMail", "EMail Admin" }, { "DatabaseServerInfo", "Nama Database Server" }, { "DatabaseServer", "Server Database" }, @@ -66,9 +66,9 @@ public class SetupRes_in extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Port JNP untuk Server Aplikasi" }, { "JNPPort", "Port JNP" }, - { "MailUserInfo", "Pengguna Adempiere Mail" }, + { "MailUserInfo", "Pengguna iDempiere Mail" }, { "MailUser", "Pengguna Mail" }, - { "MailPasswordInfo", "Adempiere Mail User Password" }, + { "MailPasswordInfo", "iDempiere Mail User Password" }, { "MailPassword", "Kata Sandi Mail" }, { "KeyStorePassword", "Kata Sandi KeyStore" }, { "KeyStorePasswordInfo", "Kata Sandi untuk SSL Key Store" }, @@ -89,7 +89,7 @@ public class SetupRes_in extends ListResourceBundle // { "ServerError", "Error Setup Server" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Server Aplikasi" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_it.java b/org.adempiere.install/src/org/compiere/install/SetupRes_it.java index 3cf28e0887..8d2d60a8ba 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_it.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_it.java @@ -28,7 +28,7 @@ public class SetupRes_it extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Configurazione Server Adempiere" }, + { "AdempiereServerSetup", "Configurazione Server iDempiere" }, { "Ok", "Ok" }, { "File", "File" }, { "Exit", "Uscire" }, @@ -36,11 +36,11 @@ public class SetupRes_it extends ListResourceBundle { "PleaseCheck", "Controllare" }, { "UnableToConnect", "Impossibile Connettersi" }, // - { "AdempiereHomeInfo", "Adempiere Home:variabile di ambiente di Adempiere" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home:variabile di ambiente di iDempiere" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Porta Web (HTML): Se esiste Apache server utilizzare la porta 8080 o 8088" }, { "WebPort", "Porta Web" }, - { "AppsServerInfo", "Application Server: Nome dell'Host sul quale si installa Adempiere" }, + { "AppsServerInfo", "Application Server: Nome dell'Host sul quale si installa iDempiere" }, { "AppsServer", "Application Server" }, { "DatabaseTypeInfo", "Tipo DataBase" }, { "DatabaseType", "Tipo DataBase" }, @@ -48,9 +48,9 @@ public class SetupRes_it extends ListResourceBundle { "DatabaseName", "Nome DataBase" }, { "DatabasePortInfo", "Porta DataBase: Oracle standard 1521 " }, { "DatabasePort", "Porta DataBase" }, - { "DatabaseUserInfo", "Utente del DataBase: Nome di creazione dello schema Adempiere" }, + { "DatabaseUserInfo", "Utente del DataBase: Nome di creazione dello schema iDempiere" }, { "DatabaseUser", "Utente del DataBase" }, - { "DatabasePasswordInfo", "Password del Database: dello schema Adempiere" }, + { "DatabasePasswordInfo", "Password del Database: dello schema iDempiere" }, { "DatabasePassword", "Password del Database" }, { "TNSNameInfo", "SID DataBase: o nome del servizio di ricerca dello schema dati" }, { "TNSName", "SID DataBase" }, @@ -58,7 +58,7 @@ public class SetupRes_it extends ListResourceBundle { "SystemPassword", "System Password" }, { "MailServerInfo", "Server della posta: host del server di posta dove è l'SMTP" }, { "MailServer", "Server della posta" }, - { "AdminEMailInfo", "Email Amministratore Adempiere" }, + { "AdminEMailInfo", "Email Amministratore iDempiere" }, { "AdminEMail", "Email Amministratore" }, { "DatabaseServerInfo", "Server DataBase:host della macchina dove si trova la basedati" }, { "DatabaseServer", "Server DataBase" }, @@ -89,10 +89,10 @@ public class SetupRes_it extends ListResourceBundle // { "ServerError", "Errore Configurazione Server" }, { "ErrorJavaHome", "Errore Java Home" }, - { "ErrorAdempiereHome", "Errore Adempiere Home" }, + { "ErrorAdempiereHome", "Errore iDempiere Home" }, { "ErrorAppsServer", "Errore Servidor Aplicaci\u00f3n" }, - { "ErrorWebPort", "Errore Porta Web: potrebbe essere occupata dall'apache server o dal server Adempiere utilizzare 8080" }, - { "ErrorJNPPort", "Errore Porta JNP potrebbe essere occupata da un'altra istanza del server adempiere" }, + { "ErrorWebPort", "Errore Porta Web: potrebbe essere occupata dall'apache server o dal server iDempiere utilizzare 8080" }, + { "ErrorJNPPort", "Errore Porta JNP potrebbe essere occupata da un'altra istanza del server iDempiere" }, { "ErrorDatabaseServer", "Errore Server DataBase" }, { "ErrorDatabasePort", "Errore Porta DataBase" }, { "ErrorJDBC", "Errore connessione JDBC" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_my.java b/org.adempiere.install/src/org/compiere/install/SetupRes_my.java index a8853fec94..a7603e86cd 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_my.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_my.java @@ -34,13 +34,13 @@ public class SetupRes_my extends ListResourceBundle { "Exit", "Keluar" }, { "Help", "Bantuan" }, { "PleaseCheck", "Sila Periksa" }, - { "UnableToConnect", "Tidak mendapat bantuan dari laman projek ADempiere" }, + { "UnableToConnect", "Tidak mendapat bantuan dari laman projek iDempiere" }, - { "AdempiereHomeInfo", "Adempiere Home adalah folder utama" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home adalah folder utama" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Web (HTML) Port" }, { "WebPort", "Web Port" }, - { "AppsServerInfo", "Nama Pelayan ADempiere" }, + { "AppsServerInfo", "Nama Pelayan iDempiere" }, { "AppsServer", "Pelayan Aplikasi" }, { "DatabaseTypeInfo", "Jenis Database" }, { "DatabaseType", "Jenis Database" }, @@ -48,7 +48,7 @@ public class SetupRes_my extends ListResourceBundle { "DatabaseName", "Nama Database (SID)" }, { "DatabasePortInfo", "Database Listener Port" }, { "DatabasePort", "Database Port" }, - { "DatabaseUserInfo", "Database Adempiere ID Pengguna Database Adempiere" }, + { "DatabaseUserInfo", "Database iDempiere ID Pengguna Database iDempiere" }, { "DatabaseUser", "Pengguna Database" }, { "DatabasePasswordInfo", "Kata-Laluan Pengguna" }, { "DatabasePassword", "Kata-Laluan Jenis Database" }, @@ -58,7 +58,7 @@ public class SetupRes_my extends ListResourceBundle { "SystemPassword", "Kata-Laluan Pengguna Sistem" }, { "MailServerInfo", "Pelayan Mel" }, { "MailServer", "Pelayan Mel" }, - { "AdminEMailInfo", "Emel Pentadbiran ADempiere" }, + { "AdminEMailInfo", "Emel Pentadbiran iDempiere" }, { "AdminEMail", "Emel Pentadbiran" }, { "DatabaseServerInfo", "Nama Pelayan Database" }, { "DatabaseServer", "Pelayan Database" }, @@ -66,9 +66,9 @@ public class SetupRes_my extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "Application Server JNP Port" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "Pengguna Emel Adempiere" }, + { "MailUserInfo", "Pengguna Emel iDempiere" }, { "MailUser", "Pengguna Emel" }, - { "MailPasswordInfo", "Kata-Laluan Pengguna Emel ADempiere" }, + { "MailPasswordInfo", "Kata-Laluan Pengguna Emel iDempiere" }, { "MailPassword", "Kata-Laluan Emel " }, { "KeyStorePassword", "Kata-laluan Stor Kunci" }, { "KeyStorePasswordInfo", "Kata-laluan Stor Kunci SSL" }, @@ -89,7 +89,7 @@ public class SetupRes_my extends ListResourceBundle { "ServerError", "Server Setup Error" }, { "ErrorJavaHome", "Error Java Home" }, - { "ErrorAdempiereHome", "Error Adempiere Home" }, + { "ErrorAdempiereHome", "Error iDempiere Home" }, { "ErrorAppsServer", "Error Apps Server" }, { "ErrorWebPort", "Error Web Port" }, { "ErrorJNPPort", "Error JNP Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_no.java b/org.adempiere.install/src/org/compiere/install/SetupRes_no.java index 6128e67be1..62ea7df305 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_no.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_no.java @@ -28,16 +28,16 @@ public class SetupRes_no extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Adempiere Server Oppsett" }, + { "AdempiereServerSetup", "iDempiere Server Oppsett" }, { "Ok", "Ok" }, { "File", "Fil" }, { "Exit", "Avslutt" }, { "Help", "Hjelp" }, { "PleaseCheck", "Vennligst Sjekk" }, - { "UnableToConnect", "Umulig � hente hjelp fra Adempiere Web Side" }, + { "UnableToConnect", "Umulig � hente hjelp fra iDempiere Web Side" }, - { "AdempiereHomeInfo", "Adempiere Hjem er i hoved Mappen" }, - { "AdempiereHome", "Adempiere Hjem" }, + { "AdempiereHomeInfo", "iDempiere Hjem er i hoved Mappen" }, + { "AdempiereHome", "iDempiere Hjem" }, { "WebPortInfo", "Web (HTML) Port" }, { "WebPort", "Web Port" }, { "AppsServerInfo", "Applikasion Server Navn" }, @@ -48,9 +48,9 @@ public class SetupRes_no extends ListResourceBundle { "DatabaseName", "Database Navn (SID)" }, { "DatabasePortInfo", "Database Listener Port" }, { "DatabasePort", "Database Port" }, - { "DatabaseUserInfo", "Database Adempiere Bruker ID" }, + { "DatabaseUserInfo", "Database iDempiere Bruker ID" }, { "DatabaseUser", "Database Bruker" }, - { "DatabasePasswordInfo", "Database Adempiere Bruker Passord" }, + { "DatabasePasswordInfo", "Database iDempiere Bruker Passord" }, { "DatabasePassword", "Database Passord" }, { "TNSNameInfo", "TNS eller Global Database Navn" }, { "TNSName", "TNS Navn" }, @@ -58,7 +58,7 @@ public class SetupRes_no extends ListResourceBundle { "SystemPassword", "System Passord" }, { "MailServerInfo", "Epost Server" }, { "MailServer", "Epost Server" }, - { "AdminEMailInfo", "Adempiere Administrator EPost" }, + { "AdminEMailInfo", "iDempiere Administrator EPost" }, { "AdminEMail", "Admin EPost" }, { "DatabaseServerInfo", "Database Server Navn" }, { "DatabaseServer", "Database Server" }, @@ -66,9 +66,9 @@ public class SetupRes_no extends ListResourceBundle { "JavaHome", "Java Hjem" }, { "JNPPortInfo", "Aplikasions Server JNP Port" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "Adempiere EPost User" }, + { "MailUserInfo", "iDempiere EPost User" }, { "MailUser", "EPost User" }, - { "MailPasswordInfo", "Adempiere EPost Bruker Passord" }, + { "MailPasswordInfo", "iDempiere EPost Bruker Passord" }, { "MailPassword", "EPost Passord" }, { "KeyStorePassword", "Key Store Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, @@ -89,7 +89,7 @@ public class SetupRes_no extends ListResourceBundle { "ServerError", "Server Oppsett Feil" }, { "ErrorJavaHome", "Feil Java Hjem" }, - { "ErrorAdempiereHome", "Feil Adempiere Hjem" }, + { "ErrorAdempiereHome", "Feil iDempiere Hjem" }, { "ErrorAppsServer", "Feil App. Server" }, { "ErrorWebPort", "Feil Web Port" }, { "ErrorJNPPort", "Feil JNP Port" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java b/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java index 35275ed405..df203bb3a8 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java @@ -28,16 +28,16 @@ public class SetupRes_pl extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Konfiguracja serwera Adempiere" }, + { "AdempiereServerSetup", "Konfiguracja serwera iDempiere" }, { "Ok", "Ok" }, { "File", "Plik" }, { "Exit", "Wyj\u015bcie" }, { "Help", "Pomoc" }, { "PleaseCheck", "Prosz\u0119 sprawdzi\u0107" }, - { "UnableToConnect", "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 ze stron\u0105 Adempiere w celu uzyskania pomocy" }, + { "UnableToConnect", "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 ze stron\u0105 iDempiere w celu uzyskania pomocy" }, - { "AdempiereHomeInfo", "Folder Adempiere jest folderem g\u0142\u00f3wnym" }, - { "AdempiereHome", "Folder Adempiere" }, + { "AdempiereHomeInfo", "Folder iDempiere jest folderem g\u0142\u00f3wnym" }, + { "AdempiereHome", "Folder iDempiere" }, { "WebPortInfo", "Web (HTML) Port" }, { "WebPort", "Web Port" }, { "AppsServerInfo", "Nazwa serwera aplikacji" }, @@ -48,9 +48,9 @@ public class SetupRes_pl extends ListResourceBundle { "DatabaseName", "Nazwa bazy danych (SID)" }, { "DatabasePortInfo", "Port listenera bazy danych" }, { "DatabasePort", "Port bazy danych" }, - { "DatabaseUserInfo", "U\u017cytkownik Adempiere w bazie danych" }, + { "DatabaseUserInfo", "U\u017cytkownik iDempiere w bazie danych" }, { "DatabaseUser", "U\u017cytkownik bazy" }, - { "DatabasePasswordInfo", "Has\u0142o u\u017cytkownika Adempiere" }, + { "DatabasePasswordInfo", "Has\u0142o u\u017cytkownika iDempiere" }, { "DatabasePassword", "Has\u0142o u\u017cytkownika" }, { "TNSNameInfo", "TNS lub Globalna Nazwa Bazy (dla Oracle)" }, { "TNSName", "Nazwa TNS" }, @@ -58,7 +58,7 @@ public class SetupRes_pl extends ListResourceBundle { "SystemPassword", "Has\u0142o System" }, { "MailServerInfo", "Serwer pocztowy" }, { "MailServer", "Serwer pocztowy" }, - { "AdminEMailInfo", "Adres email administartora Adempiere" }, + { "AdminEMailInfo", "Adres email administartora iDempiere" }, { "AdminEMail", "EMail administ." }, { "DatabaseServerInfo", "Nazwa serwera bazy danych" }, { "DatabaseServer", "Serwer bazy danych" }, @@ -66,9 +66,9 @@ public class SetupRes_pl extends ListResourceBundle { "JavaHome", "Folder Javy" }, { "JNPPortInfo", "Application Server JNP Port" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "U\u017cytkownik poczty dla cel\u00f3w administracyjnych Adempiere" }, + { "MailUserInfo", "U\u017cytkownik poczty dla cel\u00f3w administracyjnych iDempiere" }, { "MailUser", "U\u017cytkownik poczty" }, - { "MailPasswordInfo", "Has\u0142o dla konta pocztowego Adempiere" }, + { "MailPasswordInfo", "Has\u0142o dla konta pocztowego iDempiere" }, { "MailPassword", "Has\u0142o poczty" }, { "KeyStorePassword", "Key Store Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, @@ -89,7 +89,7 @@ public class SetupRes_pl extends ListResourceBundle { "ServerError", "B\u0142\u0119dne ustawienia" }, { "ErrorJavaHome", "Niepoprawny folder Javy" }, - { "ErrorAdempiereHome", "Nie stwierdzono zainstalowanego systemu Adempiere w miescu wskazanym jako Folder Adempiere" }, + { "ErrorAdempiereHome", "Nie stwierdzono zainstalowanego systemu iDempiere w miescu wskazanym jako Folder iDempiere" }, { "ErrorAppsServer", "Niepoprawny serwer aplikacji" }, { "ErrorWebPort", "Niepoprawny port WWW (by\u0107 mo\u017ce inna aplikacja u\u017cywa ju\u017c tego portu)" }, { "ErrorJNPPort", "Niepoprawny port JNP (by\u0107 mo\u017ce inna aplikacja u\u017cywa ju\u017c tego portu)" }, @@ -103,7 +103,7 @@ public class SetupRes_pl extends ListResourceBundle { "EnvironmentSaved", "Ustawienia zapisany\nMusisz ponownie uruchomi\u0107 serwer." }, { "RMIoverHTTP", "Tunelowanie RMI over HTTP" }, - { "RMIoverHTTPInfo", "Tunelowanie RMI over HTTP pozwala u\u017cywa\u0107 Adempiere przez firewall" } + { "RMIoverHTTPInfo", "Tunelowanie RMI over HTTP pozwala u\u017cywa\u0107 iDempiere przez firewall" } }; /** diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java index da68aa54f8..11c6d45dbd 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java @@ -28,16 +28,16 @@ public class SetupRes_ro extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Configurarea serverului Adempiere" }, + { "AdempiereServerSetup", "Configurarea serverului iDempiere" }, { "Ok", "OK" }, { "File", "Aplica\u0163ie" }, { "Exit", "Ie\u015fire" }, { "Help", "Ajutor" }, { "PleaseCheck", "Consulta\u0163i" }, - { "UnableToConnect", "Nu s-a putut ob\u0163ine ajutor de pe site-ul web al Adempiere" }, + { "UnableToConnect", "Nu s-a putut ob\u0163ine ajutor de pe site-ul web al iDempiere" }, // - { "AdempiereHomeInfo", "Loca\u0163ia Adempiere reprezint\u0103 directorul s\u0103u de instalare" }, - { "AdempiereHome", "Loca\u0163ie Adempiere" }, + { "AdempiereHomeInfo", "Loca\u0163ia iDempiere reprezint\u0103 directorul s\u0103u de instalare" }, + { "AdempiereHome", "Loca\u0163ie iDempiere" }, { "WebPortInfo", "Portul de web (HTML)" }, { "WebPort", "Port de web" }, { "AppsServerInfo", "Numele serverului de aplica\u0163ie" }, @@ -48,9 +48,9 @@ public class SetupRes_ro extends ListResourceBundle { "DatabaseName", "Nume de baz\u0103 de date" }, { "DatabasePortInfo", "Portul rezevat serviciului bazei de date" }, { "DatabasePort", "Port de baz\u0103 de date" }, - { "DatabaseUserInfo", "Utilizatorul Adempiere pentru baza de date" }, + { "DatabaseUserInfo", "Utilizatorul iDempiere pentru baza de date" }, { "DatabaseUser", "Utilizator de baz\u0103 de date" }, - { "DatabasePasswordInfo", "Parola utilizatorului Adempiere pentru baza de date" }, + { "DatabasePasswordInfo", "Parola utilizatorului iDempiere pentru baza de date" }, { "DatabasePassword", "Parola pentru baza de date" }, { "TNSNameInfo", "Baze de date g\u0103site" }, { "TNSName", "C\u0103utare de baze de date" }, @@ -58,7 +58,7 @@ public class SetupRes_ro extends ListResourceBundle { "SystemPassword", "Parol\u0103 pentru System" }, { "MailServerInfo", "Server de po\u015ft\u0103 electronic\u0103" }, { "MailServer", "Server de po\u015ft\u0103 electronic\u0103" }, - { "AdminEMailInfo", "Adresa de po\u015ft\u0103 electronic\u0103 a administratorului Adempiere" }, + { "AdminEMailInfo", "Adresa de po\u015ft\u0103 electronic\u0103 a administratorului iDempiere" }, { "AdminEMail", "Adres\u0103 de e-mail a administratorului" }, { "DatabaseServerInfo", "Numele serverului de baz\u0103 de date" }, { "DatabaseServer", "Server de baz\u0103 de date" }, @@ -66,9 +66,9 @@ public class SetupRes_ro extends ListResourceBundle { "JavaHome", "Loca\u0163ie Java" }, { "JNPPortInfo", "Portul JNP al serverului de aplica\u0163ie" }, { "JNPPort", "Port JNP" }, - { "MailUserInfo", "Utilizatorul Adempiere pentru po\u015fta electronic\u0103" }, + { "MailUserInfo", "Utilizatorul iDempiere pentru po\u015fta electronic\u0103" }, { "MailUser", "Utilizator de po\u015ft\u0103 electronic\u0103" }, - { "MailPasswordInfo", "Parola utilizatorului Adempiere pentru po\u015fta electronic\u0103" }, + { "MailPasswordInfo", "Parola utilizatorului iDempiere pentru po\u015fta electronic\u0103" }, { "MailPassword", "Parol\u0103 de po\u015ft\u0103 electronic\u0103" }, { "KeyStorePassword", "Parol\u0103 de keystore" }, { "KeyStorePasswordInfo", "Parola de pentru arhiva de chei SSL" }, @@ -89,7 +89,7 @@ public class SetupRes_ro extends ListResourceBundle // { "ServerError", "Eroare de configurare a serverului" }, { "ErrorJavaHome", "Eroare de loca\u0163ie Java" }, - { "ErrorAdempiereHome", "Eroare de loca\u0163ie Adempiere" }, + { "ErrorAdempiereHome", "Eroare de loca\u0163ie iDempiere" }, { "ErrorAppsServer", "Eroare de server de aplica\u0163ie" }, { "ErrorWebPort", "Eroare de port de web" }, { "ErrorJNPPort", "Eroare de port JNP" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java index 11d1445901..ff4cca05b2 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java @@ -36,15 +36,15 @@ public class SetupRes_ru extends ListResourceBundle } static final Object contents[][] = { - { "AdempiereServerSetup", "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 Adempiere"}, + { "AdempiereServerSetup", "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 iDempiere"}, { "Ok", "Ok"}, { "File", "\u0424\u0430\u0439\u043b"}, { "Exit", "\u0412\u044b\u0445\u043e\u0434"}, { "Help", "\u041f\u043e\u043c\u043e\u0449\u044c"}, { "PleaseCheck", "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430 \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435"}, - { "UnableToConnect", "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e c \u0441\u0430\u0439\u0442\u0430 Adempiere"}, - { "AdempiereHomeInfo", "Adempiere Home - \u044d\u0442\u043e \u0433\u043b\u0430\u0432\u043d\u044b\u0439 \u043a\u0430\u0442\u0430\u043b\u043e\u0433"}, - { "AdempiereHome", "Adempiere Home"}, + { "UnableToConnect", "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e c \u0441\u0430\u0439\u0442\u0430 iDempiere"}, + { "AdempiereHomeInfo", "iDempiere Home - \u044d\u0442\u043e \u0433\u043b\u0430\u0432\u043d\u044b\u0439 \u043a\u0430\u0442\u0430\u043b\u043e\u0433"}, + { "AdempiereHome", "iDempiere Home"}, { "WebPortInfo", "\u0412\u0435\u0431 (HTML) \u043f\u043e\u0440\u0442"}, { "WebPort", "\u0412\u0435\u0431 \u043f\u043e\u0440\u0442"}, { "AppsServerInfo", "\u0418\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439"}, @@ -95,7 +95,7 @@ public class SetupRes_ru extends ListResourceBundle { "HelpInfo", "\u041f\u043e\u043c\u043e\u0449\u044c"}, { "ServerError", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430"}, { "ErrorJavaHome", "\u041e\u0448\u0438\u0431\u043a\u0430 Java Home"}, - { "ErrorAdempiereHome", "\u041e\u0448\u0438\u0431\u043a\u0430 Adempiere Home"}, + { "ErrorAdempiereHome", "\u041e\u0448\u0438\u0431\u043a\u0430 iDempiere Home"}, { "ErrorAppsServer", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439"}, { "ErrorWebPort", "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0435\u0431 \u043f\u043e\u0440\u0442\u0430"}, { "ErrorJNPPort", "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0440\u0442\u0430 JNP"}, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java index 6a31ca9259..1af34777dd 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java @@ -28,16 +28,16 @@ public class SetupRes_sl extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Namestavitve Adempiere stre\u017enika" }, + { "AdempiereServerSetup", "Namestavitve iDempiere stre\u017enika" }, { "Ok", "V redu" }, { "File", "Datoteka" }, { "Exit", "Izhod" }, { "Help", "Pomo\u010d" }, { "PleaseCheck", "Prosim preverite" }, - { "UnableToConnect", "Napaka pri povezavi na Adempiere web pomo\u010d" }, + { "UnableToConnect", "Napaka pri povezavi na iDempiere web pomo\u010d" }, // - { "AdempiereHomeInfo", "Adempiere Home je glavni imenik" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere Home je glavni imenik" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "Web (HTML) vrata" }, { "WebPort", "Web vrata" }, { "AppsServerInfo", "Ime programskega stre\u017enika" }, @@ -48,7 +48,7 @@ public class SetupRes_sl extends ListResourceBundle { "DatabaseName", "Ime baze (SID)" }, { "DatabasePortInfo", "Vrata Listener programa" }, { "DatabasePort", "Vrata baze podatkov" }, - { "DatabaseUserInfo", "Uporabni\u0161ko ime Adempiere baze podatkov" }, + { "DatabaseUserInfo", "Uporabni\u0161ko ime iDempiere baze podatkov" }, { "DatabaseUser", "Uporabnik baze podatkov" }, { "DatabasePasswordInfo", "Geslo uporabnika baze podatkov" }, { "DatabasePassword", "Geslo baze podatkov" }, @@ -58,7 +58,7 @@ public class SetupRes_sl extends ListResourceBundle { "SystemPassword", "System geslo" }, { "MailServerInfo", "Stre\u017enik elektronske po\u0161te" }, { "MailServer", "Stre\u017enik elektronske po\u0161te" }, - { "AdminEMailInfo", "Elektronski naslov Adempiere Skrbnika" }, + { "AdminEMailInfo", "Elektronski naslov iDempiere Skrbnika" }, { "AdminEMail", "Elektronski naslov Skrbnika" }, { "DatabaseServerInfo", "Ime stre\u017enika baze podatkov" }, { "DatabaseServer", "Stre\u017enik baze podatkov" }, @@ -66,9 +66,9 @@ public class SetupRes_sl extends ListResourceBundle { "JavaHome", "Java imenik" }, { "JNPPortInfo", "JNP vrata programskega stre\u017enika" }, { "JNPPort", "JNP vrata" }, - { "MailUserInfo", "Uporabnik elektronske po\u0161te za Adempiere" }, + { "MailUserInfo", "Uporabnik elektronske po\u0161te za iDempiere" }, { "MailUser", "Uporabnik elektronske po\u0161te" }, - { "MailPasswordInfo", "Geslo uporabnika elektronske po\u0161te Adempiere" }, + { "MailPasswordInfo", "Geslo uporabnika elektronske po\u0161te iDempiere" }, { "MailPassword", "Geslo uporabnika elektronske po\u0161te" }, { "KeyStorePassword", "Geslo shrambe klju\u010dev" }, { "KeyStorePasswordInfo", "Geslo za shrambo SSL klju\u010dev" }, @@ -89,7 +89,7 @@ public class SetupRes_sl extends ListResourceBundle // { "ServerError", "Napaka v nastavitvah programskega stre\u017enika" }, { "ErrorJavaHome", "Error napa\u010den doma\u010d imenik Java" }, - { "ErrorAdempiereHome", "Error napa\u010den Adempiere Home imenik" }, + { "ErrorAdempiereHome", "Error napa\u010den iDempiere Home imenik" }, { "ErrorAppsServer", "Error programski stre\u017enik" }, { "ErrorWebPort", "Error napa\u010dna Web vrata" }, { "ErrorJNPPort", "Error napa\u010dna JNP vrata" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java index 429f5ba083..c6b11a061d 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java @@ -28,16 +28,16 @@ public class SetupRes_sv extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Adempiere server installationsprogram" }, + { "AdempiereServerSetup", "iDempiere server installationsprogram" }, { "Ok", "Ok" }, { "File", "Fil" }, { "Exit", "Avsluta" }, { "Help", "Hj\u00c3\u00a4lp" }, { "PleaseCheck", "Kolla" }, - { "UnableToConnect", "Kan inte f\u00c3\u00a5 hj\u00c3\u00a4lp fr\u00c3\u00a5n Adempiere Web Site" }, + { "UnableToConnect", "Kan inte f\u00c3\u00a5 hj\u00c3\u00a4lp fr\u00c3\u00a5n iDempiere Web Site" }, - { "AdempiereHomeInfo", "Adempiere hem \u00c3\u00a4r huvudkatalog" }, - { "AdempiereHome", "Adempiere hem" }, + { "AdempiereHomeInfo", "iDempiere hem \u00c3\u00a4r huvudkatalog" }, + { "AdempiereHome", "iDempiere hem" }, { "WebPortInfo", "Web (HTML) port" }, { "WebPort", "Web port" }, { "AppsServerInfo", "Program server name" }, @@ -48,9 +48,9 @@ public class SetupRes_sv extends ListResourceBundle { "DatabaseName", "Databas namn (SID)" }, { "DatabasePortInfo", "Databas avlyssningsport" }, { "DatabasePort", "Databas port" }, - { "DatabaseUserInfo", "Databas Adempiere anv\u00c3\u00a4ndarnamn" }, + { "DatabaseUserInfo", "Databas iDempiere anv\u00c3\u00a4ndarnamn" }, { "DatabaseUser", "Databas anv\u00c3\u00a4ndarnamn" }, - { "DatabasePasswordInfo", "Databas Adempiere anv\u00c3\u00a4ndare l\u00c3\u00b6senord" }, + { "DatabasePasswordInfo", "Databas iDempiere anv\u00c3\u00a4ndare l\u00c3\u00b6senord" }, { "DatabasePassword", "Databas l\u00c3\u00b6senord" }, { "TNSNameInfo", "TNS eller global databas namn" }, { "TNSName", "TNS namn" }, @@ -58,7 +58,7 @@ public class SetupRes_sv extends ListResourceBundle { "SystemPassword", "System l\u00c3\u00b6senord" }, { "MailServerInfo", "Post server" }, { "MailServer", "Post server" }, - { "AdminEMailInfo", "Adempiere administrat\u00c3\u00b6r e-post" }, + { "AdminEMailInfo", "iDempiere administrat\u00c3\u00b6r e-post" }, { "AdminEMail", "Admin e-post" }, { "DatabaseServerInfo", "Databas server namn" }, { "DatabaseServer", "Databas server" }, @@ -66,9 +66,9 @@ public class SetupRes_sv extends ListResourceBundle { "JavaHome", "Java hem" }, { "JNPPortInfo", "Program server JNP port" }, { "JNPPort", "JNP port" }, - { "MailUserInfo", "Adempiere post anv\u00c3\u00a4ndare" }, + { "MailUserInfo", "iDempiere post anv\u00c3\u00a4ndare" }, { "MailUser", "Post anv\u00c3\u00a4ndare" }, - { "MailPasswordInfo", "Adempiere post anv\u00c3\u00a4ndare l\u00c3\u00b6senord" }, + { "MailPasswordInfo", "iDempiere post anv\u00c3\u00a4ndare l\u00c3\u00b6senord" }, { "MailPassword", "Post l\u00c3\u00b6senord" }, { "KeyStorePassword", "Key Store Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java b/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java index 5671c847da..816531a068 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java @@ -28,16 +28,16 @@ public class SetupRes_zh extends ListResourceBundle { /** Translation Info */ static final Object[][] contents = new String[][]{ - { "AdempiereServerSetup", "Adempiere \u4f3a\u670d\u5668\u8a2d\u5b9a" }, + { "AdempiereServerSetup", "iDempiere \u4f3a\u670d\u5668\u8a2d\u5b9a" }, { "Ok", "\u78ba\u5b9a" }, { "File", "\u6a94\u6848" }, { "Exit", "\u96e2\u958b" }, { "Help", "\u8aaa\u660e" }, { "PleaseCheck", "\u8acb\u6aa2\u67e5" }, - { "UnableToConnect", "\u7121\u6cd5\u81ea Adempiere \u7db2\u7ad9\u5f97\u5230\u8aaa\u660e" }, + { "UnableToConnect", "\u7121\u6cd5\u81ea iDempiere \u7db2\u7ad9\u5f97\u5230\u8aaa\u660e" }, - { "AdempiereHomeInfo", "Adempiere \u4e3b\u76ee\u9304" }, - { "AdempiereHome", "Adempiere Home" }, + { "AdempiereHomeInfo", "iDempiere \u4e3b\u76ee\u9304" }, + { "AdempiereHome", "iDempiere Home" }, { "WebPortInfo", "\u7db2\u9801\u4f3a\u670d\u5668\u9023\u63a5\u57e0" }, { "WebPort", "Web Port" }, { "AppsServerInfo", "\u61c9\u7528\u4f3a\u670d\u5668\u540d\u7a31" }, @@ -48,9 +48,9 @@ public class SetupRes_zh extends ListResourceBundle { "DatabaseName", "Database Name (SID)" }, { "DatabasePortInfo", "\u8cc7\u6599\u5eab\u9023\u63a5\u57e0" }, { "DatabasePort", "Database Port" }, - { "DatabaseUserInfo", "Adempiere \u4f7f\u7528\u8cc7\u6599\u5eab\u7684\u5e33\u865f" }, + { "DatabaseUserInfo", "iDempiere \u4f7f\u7528\u8cc7\u6599\u5eab\u7684\u5e33\u865f" }, { "DatabaseUser", "Database User" }, - { "DatabasePasswordInfo", "Adempiere \u4f7f\u7528\u8cc7\u6599\u5eab\u7684\u5bc6\u78bc" }, + { "DatabasePasswordInfo", "iDempiere \u4f7f\u7528\u8cc7\u6599\u5eab\u7684\u5bc6\u78bc" }, { "DatabasePassword", "Database Password" }, { "TNSNameInfo", "TNS or Global Database Name" }, { "TNSName", "TNS Name" }, @@ -58,7 +58,7 @@ public class SetupRes_zh extends ListResourceBundle { "SystemPassword", "System Password" }, { "MailServerInfo", "\u90f5\u4ef6\u4f3a\u670d\u5668" }, { "MailServer", "Mail Server" }, - { "AdminEMailInfo", "Adempiere \u7ba1\u7406\u8005 EMail" }, + { "AdminEMailInfo", "iDempiere \u7ba1\u7406\u8005 EMail" }, { "AdminEMail", "Admin EMail" }, { "DatabaseServerInfo", "\u8cc7\u6599\u5eab\u540d\u7a31" }, { "DatabaseServer", "Database Server" }, @@ -66,9 +66,9 @@ public class SetupRes_zh extends ListResourceBundle { "JavaHome", "Java Home" }, { "JNPPortInfo", "\u61c9\u7528\u4f3a\u670d\u5668\u7684 JNP \u9023\u63a5\u57e0" }, { "JNPPort", "JNP Port" }, - { "MailUserInfo", "Adempiere Mail \u5e33\u865f" }, + { "MailUserInfo", "iDempiere Mail \u5e33\u865f" }, { "MailUser", "Mail User" }, - { "MailPasswordInfo", "Adempiere Mail \u5e33\u865f\u7684\u5bc6\u78bc" }, + { "MailPasswordInfo", "iDempiere Mail \u5e33\u865f\u7684\u5bc6\u78bc" }, { "MailPassword", "Mail Password" }, { "KeyStorePassword", "Key Store Password" }, { "KeyStorePasswordInfo", "Password for SSL Key Store" }, @@ -89,7 +89,7 @@ public class SetupRes_zh extends ListResourceBundle { "ServerError", "\u4f3a\u670d\u5668\u8a2d\u5b9a\u932f\u8aa4" }, { "ErrorJavaHome", "Java \u4e3b\u76ee\u9304\u932f\u8aa4" }, - { "ErrorAdempiereHome", "Adempiere \u4e3b\u76ee\u9304\u932f\u8aa4" }, + { "ErrorAdempiereHome", "iDempiere \u4e3b\u76ee\u9304\u932f\u8aa4" }, { "ErrorAppsServer", "\u61c9\u7528\u4f3a\u670d\u5668\u932f\u8aa4" }, { "ErrorWebPort", "\u7db2\u9801\u4f3a\u670d\u5668\u9023\u63a5\u57e0\u932f\u8aa4" }, { "ErrorJNPPort", "JNP \u9023\u63a5\u57e0\u932f\u8aa4" }, diff --git a/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java b/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java index a80d473888..5b11b42acf 100644 --- a/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java +++ b/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java @@ -29,16 +29,16 @@ public class SetupRes_zh_CN extends ListResourceBundle /** Translation Info */ static final Object[][] contents = new String[][] { - { "AdempiereServerSetup", "Adempiere \u670d\u52a1\u5668\u8bbe\u7f6e"}, + { "AdempiereServerSetup", "iDempiere \u670d\u52a1\u5668\u8bbe\u7f6e"}, { "Ok", "\u786e\u5b9a"}, { "File", "\u6587\u4ef6"}, { "Exit", "\u9000\u51fa"}, { "Help", "\u5e2e\u52a9"}, { "PleaseCheck", "\u8bf7\u68c0\u67e5"}, { "UnableToConnect", - "\u65e0\u6cd5\u4ece Adempiere \u7f51\u7ad9\u83b7\u5f97\u5e2e\u52a9\u4fe1\u606f"}, - { "AdempiereHomeInfo", "Adempiere \u4e3b\u76ee\u5f55"}, - { "AdempiereHome", "Adempiere \u4e3b\u76ee\u5f55"}, + "\u65e0\u6cd5\u4ece iDempiere \u7f51\u7ad9\u83b7\u5f97\u5e2e\u52a9\u4fe1\u606f"}, + { "AdempiereHomeInfo", "iDempiere \u4e3b\u76ee\u5f55"}, + { "AdempiereHome", "iDempiere \u4e3b\u76ee\u5f55"}, { "WebPortInfo", "Web (HTML) \u8fde\u63a5\u7aef\u53e3"}, { "WebPort", "Web \u7aef\u53e3"}, { "AppsServerInfo", "\u5e94\u7528\u670d\u52a1\u5668\u540d\u79f0"}, @@ -50,10 +50,10 @@ public class SetupRes_zh_CN extends ListResourceBundle { "DatabasePortInfo", "\u6570\u636e\u5e93\u8fde\u63a5\u7aef\u53e3"}, { "DatabasePort", "\u6570\u636e\u5e93\u7aef\u53e3"}, { "DatabaseUserInfo", - "Adempiere \u6570\u636e\u5e93\u7528\u6237\u5e10\u53f7"}, + "iDempiere \u6570\u636e\u5e93\u7528\u6237\u5e10\u53f7"}, { "DatabaseUser", "\u6570\u636e\u5e93\u5e10\u53f7"}, { "DatabasePasswordInfo", - "Adempiere \u6570\u636e\u5e93\u7528\u6237\u5e10\u53f7\u7684\u53e3\u4ee4"}, + "iDempiere \u6570\u636e\u5e93\u7528\u6237\u5e10\u53f7\u7684\u53e3\u4ee4"}, { "DatabasePassword", "\u6570\u636e\u5e93\u53e3\u4ee4"}, { "TNSNameInfo", "TNS \u6216 \u5168\u5c40\u6570\u636e\u5e93\u540d(Global Database Name)"}, @@ -62,7 +62,7 @@ public class SetupRes_zh_CN extends ListResourceBundle { "SystemPassword", "\u7cfb\u7edf\u7528\u6237\u53e3\u4ee4"}, { "MailServerInfo", "\u7535\u5b50\u90ae\u4ef6\u670d\u52a1\u5668"}, { "MailServer", "\u7535\u5b50\u90ae\u4ef6\u670d\u52a1\u5668"}, - { "AdminEMailInfo", "Adempiere \u7ba1\u7406\u5458 EMail"}, + { "AdminEMailInfo", "iDempiere \u7ba1\u7406\u5458 EMail"}, { "AdminEMail", "\u7ba1\u7406\u5458\u7684\u7535\u5b50\u90ae\u4ef6"}, { "DatabaseServerInfo", "\u6570\u636e\u5e93\u670d\u52a1\u5668\u540d\u79f0"}, @@ -72,10 +72,10 @@ public class SetupRes_zh_CN extends ListResourceBundle { "JNPPortInfo", "\u5e94\u7528\u670d\u52a1\u5668\u7684 JNP \u8fde\u63a5\u7aef\u53e3"}, { "JNPPort", "JNP \u7aef\u53e3"}, - { "MailUserInfo", "Adempiere \u7535\u5b50\u90ae\u4ef6\u5e10\u53f7"}, + { "MailUserInfo", "iDempiere \u7535\u5b50\u90ae\u4ef6\u5e10\u53f7"}, { "MailUser", "\u7535\u5b50\u90ae\u4ef6\u5e10\u53f7"}, { "MailPasswordInfo", - "Adempiere \u7535\u5b50\u90ae\u4ef6\u8d26\u53f7\u7684\u53e3\u4ee4"}, + "iDempiere \u7535\u5b50\u90ae\u4ef6\u8d26\u53f7\u7684\u53e3\u4ee4"}, { "MailPassword", "\u7535\u5b50\u90ae\u4ef6\u53e3\u4ee4"}, { "KeyStorePassword", "Key Store Password"}, { "KeyStorePasswordInfo", "Password for SSL Key Store"}, @@ -96,7 +96,7 @@ public class SetupRes_zh_CN extends ListResourceBundle { "ServerError", "\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorJavaHome", "Java \u4e3b\u76ee\u5f55\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorAdempiereHome", - "Adempiere \u4e3b\u76ee\u5f55\u8bbe\u7f6e\u9519\u8bef"}, + "iDempiere \u4e3b\u76ee\u5f55\u8bbe\u7f6e\u9519\u8bef"}, { "ErrorAppsServer", "\u5e94\u7528\u670d\u52a1\u5668\u8bbe\u7f6e\u9519\u8bef"}, diff --git a/org.adempiere.install/src/org/compiere/install/SilentSetup.java b/org.adempiere.install/src/org/compiere/install/SilentSetup.java index 12f42645ea..5698ddb969 100644 --- a/org.adempiere.install/src/org/compiere/install/SilentSetup.java +++ b/org.adempiere.install/src/org/compiere/install/SilentSetup.java @@ -14,17 +14,17 @@ public class SilentSetup { public SilentSetup() { - //Load C:\Adempiere\AdempiereEnv.properties - String adempiereHome = System.getProperty(ConfigurationData.ADEMPIERE_HOME); + //Load C:\idempiere\idempiereEnv.properties + String adempiereHome = System.getProperty(ConfigurationData.IDEMPIERE_HOME); if (adempiereHome == null || adempiereHome.length() == 0) adempiereHome = System.getProperty("user.dir"); // boolean envLoaded = false; - String fileName = adempiereHome + File.separator + ConfigurationData.ADEMPIERE_ENV_FILE; + String fileName = adempiereHome + File.separator + ConfigurationData.IDEMPIERE_ENV_FILE; File env = new File(fileName); if (!env.exists()) { - System.err.println("Usage: Please edit AdempiereEnvTemplate.properties and save as AdempiereEnv.properties"); + System.err.println("Usage: Please edit idempiereEnvTemplate.properties and save as idempiereEnv.properties"); return; } diff --git a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java index 74f0bd0d77..55a47c5488 100644 --- a/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java +++ b/org.adempiere.install/src/org/compiere/install/console/ConfigurationConsole.java @@ -386,7 +386,7 @@ public class ConfigurationConsole { String error = data.testAdempiere(); if (error != null && error.trim().length() > 0) { - writer.println("Adempiere home and keystore validation error: " + error); + writer.println("iDempiere home and keystore validation error: " + error); adempiereHome(reader, writer); continue; } @@ -395,7 +395,7 @@ public class ConfigurationConsole { } private void adempiereHome(BufferedReader reader, PrintWriter writer) throws IOException { - writer.println("Adempiere Home ["+data.getAdempiereHome()+"]:"); + writer.println("iDempiere Home ["+data.getAdempiereHome()+"]:"); String input = reader.readLine(); if (input != null && input.trim().length() > 0) { diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java index d9a69298e6..94be371932 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java @@ -49,8 +49,6 @@ import org.xml.sax.helpers.DefaultHandler; */ public class PackInHandler extends DefaultHandler { - public static final String PACK_IN_PROCESS_CTX_KEY = "PackInProcess"; - /** * PackInHandler Handler */ @@ -108,10 +106,10 @@ public class PackInHandler extends DefaultHandler { init(); } - // adempiereAD. - if (qName.equals("adempiereAD")) + // idempiere + if (qName.equals("idempiere")) { - log.info("adempiereAD updateMode="+m_updateDictionary); + log.info("idempiere updateMode="+m_updateDictionary); //check client String clientAttribute = atts.getValue("Client"); @@ -275,7 +273,7 @@ public class PackInHandler extends DefaultHandler { else elementValue = uri + localName; - if (elementValue.equals("adempiereAD")){ + if (elementValue.equals("idempiere")){ processDeferElements(); if (!packageStatus.equals("Completed with errors")) packageStatus = "Completed successfully"; diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java index 3f933556a1..5e64e2f8e4 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java @@ -145,9 +145,9 @@ public class PackOut processedCount++; } - packoutHandler.endElement("","","adempiereAD"); + packoutHandler.endElement("","","idempiere"); packoutHandler.endDocument(); - docHandler.endElement("","","adempiereDocument"); + docHandler.endElement("","","idempiereDocument"); docHandler.endDocument(); } catch (Exception e) @@ -208,7 +208,7 @@ public class PackOut AttributesImpl atts = new AttributesImpl(); atts.addAttribute("","","Name","CDATA",packoutDocument.getPackageName()); atts.addAttribute("","","Version","CDATA",packoutDocument.getPackageVersion()); - atts.addAttribute("","","AdempiereVersion","CDATA",emptyIfNull(packoutDocument.getAdempiereVersion())); + atts.addAttribute("","","idempiereVersion","CDATA",emptyIfNull(packoutDocument.getAdempiereVersion())); atts.addAttribute("","","DataBaseVersion","CDATA",emptyIfNull(packoutDocument.getDatabaseVersion())); atts.addAttribute("","","Description","CDATA",emptyIfNull(packoutDocument.getDescription())); atts.addAttribute("","","Author","CDATA",emptyIfNull(packoutDocument.getAuthor())); @@ -226,7 +226,7 @@ public class PackOut .append(client.getName()); atts.addAttribute("", "", "Client", "CDATA", sb.toString()); - packoutHandler.startElement("","","adempiereAD",atts); + packoutHandler.startElement("","","idempiere",atts); return packoutHandler; } @@ -251,9 +251,9 @@ public class PackOut } catch (Exception e) {} docHandler.setResult(docStreamResult); docHandler.startDocument(); - docHandler.processingInstruction("xml-stylesheet","type=\"text/css\" href=\"adempiereDocument.css\""); + docHandler.processingInstruction("xml-stylesheet","type=\"text/css\" href=\"idempiereDocument.css\""); AttributesImpl atts = new AttributesImpl(); - docHandler.startElement("","","adempiereDocument",atts); + docHandler.startElement("","","idempiereDocument",atts); addTextElement(docHandler, "header", packoutDocument.getPackageName()+" Package Description", atts); addTextElement(docHandler, "H1", "Package Name:", atts); addTextElement(docHandler, "packagename", packoutDocument.getPackageName(), atts); diff --git a/org.adempiere.server-feature/buckminster.cspec b/org.adempiere.server-feature/buckminster.cspec deleted file mode 100644 index 361c7d57c9..0000000000 --- a/org.adempiere.server-feature/buckminster.cspec +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.adempiere.server-feature/buckminster.cspex b/org.adempiere.server-feature/buckminster.cspex index f0e56c15ab..613855dff9 100644 --- a/org.adempiere.server-feature/buckminster.cspex +++ b/org.adempiere.server-feature/buckminster.cspex @@ -23,10 +23,10 @@ - + - + diff --git a/org.adempiere.server-feature/build.properties b/org.adempiere.server-feature/build.properties index ecb97e285c..bd284e9603 100644 --- a/org.adempiere.server-feature/build.properties +++ b/org.adempiere.server-feature/build.properties @@ -3,24 +3,24 @@ root=file:build.xml,file:setup.ini,file:extensions-priorty.properties root.folder.data=data root.folder.setup=setup #linux 64 bits -root.linux.gtk.x86_64=file:setup.sh,file:console-setup.sh,file:adempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh +root.linux.gtk.x86_64=file:setup.sh,file:console-setup.sh,file:idempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh root.linux.gtk.x86_64.folder.utils=utils.unix root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh #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=file:setup.sh,file:console-setup.sh,file:idempiere-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=file:setup.sh,file:console-setup.sh,file:idempiere-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 #mac 64 -root.macosx.cocoa.x86_64=file:setup.sh,file:console-setup.sh,file:adempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh +root.macosx.cocoa.x86_64=file:setup.sh,file:console-setup.sh,file:idempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh root.macosx.cocoa.x86_64.folder.utils=utils.unix root.macosx.cocoa.x86_64.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=file:setup.bat,file:console-setup.bat,file:idempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat root.win32.win32.x86.folder.utils=utils.unix #windows 64 -root.win32.win32.x86_64=file:setup.bat,file:console-setup.bat,file:adempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat +root.win32.win32.x86_64=file:setup.bat,file:console-setup.bat,file:idempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat root.win32.win32.x86_64.folder.utils=utils.unix diff --git a/org.adempiere.server-feature/build.xml b/org.adempiere.server-feature/build.xml index 80bb7c289c..e459180b4a 100644 --- a/org.adempiere.server-feature/build.xml +++ b/org.adempiere.server-feature/build.xml @@ -6,11 +6,11 @@ - This buildfile is used to setup the Adempiere Environment. + This buildfile is used to setup the idempiere Environment. - + @@ -18,8 +18,8 @@ - - + + diff --git a/org.adempiere.server-feature/console-setup-alt.bat b/org.adempiere.server-feature/console-setup-alt.bat index 84b457cc2e..1b15a403d3 100644 --- a/org.adempiere.server-feature/console-setup-alt.bat +++ b/org.adempiere.server-feature/console-setup-alt.bat @@ -1,4 +1,4 @@ -@Title Install Adempiere Server +@Title Install idempiere Server @Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $ @Echo off @@ -17,7 +17,7 @@ goto START :START -@REM Setup Adempiere.properties and AdempiereEnv.properties +@REM Setup idempiere.properties and idempiereEnv.properties @"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -clean -noRegistryCache -application org.adempiere.install.console-application @Echo ErrorLevel = %ERRORLEVEL% diff --git a/org.adempiere.server-feature/console-setup-alt.sh b/org.adempiere.server-feature/console-setup-alt.sh index 549adeb280..792a50e9cc 100644 --- a/org.adempiere.server-feature/console-setup-alt.sh +++ b/org.adempiere.server-feature/console-setup-alt.sh @@ -1,6 +1,6 @@ #!/bin/sh # -echo Setup Adempiere Server +echo Setup idempiere Server # $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $ if [ $JAVA_HOME ]; then @@ -15,7 +15,7 @@ else fi -# Setup Adempiere.properties and AdempiereEnv.properties +# Setup idempiere.properties and idempiereEnv.properties $JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.adempiere.install.console-application # Setup Tomcat diff --git a/org.adempiere.server-feature/console-setup.bat b/org.adempiere.server-feature/console-setup.bat index fe98b597fd..5a1b0b4584 100644 --- a/org.adempiere.server-feature/console-setup.bat +++ b/org.adempiere.server-feature/console-setup.bat @@ -1,9 +1,9 @@ -@Title Install Adempiere Server +@Title Install idempiere Server @Echo off -@REM Setup Adempiere.properties and AdempiereEnv.properties -adempiere --launcher.ini setup.ini -application org.adempiere.install.console-application +@REM Setup idempiere.properties and idempiereEnv.properties +idempiere --launcher.ini setup.ini -application org.adempiere.install.console-application @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -15,7 +15,7 @@ adempiere --launcher.ini setup.ini -application org.adempiere.install.console-ap :NEXT @REM Setup Tomcat -adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml +idempiere --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 7258deedbf..d48795ed44 100644 --- a/org.adempiere.server-feature/console-setup.sh +++ b/org.adempiere.server-feature/console-setup.sh @@ -1,12 +1,12 @@ #!/bin/sh # -echo Setup Adempiere Server +echo Setup idempiere Server -# Setup Adempiere.properties and AdempiereEnv.properties -./adempiere --launcher.ini setup.ini -application org.adempiere.install.console-application +# Setup idempiere.properties and idempiereEnv.properties +./idempiere --launcher.ini setup.ini -application org.adempiere.install.console-application # Setup Tomcat -./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml +./idempiere --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/feature.xml b/org.adempiere.server-feature/feature.xml index ef21f72fd4..43031f6c12 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -1,7 +1,7 @@ diff --git a/org.adempiere.server-feature/adempiere-server.bat b/org.adempiere.server-feature/idempiere-server.bat similarity index 91% rename from org.adempiere.server-feature/adempiere-server.bat rename to org.adempiere.server-feature/idempiere-server.bat index 68d08e7f29..ee86a3a013 100644 --- a/org.adempiere.server-feature/adempiere-server.bat +++ b/org.adempiere.server-feature/idempiere-server.bat @@ -14,7 +14,7 @@ goto START :START @Echo ======================================= -@Echo Starting Adempiere Server ... +@Echo Starting iDempiere Server ... @Echo ======================================= @"%JAVA%" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console -application org.adempiere.server.application diff --git a/org.adempiere.server-feature/adempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh similarity index 94% rename from org.adempiere.server-feature/adempiere-server.sh rename to org.adempiere.server-feature/idempiere-server.sh index 3dbd4709a0..310df7513e 100644 --- a/org.adempiere.server-feature/adempiere-server.sh +++ b/org.adempiere.server-feature/idempiere-server.sh @@ -10,7 +10,7 @@ else fi echo =================================== -echo Starting Adempiere Server +echo Starting iDempiere Server echo =================================== $JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console -application org.adempiere.server.application diff --git a/org.adempiere.server-feature/product.ant b/org.adempiere.server-feature/product.ant index ce8f9c695f..e70c57c146 100644 --- a/org.adempiere.server-feature/product.ant +++ b/org.adempiere.server-feature/product.ant @@ -25,7 +25,7 @@ - + diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index e2c6986e99..5d0012c00b 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/org.adempiere.server-feature/setup-alt.bat b/org.adempiere.server-feature/setup-alt.bat index d603d1c2b7..b98f477e29 100644 --- a/org.adempiere.server-feature/setup-alt.bat +++ b/org.adempiere.server-feature/setup-alt.bat @@ -1,4 +1,4 @@ -@Title ... Setup Adempiere Server +@Title ... Setup idempiere Server @Rem $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $ @Echo off @@ -17,7 +17,7 @@ goto START :START -@REM Setup Adempiere.properties and AdempiereEnv.properties +@REM Setup idempiere.properties and idempiereEnv.properties @"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.adempiere.install.application -consoleLog @Echo ErrorLevel = %ERRORLEVEL% diff --git a/org.adempiere.server-feature/setup-alt.sh b/org.adempiere.server-feature/setup-alt.sh index 7de0fd2b33..3e803572ac 100644 --- a/org.adempiere.server-feature/setup-alt.sh +++ b/org.adempiere.server-feature/setup-alt.sh @@ -1,6 +1,6 @@ #!/bin/sh # -echo ... Setup Adempiere Server +echo ... Setup idempiere Server # $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $ if [ $JAVA_HOME ]; then @@ -14,7 +14,7 @@ else echo Set JAVA_HOME to the directory of your local JDK. fi -#setup Adempiere.properties and AdempiereEnv.propertiess +#setup idempiere.properties and idempiereEnv.propertiess $JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar -application org.adempiere.install.application -consoleLog echo ... Setup Tomcat diff --git a/org.adempiere.server-feature/setup.bat b/org.adempiere.server-feature/setup.bat index 7e0f20369d..459a28ec4e 100644 --- a/org.adempiere.server-feature/setup.bat +++ b/org.adempiere.server-feature/setup.bat @@ -1,8 +1,8 @@ -@Title ... Setup Adempiere Server +@Title ... Setup iDempiere Server @Echo off -@REM Setup Adempiere.properties and AdempiereEnv.properties -adempiere --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog +@REM Setup idempiere.properties and idempiereEnv.properties +idempiere --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -15,7 +15,7 @@ adempiere --launcher.ini setup.ini -application org.adempiere.install.applicatio :NEXT @REM Setup Tomcat @Echo ... Setup Tomcat -adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml +idempiere --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.sh b/org.adempiere.server-feature/setup.sh index 55b9041247..115e3e083e 100644 --- a/org.adempiere.server-feature/setup.sh +++ b/org.adempiere.server-feature/setup.sh @@ -1,13 +1,13 @@ #!/bin/sh # -echo ... Setup Adempiere Server +echo ... Setup iDempiere Server -# Setup Adempiere.properties and AdempiereEnv.properties -./adempiere --launcher.ini setup.ini -application org.adempiere.install.application +# Setup idempiere.properties and iDempiereEnv.properties +./idempiere --launcher.ini setup.ini -application org.adempiere.install.application echo ... Setup Tomcat # Setup Tomcat -./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml +./idempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml echo ... Make .sh executable chmod -R a+x *.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_DBExport.sh b/org.adempiere.server-feature/utils.unix/RUN_DBExport.sh index 940b06c9e1..4cd8c838f0 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_DBExport.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_DBExport.sh @@ -2,11 +2,11 @@ # Author + Copyright 1999-2005 Jorg Janke # $Id: RUN_DBExport.sh,v 1.10 2005/05/31 18:45:33 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Export Adempiere Database - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Export idempiere Database - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) # Parameter: / @@ -14,8 +14,8 @@ sh $ADEMPIERE_DB_PATH/DBExport.sh $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD # sh $ADEMPIERE_DB_PATH/DBExportFull.sh system/$ADEMPIERE_DB_SYSTEM -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi sh myDBcopy.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_DBExportdp.sh b/org.adempiere.server-feature/utils.unix/RUN_DBExportdp.sh index 6a755b0a61..07f572df1d 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_DBExportdp.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_DBExportdp.sh @@ -2,11 +2,11 @@ # Author + Copyright 1999-2005 Jorg Janke # $Id: RUN_DBExport.sh,v 1.10 2005/05/31 18:45:33 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Export Adempiere Database - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Export idempiere Database - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) # Parameter: / @@ -14,8 +14,8 @@ sh $ADEMPIERE_DB_PATH/DBExportdp.sh $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD sy # sh $ADEMPIERE_DB_PATH/DBExportFulldp.sh system/$ADEMPIERE_DB_SYSTEM -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi sh myDBcopy.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_DBRestore.sh b/org.adempiere.server-feature/utils.unix/RUN_DBRestore.sh index f805ca4873..f08d7831d6 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_DBRestore.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_DBRestore.sh @@ -1,21 +1,19 @@ #!/bin/sh # $Id: RUN_DBRestore.sh,v 1.9 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Restore Adempiere Database from Export- $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Restore idempiere Database from Export- $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) -echo Re-Create Adempiere User and import $ADEMPIERE_HOME/data/ExpDat.dmp +echo Re-Create idempiere User and import $IDEMPIERE_HOME/data/ExpDat.dmp echo == The import will show warnings. This is OK == -ls -lsa $ADEMPIERE_HOME/data/ExpDat.dmp +ls -lsa $IDEMPIERE_HOME/data/ExpDat.dmp echo Press enter to continue ... read in # Parameter: # globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres(ignored in oracle) $ADEMPIERE_DB_PATH/DBRestore.sh system/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM - -$ADEMPIERE_HOME/utils/RUN_SignDatabaseBuild.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_DBRestoredp.sh b/org.adempiere.server-feature/utils.unix/RUN_DBRestoredp.sh index f805ca4873..f08d7831d6 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_DBRestoredp.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_DBRestoredp.sh @@ -1,21 +1,19 @@ #!/bin/sh # $Id: RUN_DBRestore.sh,v 1.9 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Restore Adempiere Database from Export- $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Restore idempiere Database from Export- $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) -echo Re-Create Adempiere User and import $ADEMPIERE_HOME/data/ExpDat.dmp +echo Re-Create idempiere User and import $IDEMPIERE_HOME/data/ExpDat.dmp echo == The import will show warnings. This is OK == -ls -lsa $ADEMPIERE_HOME/data/ExpDat.dmp +ls -lsa $IDEMPIERE_HOME/data/ExpDat.dmp echo Press enter to continue ... read in # Parameter: # globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres(ignored in oracle) $ADEMPIERE_DB_PATH/DBRestore.sh system/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM - -$ADEMPIERE_HOME/utils/RUN_SignDatabaseBuild.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_DBStart.sh b/org.adempiere.server-feature/utils.unix/RUN_DBStart.sh index 240dd35303..0cc37f9a97 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_DBStart.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_DBStart.sh @@ -1,11 +1,11 @@ #!/bin/sh # $Id: RUN_DBStart.sh,v 1.4 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Start DataBase Service - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Start DataBase Service - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) sh $ADEMPIERE_DB_PATH/Start.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_DBStop.sh b/org.adempiere.server-feature/utils.unix/RUN_DBStop.sh index 6c51ead4bb..a6c352b56b 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_DBStop.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_DBStop.sh @@ -1,11 +1,11 @@ #!/bin/sh # $Id: RUN_DBStop.sh,v 1.4 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Stop DataBase Service - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Stop DataBase Service - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) sh $ADEMPIERE_DB_PATH/Stop.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_Env.sh b/org.adempiere.server-feature/utils.unix/RUN_Env.sh index 0efd0511d8..26380d69ac 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_Env.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_Env.sh @@ -1,10 +1,10 @@ #!/bin/sh # $Id: RUN_Env.sh,v 1.16 2005/01/22 21:59:15 jjanke Exp $ -echo Adempiere Environment Check +echo idempiere Environment Check -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi # Environment is read from the following script myEnvironment.sh . ./myEnvironment.sh @@ -15,7 +15,7 @@ echo CLASSPTH = $CLASSPATH echo . echo Homes ... -echo ADEMPIERE_HOME = $ADEMPIERE_HOME +echo IDEMPIERE_HOME = $IDEMPIERE_HOME echo JAVA_HOME = $JAVA_HOME echo ADEMPIERE_DB_URL = $ADEMPIERE_DB_URL @@ -30,7 +30,7 @@ echo ADEMPIERE_DB_NAME = $ADEMPIERE_DB_NAME echo ADEMPIERE_DB_SYSTEM = $ADEMPIERE_DB_SYSTEM echo . -echo Java Test ... should be 1.4.1 +echo Java Test ... should be 1.6+ $JAVA_HOME/bin/java -version echo . diff --git a/org.adempiere.server-feature/utils.unix/RUN_ExportReference.sh b/org.adempiere.server-feature/utils.unix/RUN_ExportReference.sh index 2432d7a739..884d763287 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_ExportReference.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_ExportReference.sh @@ -2,9 +2,9 @@ # # $Id: RUN_ImportReference.sh,v 1.11 2005/12/13 00:17:54 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Export Reference - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Export Reference - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) sh $ADEMPIERE_DB_PATH/ExportReference.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_GetAdempiereTemplate.sh b/org.adempiere.server-feature/utils.unix/RUN_GetAdempiereTemplate.sh deleted file mode 100644 index d2b5eccfb6..0000000000 --- a/org.adempiere.server-feature/utils.unix/RUN_GetAdempiereTemplate.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Download Adempiere -# -# $Id: RUN_GetAdempiereTemplate.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $ - -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils -fi -. ./myEnvironment.sh Server -echo Download Adempiere Database - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) - -echo Download Adempiere Database as jar into $ADEMPIERE_HOME/data - -ping @ADEMPIERE_FTP_SERVER@ -cd $ADEMPIERE_HOME/data -rm Adempiere.jar - -ftp -s:$ADEMPIERE_HOME/utils/ftpGetAdempiere.txt - -echo Unpacking -jar xvf Adempiere.jar - -echo ........ Received - -cd $ADEMPIERE_HOME/utils -sh RUN_ImportAdempiere.sh diff --git a/org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/RUN_ImportIdempiere.sh similarity index 53% rename from org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh rename to org.adempiere.server-feature/utils.unix/RUN_ImportIdempiere.sh index 703acf93f7..a0aba2ff26 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_ImportIdempiere.sh @@ -1,12 +1,12 @@ #!/bin/sh # -# $Id: RUN_ImportAdempiere.sh,v 1.9 2005/01/22 21:59:15 jjanke Exp $ +# $Id: RUN_ImportIdempiere.sh,v 1.9 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Import Adempiere - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Import idempiere - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) SUFFIX="" SYSUSER=system @@ -16,17 +16,15 @@ then SYSUSER=postgres fi -echo Re-Create Adempiere User and import $ADEMPIERE_HOME/data/Adempiere${SUFFIX}.dmp - \($ADEMPIERE_DB_NAME\) +echo Re-Create idempiere User and import $IDEMPIERE_HOME/data/Adempiere${SUFFIX}.dmp - \($ADEMPIERE_DB_NAME\) echo == The import will show warnings. This is OK == -cd $ADEMPIERE_HOME/data/seed +cd $IDEMPIERE_HOME/data/seed jar xvf Adempiere${SUFFIX}.jar -cd $ADEMPIERE_HOME/utils -ls -lsa $ADEMPIERE_HOME/data/seed/Adempiere${SUFFIX}.dmp +cd $IDEMPIERE_HOME/utils +ls -lsa $IDEMPIERE_HOME/data/seed/Adempiere${SUFFIX}.dmp echo Press enter to continue ... read in # Parameter: # globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres(ignored in oracle) -$ADEMPIERE_DB_PATH/ImportAdempiere.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM - -$ADEMPIERE_HOME/utils/RUN_SignDatabaseBuild.sh +$ADEMPIERE_DB_PATH/ImportIdempiere.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM diff --git a/org.adempiere.server-feature/utils.unix/RUN_ImportReference.sh b/org.adempiere.server-feature/utils.unix/RUN_ImportReference.sh index 1ffc67a719..b1b1993656 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_ImportReference.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_ImportReference.sh @@ -2,11 +2,11 @@ # # $Id: RUN_ImportReference.sh,v 1.11 2005/12/13 00:17:54 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Import Reference - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Import Reference - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) SUFFIX="" SYSUSER=system @@ -16,11 +16,11 @@ then SYSUSER=postgres fi -echo Re-Create Reference User and import $ADEMPIERE_HOME/data/Adempiere.dmp - \($ADEMPIERE_DB_NAME\) +echo Re-Create Reference User and import $IDEMPIERE_HOME/data/Adempiere.dmp - \($ADEMPIERE_DB_NAME\) echo == The import will show warnings. This is OK == -ls -lsa $ADEMPIERE_HOME/data/Adempiere${SUFFIX}.dmp +ls -lsa $IDEMPIERE_HOME/data/Adempiere${SUFFIX}.dmp echo Press enter to continue ... read in # Parameter: -sh $ADEMPIERE_DB_PATH/ImportAdempiere.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM reference reference $ADEMPIERE_DB_SYSTEM +sh $ADEMPIERE_DB_PATH/ImportIdempiere.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM reference reference $ADEMPIERE_DB_SYSTEM diff --git a/org.adempiere.server-feature/utils.unix/RUN_Migrate.sh b/org.adempiere.server-feature/utils.unix/RUN_Migrate.sh deleted file mode 100644 index 327fee629f..0000000000 --- a/org.adempiere.server-feature/utils.unix/RUN_Migrate.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -# mjudd - first attempt - no parsing for different systems / browser etc - -/usr/bin/desktop-launch http://www.adempiere.com/wiki/index.php/Migration diff --git a/org.adempiere.server-feature/utils.unix/RUN_PostMigration.sh b/org.adempiere.server-feature/utils.unix/RUN_PostMigration.sh index 7e31f0f0ee..153f292391 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_PostMigration.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_PostMigration.sh @@ -2,8 +2,8 @@ # # $Id: RUN_PostMigration.sh -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server @@ -12,67 +12,14 @@ if [ $JAVA_HOME ]; then export PATH=$JAVA_HOME/bin:$PATH else echo JAVA_HOME is not set. - echo You may not be able to build Adempiere + echo You may not be able to build idempiere echo Set JAVA_HOME to the directory of your local JDK. exit fi -# check jdk -if [ ! -f $JAVA_HOME/lib/tools.jar ] ; then - echo "** Need full Java SDK **" - exit -fi +cd $IDEMPIERE_HOME -SUFFIX="" -SYSUSER=system -if [ $ADEMPIERE_DB_PATH = "postgresql" ] -then - SUFFIX="_pg" - SYSUSER=postgres -fi - -#classpath -MYCLASSPATH=../lib/Adempiere.jar:../lib/CCTools.jar:../lib/postgresql.jar:../lib/oracle.jar:../lib/jboss.jar - -JAVA_OPTS="-Xms128m -Xmx512m -Djava.awt.headless=true" - -ADEMPIERE_OPTS="-DADEMPIERE_HOME=$ADEMPIERE_HOME -DPropertyFile=../Adempiere.properties" - -#Run generate model -#echo -#echo Generate Model -#echo -# -#$JAVA_HOME/bin/java $JAVA_OPTS $ADEMPIERE_OPTS -classpath $MYCLASSPATH org.adempiere.util.GenerateModel src/org/compiere/model org.compiere.model 'D' '%' - -#Add missing translations -echo -echo Add missing translations -echo - -# Parameter: -sh $ADEMPIERE_DB_PATH/PostMigration.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM - -#Run Synchronize Terminology -echo -echo Synchronize Terminology -echo - -$JAVA_HOME/bin/java $JAVA_OPTS $ADEMPIERE_OPTS -classpath $MYCLASSPATH org.compiere.process.SynchronizeTerminology - -#Run Role access update -echo -echo Role Access Update -echo - -$JAVA_HOME/bin/java $JAVA_OPTS $ADEMPIERE_OPTS -classpath $MYCLASSPATH org.compiere.process.RoleAccessUpdate - -#Run Sequence Check -echo -echo Sequence Check -echo - -$JAVA_HOME/bin/java $JAVA_OPTS $ADEMPIERE_OPTS -classpath $MYCLASSPATH org.compiere.process.SequenceCheck +./idempiere --launcher.ini setup.ini -application org.adempiere.base.PostMigration -consoleLog echo Done ... diff --git a/org.adempiere.server-feature/utils.unix/RUN_PutExportTemplate.sh b/org.adempiere.server-feature/utils.unix/RUN_PutExportTemplate.sh deleted file mode 100644 index 9908963b5e..0000000000 --- a/org.adempiere.server-feature/utils.unix/RUN_PutExportTemplate.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Transfer Adempiere Database - -# $Id: RUN_PutExportTemplate.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils -fi -. ./myEnvironment.sh Server -echo Transfer Adempiere Database - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) - - -Echo ........ Export DB -sh $ADEMPIERE_DB_PATH/DBExport.sh $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD - -Echo ........ Stop DB -sqlplus "system/$ADEMPIERE_DB_SYSTEM AS SYSDBA" @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql - -echo ........ FTP -ping @ADEMPIERE_FTP_SERVER@ -cd $ADEMPIERE_HOME/data -ls ExpDat.* - -ftp -s:$ADEMPIERE_HOME/utils/ftpPutExport.txt - -echo ........ Done diff --git a/org.adempiere.server-feature/utils.unix/RUN_Server2.sh b/org.adempiere.server-feature/utils.unix/RUN_Server2.sh index bad1771948..2599b20d4a 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_Server2.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_Server2.sh @@ -1,8 +1,8 @@ #!/bin/sh -# ADempiere Server Start +# iDempiere Server Start -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server @@ -22,8 +22,8 @@ fi # SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure SECURE= -VMARGS="-Dosgi.compatibility.bootdelegation=true -Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DADEMPIERE_HOME=$ADEMPIERE_HOME" +VMARGS="-Dosgi.compatibility.bootdelegation=true -Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DIDEMPIERE_HOME=$IDEMPIERE_HOME" # headless option if you don't have X installed on the server -$JAVA -server $VMARGS -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -install $ADEMPIERE_HOME/osgi -configuration $ADEMPIERE_HOME/osgi/server -clean -console +$JAVA -server $VMARGS -jar $IDEMPIERE_HOME/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -install $IDEMPIERE_HOME/osgi -configuration $IDEMPIERE_HOME/osgi/server -clean -console diff --git a/org.adempiere.server-feature/utils.unix/RUN_Server2Stop.sh b/org.adempiere.server-feature/utils.unix/RUN_Server2Stop.sh index a8f18ed5bb..a101941e23 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_Server2Stop.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_Server2Stop.sh @@ -1,18 +1,18 @@ #!/bin/sh # ADempiere Server Stop script -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Adempiere Server Stop - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Adempiere Server Stop - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) JBOSS_LIB=$JBOSS_HOME/lib export JBOSS_LIB JBOSS_SERVERLIB=$JBOSS_HOME/server/adempiere/lib export JBOSS_SERVERLIB -JBOSS_CLASSPATH=$ADEMPIERE_HOME/lib/jboss.jar:$JBOSS_LIB/jboss-system.jar: +JBOSS_CLASSPATH=$IDEMPIERE_HOME/lib/jboss.jar:$JBOSS_LIB/jboss-system.jar: export JBOSS_CLASSPATH echo sh $JBOSS_HOME/bin/shutdown.sh --server=jnp://$ADEMPIERE_APPS_SERVER:$ADEMPIERE_JNP_PORT --shutdown diff --git a/org.adempiere.server-feature/utils.unix/RUN_SignDatabaseBuild.sh b/org.adempiere.server-feature/utils.unix/RUN_SignDatabaseBuild.sh deleted file mode 100644 index 29610f3e39..0000000000 --- a/org.adempiere.server-feature/utils.unix/RUN_SignDatabaseBuild.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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 $ - -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils -fi -. ./myEnvironment.sh Server - -JAVA=$JAVA_HOME/bin/java - -echo =================================== -echo Sign Database Build -echo =================================== -CP=$ADEMPIERE_HOME/lib/CInstall.jar:$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/CCTools.jar:$ADEMPIERE_HOME/lib/oracle.jar:$ADEMPIERE_HOME/lib/jboss.jar:$ADEMPIERE_HOME/lib/postgresql.jar: - -$JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME org.adempiere.process.SignDatabaseBuild diff --git a/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh b/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh index 3d2a463ba6..186840c310 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh @@ -2,17 +2,17 @@ # $Id: RUN_TrlExport.sh,v 1.4 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Export Adempiere Translation - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Export idempiere Translation - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) # need to change this to reflect your language export AD_LANGUAGE=ca_ES -export DIRECTORY=$ADEMPIERE_HOME/data/$AD_LANGUAGE +export DIRECTORY=$IDEMPIERE_HOME/data/$AD_LANGUAGE echo This Procedure exports language $AD_LANGUAGE to directory $DIRECTORY diff --git a/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh b/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh index 672918d5bb..19e4a046e7 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh @@ -2,17 +2,17 @@ # $Id: RUN_TrlImport.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $ -if [ $ADEMPIERE_HOME ]; then - cd $ADEMPIERE_HOME/utils +if [ $IDEMPIERE_HOME ]; then + cd $IDEMPIERE_HOME/utils fi . ./myEnvironment.sh Server -echo Import Adempiere Translation - $ADEMPIERE_HOME \($ADEMPIERE_DB_NAME\) +echo Import idempiere Translation - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\) # need to change this to reflect your language export AD_LANGUAGE=ca_ES -export DIRECTORY=$ADEMPIERE_HOME/data/$AD_LANGUAGE +export DIRECTORY=$IDEMPIERE_HOME/data/$AD_LANGUAGE echo This Procedure imports language $AD_LANGUAGE from directory $DIRECTORY diff --git a/org.adempiere.server-feature/utils.unix/RUN_UnixEnvTemplate.sh b/org.adempiere.server-feature/utils.unix/RUN_UnixEnvTemplate.sh index c967dcef6a..d381dfdac4 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_UnixEnvTemplate.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_UnixEnvTemplate.sh @@ -9,10 +9,10 @@ echo =================================== JAVA_HOME=@JAVA_HOME@ export JAVA_HOME -ADEMPIERE_HOME=@ADEMPIERE_HOME@ -export ADEMPIERE_HOME +IDEMPIERE_HOME=@IDEMPIERE_HOME@ +export IDEMPIERE_HOME -echo "\$JAVA_HOME is set to $JAVA_HOME and \$ADEMPIERE_HOME is set to $ADEMPIERE_HOME" +echo "\$JAVA_HOME is set to $JAVA_HOME and \$IDEMPIERE_HOME is set to $IDEMPIERE_HOME" # ORACLE_HOME=/var/oracle/OraHome92 # export ORACLE_HOME diff --git a/org.adempiere.server-feature/utils.unix/myDBcopyTemplate.sh b/org.adempiere.server-feature/utils.unix/myDBcopyTemplate.sh index 23b926e23a..359b2251c8 100644 --- a/org.adempiere.server-feature/utils.unix/myDBcopyTemplate.sh +++ b/org.adempiere.server-feature/utils.unix/myDBcopyTemplate.sh @@ -4,7 +4,7 @@ # $Id: myDBcopyTemplate.sh,v 1.1 2002/10/07 01:23:32 jjanke Exp $ DATE=`date +%Y%m%d_%H%M%S` -mv $ADEMPIERE_HOME/data/ExpDat.jar $ADEMPIERE_HOME/data/ExpDat$DATE.jar -echo copy $ADEMPIERE_HOME/data/ExpDat$DATE.jar to backup media +mv $IDEMPIERE_HOME/data/ExpDat.jar $IDEMPIERE_HOME/data/ExpDat$DATE.jar +echo copy $IDEMPIERE_HOME/data/ExpDat$DATE.jar to backup media sleep 30 diff --git a/org.adempiere.server-feature/utils.unix/myEnvironmentTemplate.sh b/org.adempiere.server-feature/utils.unix/myEnvironmentTemplate.sh index 5c4be4b052..34766434df 100644 --- a/org.adempiere.server-feature/utils.unix/myEnvironmentTemplate.sh +++ b/org.adempiere.server-feature/utils.unix/myEnvironmentTemplate.sh @@ -1,24 +1,24 @@ #!/bin/sh # -# myEnvironment defines the variables used for Adempiere +# myEnvironment defines the variables used for idempiere # Do not edit directly - use RUN_setup # # $Id: myEnvironmentTemplate.sh,v 1.12 2005/02/21 03:17:21 jjanke Exp $ echo Setting myEnvironment .... # Clients only needs -# ADEMPIERE_HOME +# IDEMPIERE_HOME # JAVA_HOME # Server install needs to change # ADEMPIERE_DB_NAME (for Oracle) # passwords # -# For a HTML browser, Adempiere will call "netscape " +# For a HTML browser, idempiere will call "netscape " # If not in the path, provide a link called netscape to your browser # Homes ... -ADEMPIERE_HOME=@ADEMPIERE_HOME@ -export ADEMPIERE_HOME +IDEMPIERE_HOME=@IDEMPIERE_HOME@ +export IDEMPIERE_HOME JAVA_HOME=@JAVA_HOME@ export JAVA_HOME @@ -43,10 +43,8 @@ ADEMPIERE_DB_SYSTEM=@ADEMPIERE_DB_SYSTEM@ export ADEMPIERE_DB_SYSTEM # Homes(2) -ADEMPIERE_DB_HOME=$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH +ADEMPIERE_DB_HOME=$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH export ADEMPIERE_DB_HOME -JBOSS_HOME=$ADEMPIERE_HOME/jboss -export JBOSS_HOME # Apps Server ADEMPIERE_APPS_SERVER=@ADEMPIERE_APPS_SERVER@ @@ -63,17 +61,11 @@ export ADEMPIERE_KEYSTORE ADEMPIERE_KEYSTOREPASS=@ADEMPIERE_KEYSTOREPASS@ export ADEMPIERE_KEYSTOREPASS -# etc. -ADEMPIERE_FTP_SERVER=@ADEMPIERE_FTP_SERVER@ -export ADEMPIERE_FTP_SERVER - # Java ADEMPIERE_JAVA=$JAVA_HOME/bin/java export ADEMPIERE_JAVA -ADEMPIERE_JAVA_OPTIONS="@ADEMPIERE_JAVA_OPTIONS@ -DADEMPIERE_HOME=$ADEMPIERE_HOME" +ADEMPIERE_JAVA_OPTIONS="@ADEMPIERE_JAVA_OPTIONS@ -DIDEMPIERE_HOME=$IDEMPIERE_HOME" export ADEMPIERE_JAVA_OPTIONS -CLASSPATH="$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/AdempiereCLib.jar" -export CLASSPATH if [ $DOLLAR$# -eq 0 ] then diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBExport.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExport.sh index cbefe4788d..f38ed768cb 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBExport.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBExport.sh @@ -4,7 +4,7 @@ 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 +echo Saving database $1@$ADEMPIERE_DB_NAME to $IDEMPIERE_HOME/data/ExpDat.dmp if [ $# -eq 0 ] then @@ -12,19 +12,19 @@ if [ $# -eq 0 ] echo "Example: $0 adempiere adempiere" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" 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 +sqlplus $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_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 STATISTICS=NONE OWNER=$1 +exp $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_HOME/data/ExpDat.dmp Log=$IDEMPIERE_HOME/data/ExpDat.log CONSISTENT=Y STATISTICS=NONE OWNER=$1 -cd $ADEMPIERE_HOME/data +cd $IDEMPIERE_HOME/data jar cvfM ExpDat.jar ExpDat.dmp ExpDat.log diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBExportFull.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExportFull.sh index 3298e4299c..96ef4df9cf 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBExportFull.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBExportFull.sh @@ -4,7 +4,7 @@ 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 +echo Saving database $1@$ADEMPIERE_DB_NAME to $IDEMPIERE_HOME/data/ExpDatFull.dmp if [ $# -eq 0 ] then @@ -12,16 +12,16 @@ if [ $# -eq 0 ] echo "Example: $0 system/manager" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" 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 STATISTICS=NONE FULL=Y +exp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_HOME/data/ExpDatFull.dmp Log=$IDEMPIERE_HOME/data/ExpDatFull.log CONSISTENT=Y STATISTICS=NONE FULL=Y -cd $ADEMPIERE_HOME/data +cd $IDEMPIERE_HOME/data jar cvfM ExpDatFull.jar ExpDatFull.dmp ExpDatFull.log diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh index 7c53fbd69e..0eb6c50168 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBExportFulldp.sh @@ -4,7 +4,7 @@ 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 +echo Saving database $1@$ADEMPIERE_DB_NAME to $IDEMPIERE_HOME/data/ExpDatFull.dmp if [ $# -eq 0 ] then @@ -12,10 +12,10 @@ if [ $# -eq 0 ] echo "Example: $0 system/manager" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" exit 1 fi @@ -23,12 +23,12 @@ fi echo ------------------------------------- echo Re-Create DataPump directory echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $ADEMPIERE_HOME/data -chgrp dba $ADEMPIERE_HOME/data -chmod 770 $ADEMPIERE_HOME/data +sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data +chgrp dba $IDEMPIERE_HOME/data +chmod 770 $IDEMPIERE_HOME/data expdp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME DIRECTORY=ADEMPIERE_DATA_PUMP_DIR DUMPFILE=ExpDatFull.dmp LOGFILE=ExpDatFull.log EXCLUDE=STATISTICS FULL=Y -cd $ADEMPIERE_HOME/data +cd $IDEMPIERE_HOME/data jar cvfM ExpDatFull.jar ExpDatFull.dmp ExpDatFull.log diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh b/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh index 5e1a505610..2153e44609 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBExportdp.sh @@ -4,7 +4,7 @@ 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 +echo Saving database $1@$ADEMPIERE_DB_NAME to $IDEMPIERE_HOME/data/ExpDat.dmp if [ $# -eq 0 ] then @@ -12,26 +12,26 @@ if [ $# -eq 0 ] echo "Example: $0 adempiere adempiere" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" 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 +sqlplus $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Daily.sql echo ------------------------------------- echo Re-Create DataPump directory echo ------------------------------------- -sqlplus $3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $ADEMPIERE_HOME/data -chgrp dba $ADEMPIERE_HOME/data -chmod 770 $ADEMPIERE_HOME/data +sqlplus $3@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data +chgrp dba $IDEMPIERE_HOME/data +chmod 770 $IDEMPIERE_HOME/data # Export expdp $1/$2@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME DIRECTORY=ADEMPIERE_DATA_PUMP_DIR DUMPFILE=ExpDat.dmp LOGFILE=ExpDat.log EXCLUDE=STATISTICS SCHEMAS=$1 -cd $ADEMPIERE_HOME/data +cd $IDEMPIERE_HOME/data jar cvfM ExpDat.jar ExpDat.dmp ExpDat.log diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBRestore.sh b/org.adempiere.server-feature/utils.unix/oracle/DBRestore.sh index 51264943e0..6823655485 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBRestore.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBRestore.sh @@ -1,9 +1,9 @@ #!/bin/sh # $Id: DBRestore.sh,v 1.8 2005/12/20 07:12:17 jjanke Exp $ -echo Adempiere Database Restore $Revision: 1.8 $ +echo idempiere Database Restore $Revision: 1.8 $ -echo Restoring Adempiere DB from $ADEMPIERE_HOME/data/ExpDat.dmp +echo Restoring idempiere DB from $IDEMPIERE_HOME/data/ExpDat.dmp if [ $# -le 2 ] then @@ -11,10 +11,10 @@ if [ $# -le 2 ] echo "Example: $0 system/manager adempiere adempiere" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" exit 1 fi @@ -23,20 +23,20 @@ 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 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_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 +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_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 +$IDEMPIERE_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 +sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh b/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh index cf2f78ed6f..eebeb3ed56 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/DBRestoredp.sh @@ -3,7 +3,7 @@ # $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 +echo Restoring Adempiere DB from $IDEMPIERE_HOME/data/ExpDat.dmp if [ $# -le 2 ] then @@ -11,10 +11,10 @@ if [ $# -le 2 ] echo "Example: $0 system/manager adempiere adempiere" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" exit 1 fi @@ -23,14 +23,14 @@ 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 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 echo ------------------------------------- echo Re-Create DataPump directory echo ------------------------------------- -sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $ADEMPIERE_HOME/data -chgrp dba $ADEMPIERE_HOME/data -chmod 770 $ADEMPIERE_HOME/data +sqlplus $1@$ADEMPIERE_DB_SERVER/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateDataPumpDir.sql $IDEMPIERE_HOME/data +chgrp dba $IDEMPIERE_HOME/data +chmod 770 $IDEMPIERE_HOME/data echo ------------------------------------- echo Import ExpDat @@ -40,10 +40,10 @@ impdp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME DIRECTORY=AD echo ------------------------------------- echo Create SQLJ echo ------------------------------------- -$ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/create.sh $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD +$IDEMPIERE_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 +sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/org.adempiere.server-feature/utils.unix/oracle/ExportReference.sh b/org.adempiere.server-feature/utils.unix/oracle/ExportReference.sh index e6f9c5aa8e..671c3ce00a 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/ExportReference.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/ExportReference.sh @@ -4,18 +4,18 @@ 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 +echo Saving reference database reference@$ADEMPIERE_DB_NAME to $IDEMPIERE_HOME/data/Adempiere.dmp -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" 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 +exp reference/reference@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_HOME/data/Adempiere.dmp Log=$IDEMPIERE_HOME/data/Adempiere.log CONSISTENT=Y OWNER=reference -cd $ADEMPIERE_HOME/data +cd $IDEMPIERE_HOME/data jar cvfM Adempiere.jar Adempiere.dmp Adempiere.log diff --git a/org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/oracle/ImportIdempiere.sh similarity index 64% rename from org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh rename to org.adempiere.server-feature/utils.unix/oracle/ImportIdempiere.sh index 2c7769d644..dba16318b7 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/ImportIdempiere.sh @@ -1,20 +1,20 @@ #!/bin/sh # $Id: ImportAdempiere.sh,v 1.10 2005/12/20 07:12:17 jjanke Exp $ -echo Adempiere Database Import $Revision: 1.10 $ +echo idempiere Database Import $Revision: 1.10 $ -echo Importing Adempiere DB from $ADEMPIERE_HOME/data/seed/Adempiere.dmp +echo Importing idempiere DB from $IDEMPIERE_HOME/data/seed/Adempiere.dmp if [ $# -le 2 ] then echo "Usage: $0 " - echo "Example: $0 system/manager adempiere adempiere" + echo "Example: $0 system/manager idempiere idempiere" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" exit 1 fi @@ -23,18 +23,18 @@ 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 sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/CreateUser.sql $2 $3 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_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/seed/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" -imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/seed/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 +echo "imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_HOME/data/seed/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_HOME/data/seed/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 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 +echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql +sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/org.adempiere.server-feature/utils.unix/oracle/ImportReference.sh b/org.adempiere.server-feature/utils.unix/oracle/ImportReference.sh index 7a35209721..24e789a0dd 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/ImportReference.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/ImportReference.sh @@ -3,7 +3,7 @@ # $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 +echo Importing Reference DB from $IDEMPIERE_HOME/data/Reference.dmp if [ $# -eq 2 ] then @@ -11,10 +11,10 @@ if [ $# -eq 2 ] echo "Example: $0 system/manager" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org" exit 1 fi @@ -23,17 +23,17 @@ 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 +sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_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 imp $1@$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_HOME/data/Reference.dmp FROMUSER=\(reference\) TOUSER=reference +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$IDEMPIERE_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 +sqlplus reference/adempiere@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/AfterImport.sql diff --git a/org.adempiere.server-feature/utils.unix/oracle/PostMigration.sh b/org.adempiere.server-feature/utils.unix/oracle/PostMigration.sh index 86f6598bc3..ae75c34e28 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/PostMigration.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/PostMigration.sh @@ -6,18 +6,18 @@ echo Oracle Post Migration Scripts if [ $# -le 2 ] then echo "Usage: $0 " - echo "Example: $0 system/manager adempiere adempiere" + echo "Example: $0 system/manager idempiere idempiere" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" ] +if [ "$IDEMPIERE_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" + echo " IDEMPIERE_HOME e.g. /idempiere" + echo " ADEMPIERE_DB_NAME e.g. idempiere.idempiere.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 +echo sqlplus $2/$3@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/01_add_missing_Translations.sql diff --git a/org.adempiere.server-feature/utils.unix/oracle/Start.sh b/org.adempiere.server-feature/utils.unix/oracle/Start.sh index 4b0ba95781..117e199295 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/Start.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/Start.sh @@ -2,4 +2,4 @@ # $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 +sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME AS SYSDBA" @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Start.sql diff --git a/org.adempiere.server-feature/utils.unix/oracle/Stop.sh b/org.adempiere.server-feature/utils.unix/oracle/Stop.sh index c1daf989a3..a80e4f03ba 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/Stop.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/Stop.sh @@ -6,5 +6,5 @@ # 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 +sqlplus "system/$ADEMPIERE_DB_SYSTEM@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME AS SYSDBA" @$IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/Stop.sql diff --git a/org.adempiere.server-feature/utils.unix/postgresql/DBExport.sh b/org.adempiere.server-feature/utils.unix/postgresql/DBExport.sh index cd350ea356..9bc79443b8 100644 --- a/org.adempiere.server-feature/utils.unix/postgresql/DBExport.sh +++ b/org.adempiere.server-feature/utils.unix/postgresql/DBExport.sh @@ -4,7 +4,7 @@ echo ADempiere PostgreSQL Database Export # $Id: DBExport.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $ -echo Saving database $1@$ADEMPIERE_DB_NAME to $ADEMPIERE_HOME/data/ExpDat.dmp +echo Saving database $1@$ADEMPIERE_DB_NAME to $IDEMPIERE_HOME/data/ExpDat.dmp if [ $# -eq 0 ] then @@ -12,10 +12,10 @@ if [ $# -eq 0 ] echo "Example: $0 adempiere adempiere" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere or xe" echo " ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org" echo " ADEMPIERE_DB_PORT e.g. 5432 or 1521" @@ -24,9 +24,9 @@ fi PGPASSWORD=$2 export PGPASSWORD -pg_dump -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT --no-owner -U $1 $ADEMPIERE_DB_NAME > $ADEMPIERE_HOME/data/ExpDat.dmp +pg_dump -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT --no-owner -U $1 $ADEMPIERE_DB_NAME > $IDEMPIERE_HOME/data/ExpDat.dmp PGPASSWORD= export PGPASSWORD -cd $ADEMPIERE_HOME/data +cd $IDEMPIERE_HOME/data jar cvfM ExpDat.jar ExpDat.dmp diff --git a/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh b/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh index d772cdb65c..ca5f781071 100644 --- a/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh +++ b/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh @@ -2,7 +2,7 @@ echo ADempiere Database Import -echo Importing ADempiere DB from $ADEMPIERE_HOME/data/ExpDat.dmp +echo Importing ADempiere DB from $IDEMPIERE_HOME/data/ExpDat.dmp if [ $# -le 2 ] then @@ -10,10 +10,10 @@ if [ $# -le 2 ] echo "Example: $0 postgres adempiere adempiere postgrespwd" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere or xe" echo " ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org" echo " ADEMPIERE_DB_PORT e.g. 5432 or 1521" @@ -44,7 +44,7 @@ echo ------------------------------------- psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "drop schema sqlj cascade" ADEMPIERE_ALTER_ROLE_SQL="ALTER ROLE $2 SET search_path TO adempiere, pg_catalog" psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "$ADEMPIERE_ALTER_ROLE_SQL" -psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $ADEMPIERE_HOME/data/ExpDat.dmp +psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $IDEMPIERE_HOME/data/ExpDat.dmp PGPASSWORD= export PGPASSWORD diff --git a/org.adempiere.server-feature/utils.unix/postgresql/ExportReference.sh b/org.adempiere.server-feature/utils.unix/postgresql/ExportReference.sh index 2c69103308..249c7beb99 100644 --- a/org.adempiere.server-feature/utils.unix/postgresql/ExportReference.sh +++ b/org.adempiere.server-feature/utils.unix/postgresql/ExportReference.sh @@ -4,12 +4,12 @@ echo ADempiere PostgreSQL Database Export # $Id: DBExport.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $ -echo Saving database reference@$ADEMPIERE_DB_NAME to $ADEMPIERE_HOME/data/Adempiere_pg.dmp +echo Saving database reference@$ADEMPIERE_DB_NAME to $IDEMPIERE_HOME/data/Adempiere_pg.dmp -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] then echo "Please make sure that the environment variables are set correctly:" - echo " ADEMPIERE_HOME e.g. /Adempiere" + echo " IDEMPIERE_HOME e.g. /idempiere" echo " ADEMPIERE_DB_NAME e.g. adempiere or xe" echo " ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org" echo " ADEMPIERE_DB_PORT e.g. 5432 or 1521" @@ -18,9 +18,9 @@ fi PGPASSWORD=reference export PGPASSWORD -pg_dump -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT --no-owner -U reference $ADEMPIERE_DB_NAME > $ADEMPIERE_HOME/data/Adempiere_pg.dmp +pg_dump -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT --no-owner -U reference $ADEMPIERE_DB_NAME > $IDEMPIERE_HOME/data/Adempiere_pg.dmp PGPASSWORD= export PGPASSWORD -cd $ADEMPIERE_HOME/data +cd $IDEMPIERE_HOME/data jar cvfM Adempiere_pg.jar Adempiere_pg.dmp diff --git a/org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/postgresql/ImportIdempiere.sh similarity index 73% rename from org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh rename to org.adempiere.server-feature/utils.unix/postgresql/ImportIdempiere.sh index 1d5e7faf23..d5ba015e65 100644 --- a/org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh +++ b/org.adempiere.server-feature/utils.unix/postgresql/ImportIdempiere.sh @@ -1,23 +1,23 @@ #!/bin/sh # $Id: ImportAdempiere.sh,v 1.10 2005/12/20 07:12:17 jjanke Exp $ -echo Adempiere Database Import $Revision: 1.10 $ +echo idempiere Database Import $Revision: 1.10 $ -echo Importing Adempiere DB from $ADEMPIERE_HOME/data/seed/Adempiere_pg.dmp +echo Importing idempiere DB from $IDEMPIERE_HOME/data/seed/Adempiere_pg.dmp if [ $# -le 2 ] then echo "Usage: $0 " - echo "Example: $0 postgres adempiere adempiere postgresPwd" + echo "Example: $0 postgres idempiere idempiere postgresPwd" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] 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 or orcl" - echo " ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org" - echo " ADEMPIERE_DB_PORT e.g. 5432 or 1521" + echo " IDEMPIERE_HOME e.g. /idempiere" + echo " ADEMPIERE_DB_NAME e.g. idempiere" + echo " ADEMPIERE_DB_SERVER e.g. dbserver.idempiere.org" + echo " ADEMPIERE_DB_PORT e.g. 5432" exit 1 fi @@ -43,7 +43,7 @@ echo Import Adempiere_pg.dmp echo ------------------------------------- ADEMPIERE_ALTER_ROLE_SQL="ALTER ROLE $2 SET search_path TO adempiere, pg_catalog" psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "$ADEMPIERE_ALTER_ROLE_SQL" -psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $ADEMPIERE_HOME/data/seed/Adempiere_pg.dmp +psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $IDEMPIERE_HOME/data/seed/Adempiere_pg.dmp ADEMPIERE_ALTER_ROLE_SQL= PGPASSWORD= export PGPASSWORD diff --git a/org.adempiere.server-feature/utils.unix/postgresql/PostMigration.sh b/org.adempiere.server-feature/utils.unix/postgresql/PostMigration.sh index 6dfdeb0ff5..89d5cd294f 100644 --- a/org.adempiere.server-feature/utils.unix/postgresql/PostMigration.sh +++ b/org.adempiere.server-feature/utils.unix/postgresql/PostMigration.sh @@ -6,16 +6,16 @@ echo Postgresql Post Migration Scripts if [ $# -le 2 ] then echo "Usage: $0 " - echo "Example: $0 postgres adempiere adempiere postgresPwd" + echo "Example: $0 postgres idempiere idempiere postgresPwd" exit 1 fi -if [ "$ADEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] +if [ "$IDEMPIERE_HOME" = "" -o "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERVER" = "" -o "$ADEMPIERE_DB_PORT" = "" ] 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 or xe" - echo " ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org" - echo " ADEMPIERE_DB_PORT e.g. 5432 or 1521" + echo " IDEMPIERE_HOME e.g. /idempiere" + echo " ADEMPIERE_DB_NAME e.g. idempiere" + echo " ADEMPIERE_DB_SERVER e.g. dbserver.idempiere.org" + echo " ADEMPIERE_DB_PORT e.g. 5432" exit 1 fi @@ -24,6 +24,6 @@ export PGPASSWORD echo ------------------------------------- echo Add missing translations echo ------------------------------------- -psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $ADEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/01_add_missing_translations.sql +psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $IDEMPIERE_HOME/utils/$ADEMPIERE_DB_PATH/01_add_missing_translations.sql PGPASSWORD= export PGPASSWORD diff --git a/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/StartupParameters.plist b/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/StartupParameters.plist index eb6e2063cc..5f716632cc 100644 --- a/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/StartupParameters.plist +++ b/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/StartupParameters.plist @@ -1,11 +1,11 @@ { - Description = "Adempiere"; - Provides = ("adempiere"); - Requires = ("postgresql-8.3"); + Description = "iDempiere"; + Provides = ("idempiere"); + Requires = ("postgresql-8.4"); Preference = "Late"; Messages = { - start = "Starting Adempiere"; - stop = "Stopping Adempiere"; + start = "Starting iDempiere"; + stop = "Stopping iDempiere"; }; } diff --git a/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/adempiere b/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/idempiere similarity index 66% rename from org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/adempiere rename to org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/idempiere index 6b04a80040..fae042d086 100644 --- a/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/adempiere +++ b/org.adempiere.server-feature/utils.unix/unix/MAC_OS_X/idempiere @@ -2,15 +2,15 @@ . /etc/rc.common -# Adempiere Service script for OS/X +# idempiere Service script for OS/X export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home export POSTGRES_HOME=/Library/PostgreSQL/8.3 -export ADEMPIERE_HOME=/Applications/Adempiere +export IDEMPIERE_HOME=/Applications/idempiere export PATH=$PATH:$JAVA_HOME/bin/:$POSTGRES_HOME/bin/ -EXECDIR=/Applications/Adempiere +EXECDIR=/Applications/iDempiere ENVFILE=/etc/profile RETVAL=0 -ADEMPIERESTATUS= +IDEMPIERESTATUS= MAXITERATIONS=60 # 2 seconds every iteration, max wait 2 minutes) RunService () @@ -27,21 +27,21 @@ RunService () StatusService () { - ADEMPIERESTATUSSTRING=$(ps ax | grep -v grep | grep server| grep $EXECDIR) - echo $ADEMPIERESTATUSSTRING | grep $EXECDIR - #ADEMPIERESTATUS=$? + IDEMPIERESTATUSSTRING=$(ps ax | grep -v grep | grep server| grep $EXECDIR) + echo $IDEMPIERESTATUSSTRING | grep $EXECDIR + #IDEMPIERESTATUS=$? } StartService () { - ADEMPIERESTATUS=$(ps ax | grep -v grep | grep server| grep $EXECDIR|wc -l) - if [ $ADEMPIERESTATUS != 0 ] ; then - ConsoleMessage "adempiere is already running" + IDEMPIERESTATUS=$(ps ax | grep -v grep | grep server| grep $EXECDIR|wc -l) + if [ $IDEMPIERESTATUS != 0 ] ; then + ConsoleMessage "idempiere is already running" return 1 fi - ConsoleMessage "Starting ADempiere ERP: " - export LOGFILE=$ADEMPIERE_HOME/jboss/server/adempiere/log/adempiere_`date +%Y%m%d%H%M%S`.log - export LOOKFILE=$ADEMPIERE_HOME/jboss/server/adempiere/log/server.log + ConsoleMessage "Starting iDempiere ERP: " + export LOGFILE=$IDEMPIERE_HOME/log/idempiere_`date +%Y%m%d%H%M%S`.log + export LOOKFILE=$IDEMPIERE_HOME/server.log su root -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2.sh &> $LOGFILE &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then @@ -62,11 +62,11 @@ if [ $STATUSTEST -eq 0 ] then ConsoleMessage "Service hasn't started within the timeout allowed, please review file $LOGFILE to see the status of the service" else - ConsoleMessage "Adempiere Started" + ConsoleMessage "idempiere Started" fi echo else - ConsoleMessage "Admpiere Failed" + ConsoleMessage "idmpiere Failed" echo fi return $RETVAL @@ -74,14 +74,14 @@ if [ $STATUSTEST -eq 0 ] StopService() { - ADEMPIERESTATUS=$(ps ax | grep -v grep | grep server| grep $EXECDIR|wc -l) - if [ $ADEMPIERESTATUS = 0 ] ; then - echo "adempiere is already stopped" + IDEMPIERESTATUS=$(ps ax | grep -v grep | grep server| grep $EXECDIR|wc -l) + if [ $IDEMPIERESTATUS = 0 ] ; then + echo "idempiere is already stopped" return 1 fi - ConsoleMessage "Stopping ADempiere ERP: " - export LASTLOG=`ls -t $ADEMPIERE_HOME/jboss/server/adempiere/log/adempiere_??????????????.log | head -1` - export LOOKFILE=$ADEMPIERE_HOME/jboss/server/adempiere/log/server.log + ConsoleMessage "Stopping iDempiere ERP: " + export LASTLOG=`ls -t $IDEMPIERE_HOME/log/idempiere_??????????????.log | head -1` + export LOOKFILE=$IDEMPIERE_HOME/log/server.log su root -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2Stop.sh &> /dev/null &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then @@ -101,11 +101,11 @@ StopService() then ConsoleMessage "Service hasn't stopped within the timeout allowed, please review file $LASTLOG to see the status of the service" else - ConsoleMessage "Adempiere Stopped" + ConsoleMessage "idempiere Stopped" fi echo else - ConsoleMessage "Adempiere Failed to Stop" + ConsoleMessage "idempiere Failed to Stop" echo fi return $RETVAL diff --git a/org.adempiere.server-feature/utils.unix/unix/adempiere_Debian.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh similarity index 67% rename from org.adempiere.server-feature/utils.unix/unix/adempiere_Debian.sh rename to org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh index f378a627c8..1e00734fc5 100644 --- a/org.adempiere.server-feature/utils.unix/unix/adempiere_Debian.sh +++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh @@ -2,14 +2,14 @@ # ### BEGIN INIT INFO -# Provides: adempiere adempiere-3.5 +# Provides: idempiere # Required-Start: postgresql # Required-Stop: postgresql # Default-Start: 2 3 4 5 # Default-Stop: 1 -# Short-Description: ADempiere 3.5 server -# Description: Provides ADempiere ERP-CRM Server startup and shutdown script. Requires PostgreSQL server. -# FileTarget: /etc/init.d/adempiere +# Short-Description: iDempiere 1.0.0 server +# Description: Provides iDempiere ERP-CRM Server startup and shutdown script. Requires PostgreSQL server. +# FileTarget: /etc/init.d/idempiere # FileOwner: root.root # FilePerms: 0755 # @@ -18,38 +18,38 @@ # initialization # adjust these variables to your environment -EXECDIR=/opt/adempiere/Adempiere -ADEMPIEREUSER=adempiere -# Instead of using ENVFILE you can set JAVA_HOME, ADEMPIERE_HOME and add JAVA_HOME/bin to PATH +EXECDIR=/opt/idempiere/iDempiere +IDEMPIEREUSER=idempiere +# Instead of using ENVFILE you can set JAVA_HOME, IDEMPIERE_HOME and add JAVA_HOME/bin to PATH # in this case you can comment the source lines for ENVFILE below # detected some problems with Hardy Heron ubuntu using the bash source command -ENVFILE=/home/adempiere/.bashrc +ENVFILE=/home/idempiere/.bashrc # STOPMESSAGE="Halting VM" # Message when using java 5 STOPMESSAGE="INFO.*Server\].*Shutdown complete" # Message when using java 6 . /lib/lsb/init-functions RETVAL=0 -ADEMPIERESTATUS= +IDEMPIERESTATUS= MAXITERATIONS=60 # 2 seconds every iteration, max wait 2 minutes) -getadempierestatus() { - ADEMPIERESTATUSSTRING=$(ps ax | grep -v grep | grep $EXECDIR) - echo $ADEMPIERESTATUSSTRING | grep -q $EXECDIR - ADEMPIERESTATUS=$? +getidempierestatus() { + IDEMPIERESTATUSSTRING=$(ps ax | grep -v grep | grep $EXECDIR) + echo $IDEMPIERESTATUSSTRING | grep -q $EXECDIR + IDEMPIERESTATUS=$? } start () { - getadempierestatus - if [ $ADEMPIERESTATUS -eq 0 ] ; then - echo "ADempiere is already running" + getidempierestatus + if [ $IDEMPIERESTATUS -eq 0 ] ; then + echo "iDempiere is already running" return 1 fi - echo -n "Starting ADempiere ERP: " + echo -n "Starting iDempiere ERP: " . $ENVFILE - export LOGFILE=$ADEMPIERE_HOME/jboss/server/adempiere/log/adempiere_`date +%Y%m%d%H%M%S`.log - su $ADEMPIEREUSER -c "mkdir -p $ADEMPIERE_HOME/jboss/server/adempiere/log" - su $ADEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2.sh &> $LOGFILE &" + export LOGFILE=$IDEMPIERE_HOME/log/idempiere_`date +%Y%m%d%H%M%S`.log + su $IDEMPIEREUSER -c "mkdir -p IDEMPIERE_HOME/log" + su $IDEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2.sh &> $LOGFILE &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then # wait for server to be confirmed as started in logfile @@ -80,16 +80,16 @@ start () { } stop () { - getadempierestatus - if [ $ADEMPIERESTATUS -ne 0 ] ; then - echo "ADempiere is already stopped" + getidempierestatus + if [ $IDEMPIERESTATUS -ne 0 ] ; then + echo "iDempiere is already stopped" return 1 fi - echo -n "Stopping ADempiere ERP: " + echo -n "Stopping iDempiere ERP: " . $ENVFILE - # export LASTLOG=`ls -t $ADEMPIERE_HOME/jboss/server/adempiere/log/adempiere_??????????????.log | head -1` - export LASTLOG=$ADEMPIERE_HOME/jboss/server/adempiere/log/server.log - su $ADEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2Stop.sh &> /dev/null &" + # export LASTLOG=`ls -t $IDEMPIERE_HOME/log/adempiere_??????????????.log | head -1` + export LASTLOG=$IDEMPIERE_HOME/adempiere/log/server.log + su $IDEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2Stop.sh &> /dev/null &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then # wait for server to be confirmed as halted in logfile @@ -109,18 +109,18 @@ stop () { then log_warning_msg "Service hasn't stopped within the timeout allowed, please review file $LASTLOG to see the status of the service" log_warning_msg "Trying direct kill with signal -15" - # Adempiere didn't finish - try direct kill with signal 15, then signal 9 + # idempiere didn't finish - try direct kill with signal 15, then signal 9 kill -15 `ps ax | grep -v grep | grep $EXECDIR | sed -e 's/^ *//g' | cut -f 1 -d " "` sleep 5 - getadempierestatus - if [ $ADEMPIERESTATUS -ne 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -ne 0 ] ; then log_success_msg "Service stopped with kill -15" else echo "Trying direct kill with signal -9" kill -9 `ps ax | grep -v grep | grep $EXECDIR | sed -e 's/^ *//g' | cut -f 1 -d " "` sleep 5 - getadempierestatus - if [ $ADEMPIERESTATUS -ne 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -ne 0 ] ; then log_success_msg "Service stopped with kill -9" else log_warning_msg "Service hasn't stopped" @@ -144,21 +144,21 @@ restart () { } condrestart () { - getadempierestatus - if [ $ADEMPIERESTATUS -eq 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -eq 0 ] ; then restart fi } rhstatus () { - getadempierestatus - if [ $ADEMPIERESTATUS -eq 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -eq 0 ] ; then echo - echo "ADempiere is running:" + echo "iDempiere is running:" ps ax | grep -v grep | grep $EXECDIR | sed 's/^[[:space:]]*\([[:digit:]]*\).*:[[:digit:]][[:digit:]][[:space:]]\(.*\)/\1 \2/' echo else - echo "ADempiere is stopped" + echo "iDempiere is stopped" fi } diff --git a/org.adempiere.server-feature/utils.unix/unix/adempiere_RedHat.sh b/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh similarity index 70% rename from org.adempiere.server-feature/utils.unix/unix/adempiere_RedHat.sh rename to org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh index a1d72af159..1ce5d4318d 100644 --- a/org.adempiere.server-feature/utils.unix/unix/adempiere_RedHat.sh +++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# FileName: adempiere.init +# FileName: idempiere.init # Description: adempiere erp software startup and shutdown # Vendor: K.K. Alice # Created: 05. April 2004 @@ -8,7 +8,7 @@ # Updated: Carlos Ruiz - globalqss - tested in Redhat FC4 # Carlos Ruiz - globalqss - added timeout review of the log file # -# FileTarget: /etc/init.d/adempiere +# FileTarget: /etc/init.d/idempiere # FileOwner: root.root # FilePerms: 0755 # @@ -17,35 +17,35 @@ # initialization # adjust these variables to your environment -EXECDIR=/home/adempiere/Adempiere -ENVFILE=/home/adempiere/.bash_profile -ADEMPIEREUSER=adempiere +EXECDIR=/home/idempiere/iDempiere +ENVFILE=/home/idempiere/.bash_profile +IDEMPIEREUSER=idempiere # STOPMESSAGE="Halting VM" # Message when using java 5 STOPMESSAGE="INFO.*Server\].*Shutdown complete" # Message when using java 6 . /etc/rc.d/init.d/functions RETVAL=0 -ADEMPIERESTATUS= +IDEMPIERESTATUS= MAXITERATIONS=60 # 2 seconds every iteration, max wait 2 minutes) -getadempierestatus() { - ADEMPIERESTATUSSTRING=$(ps ax | grep -v grep | grep $EXECDIR) - echo $ADEMPIERESTATUSSTRING | grep -q $EXECDIR - ADEMPIERESTATUS=$? +getidempierestatus() { + IDEMPIERESTATUSSTRING=$(ps ax | grep -v grep | grep $EXECDIR) + echo $IDEMPIERESTATUSSTRING | grep -q $EXECDIR + IDEMPIERESTATUS=$? } start () { - getadempierestatus - if [ $ADEMPIERESTATUS -eq 0 ] ; then - echo "adempiere is already running" + getidempierestatus + if [ $IDEMPIERESTATUS -eq 0 ] ; then + echo "idempiere is already running" return 1 fi echo -n "Starting ADempiere ERP: " source $ENVFILE - export LOGFILE=$ADEMPIERE_HOME/jboss/server/adempiere/log/adempiere_`date +%Y%m%d%H%M%S`.log - su $ADEMPIEREUSER -c "mkdir -p $ADEMPIERE_HOME/jboss/server/adempiere/log" - su $ADEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2.sh &> $LOGFILE &" + export LOGFILE=$IDEMPIERE_HOME/log/idempiere_`date +%Y%m%d%H%M%S`.log + su $IDEMPIEREUSER -c "mkdir -p $IDEMPIERE_HOME/log" + su $IDEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2.sh &> $LOGFILE &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then # wait for server to be confirmed as started in logfile @@ -77,16 +77,16 @@ start () { } stop () { - getadempierestatus - if [ $ADEMPIERESTATUS -ne 0 ] ; then - echo "adempiere is already stopped" + getidempierestatus + if [ $IDEMPIERESTATUS -ne 0 ] ; then + echo "idempiere is already stopped" return 1 fi echo -n "Stopping ADempiere ERP: " source $ENVFILE - # export LASTLOG=`ls -t $ADEMPIERE_HOME/jboss/server/adempiere/log/adempiere_??????????????.log | head -1` - export LASTLOG=$ADEMPIERE_HOME/jboss/server/adempiere/log/server.log - su $ADEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2Stop.sh &> /dev/null &" + # export LASTLOG=`ls -t $IDEMPIERE_HOME/log/idempiere_??????????????.log | head -1` + export LASTLOG=$IDEMPIERE_HOME/log/server.log + su $IDEMPIEREUSER -c "cd $EXECDIR/utils;$EXECDIR/utils/RUN_Server2Stop.sh &> /dev/null &" RETVAL=$? if [ $RETVAL -eq 0 ] ; then # wait for server to be confirmed as halted in logfile @@ -109,15 +109,15 @@ stop () { # Adempiere didn't finish - try direct kill with signal 15, then signal 9 kill -15 `ps ax | grep -v grep | grep $EXECDIR | sed -e 's/^ *//g' | cut -f 1 -d " "` sleep 5 - getadempierestatus - if [ $ADEMPIERESTATUS -ne 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -ne 0 ] ; then echo_success else echo "Trying direct kill with signal -9" kill -9 `ps ax | grep -v grep | grep $EXECDIR | sed -e 's/^ *//g' | cut -f 1 -d " "` sleep 5 - getadempierestatus - if [ $ADEMPIERESTATUS -ne 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -ne 0 ] ; then echo_success else echo_warning @@ -141,21 +141,21 @@ restart () { } condrestart () { - getadempierestatus - if [ $ADEMPIERESTATUS -eq 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -eq 0 ] ; then restart fi } rhstatus () { - getadempierestatus - if [ $ADEMPIERESTATUS -eq 0 ] ; then + getidempierestatus + if [ $IDEMPIERESTATUS -eq 0 ] ; then echo - echo "adempiere is running:" + echo "idempiere is running:" ps ax | grep -v grep | grep $EXECDIR | sed 's/^[[:space:]]*\([[:digit:]]*\).*:[[:digit:]][[:digit:]][[:space:]]\(.*\)/\1 \2/' echo else - echo "adempiere is stopped" + echo "idempiere is stopped" fi } diff --git a/org.adempiere.server-feature/utils.unix/unix/adempiere_as_service_in_linux.txt b/org.adempiere.server-feature/utils.unix/unix/idempiere_as_service_in_linux.txt similarity index 68% rename from org.adempiere.server-feature/utils.unix/unix/adempiere_as_service_in_linux.txt rename to org.adempiere.server-feature/utils.unix/unix/idempiere_as_service_in_linux.txt index 0eb3d95eb0..e07cb737a6 100644 --- a/org.adempiere.server-feature/utils.unix/unix/adempiere_as_service_in_linux.txt +++ b/org.adempiere.server-feature/utils.unix/unix/idempiere_as_service_in_linux.txt @@ -1,11 +1,11 @@ Date: 2004-05-05 21:59 Sender: kkalice -Here is a startup sript we made for the adempiere server +Here is a startup sript we made for the idempiere server (running on Fedora Core 1). -It assumes there is a user "adempiere" with a home directory -"/opt/adempiere" who has all the necessary environment -settings in "/opt/adempiere/.bash_profile". +It assumes there is a user "idempiere" with a home directory +"/opt/idempiere" who has all the necessary environment +settings in "/opt/idempiere/.bash_profile". The script will have to be adjusted to your own environment by setting the appropriate variables. @@ -15,7 +15,7 @@ echoing "[OK]" to the screen. A major disadvantage is that it runs the server as root, which is necessary to log the output to the -/var/log/adempiere.log. +/var/log/idempiere.log. ------ @@ -23,7 +23,7 @@ Date: 2006-12-17 13:10 Sender: Carlos Ruiz - globalqss Modified the startup script: -- now it makes su to adempiere user +- now it makes su to idempiere user - create the log based on date/time - timeout added - tested with Fedora Core 4 diff --git a/org.adempiere.server-feature/utils.windows/RUN_DBExport.bat b/org.adempiere.server-feature/utils.windows/RUN_DBExport.bat index d3cb43cb7e..6a88492a3c 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_DBExport.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_DBExport.bat @@ -1,5 +1,5 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Export Adempiere Database - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Export Adempiere Database - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem @Rem $Id: RUN_DBExport.bat,v 1.16 2005/04/27 17:45:02 jjanke Exp $ @Rem @@ -9,7 +9,7 @@ @Rem call %ADEMPIERE_DB_PATH%\DBExportFull system/%ADEMPIERE_DB_SYSTEM% @Echo If the following statement fails, fix your environment -IF (%ADEMPIERE_HOME%) == () (CALL myDBcopy.bat) else (CALL %ADEMPIERE_HOME%\utils\myDBcopy.bat) +IF (%IDEMPIERE_HOME%) == () (CALL myDBcopy.bat) else (CALL %IDEMPIERE_HOME%\utils\myDBcopy.bat) @Rem Sleep 60 @CHOICE /C YN /T 60 /D N > NUL diff --git a/org.adempiere.server-feature/utils.windows/RUN_DBExportdp.bat b/org.adempiere.server-feature/utils.windows/RUN_DBExportdp.bat index 0493f298d5..dd10705def 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_DBExportdp.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_DBExportdp.bat @@ -1,5 +1,5 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Export Adempiere Database - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Export Adempiere Database - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem @Rem $Id: RUN_DBExport.bat,v 1.16 2005/04/27 17:45:02 jjanke Exp $ @Rem @@ -9,7 +9,7 @@ @Rem call %ADEMPIERE_DB_PATH%\DBExportFulldp system/%ADEMPIERE_DB_SYSTEM% @Echo If the following statement fails, fix your environment -IF (%ADEMPIERE_HOME%) == () (CALL myDBcopy.bat) else (CALL %ADEMPIERE_HOME%\utils\myDBcopy.bat) +IF (%IDEMPIERE_HOME%) == () (CALL myDBcopy.bat) else (CALL %IDEMPIERE_HOME%\utils\myDBcopy.bat) @Rem Sleep 60 @CHOICE /C YN /T 60 /D N > NUL diff --git a/org.adempiere.server-feature/utils.windows/RUN_DBRestore.bat b/org.adempiere.server-feature/utils.windows/RUN_DBRestore.bat index 414963ecc8..47ad85f82d 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_DBRestore.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_DBRestore.bat @@ -1,11 +1,11 @@ @Rem $Id: RUN_DBRestore.bat,v 1.13 2005/01/22 21:59:15 jjanke Exp $ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Restore Adempiere Database from Export - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Restore Adempiere Database from Export - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) -@echo Re-Create Adempiere User and import %ADEMPIERE_HOME%\data\ExpDat.dmp -@dir %ADEMPIERE_HOME%\data\ExpDat.dmp +@echo Re-Create Adempiere User and import %IDEMPIERE_HOME%\data\ExpDat.dmp +@dir %IDEMPIERE_HOME%\data\ExpDat.dmp @echo == The import will show warnings. This is OK == @pause @@ -13,6 +13,4 @@ @Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle) @call %ADEMPIERE_DB_PATH%\DBRestore system/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM% -@Call %ADEMPIERE_HOME%\utils\RUN_SignDatabaseBuild.bat > NUL 2>&1 - @pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_DBRestoredp.bat b/org.adempiere.server-feature/utils.windows/RUN_DBRestoredp.bat index 043a36bb93..fd7ab226ad 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_DBRestoredp.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_DBRestoredp.bat @@ -1,11 +1,11 @@ @Rem $Id: RUN_DBRestore.bat,v 1.13 2005/01/22 21:59:15 jjanke Exp $ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Restore Adempiere Database from Export - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Restore Adempiere Database from Export - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) -@echo Re-Create Adempiere User and import %ADEMPIERE_HOME%\data\ExpDat.dmp -@dir %ADEMPIERE_HOME%\data\ExpDat.dmp +@echo Re-Create Adempiere User and import %IDEMPIERE_HOME%\data\ExpDat.dmp +@dir %IDEMPIERE_HOME%\data\ExpDat.dmp @echo == The import will show warnings. This is OK == @pause @@ -13,6 +13,4 @@ @Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle) @call %ADEMPIERE_DB_PATH%\DBRestoredp system/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM% -@Call %ADEMPIERE_HOME%\utils\RUN_SignDatabaseBuild.bat > NUL 2>&1 - @pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_DBStart.bat b/org.adempiere.server-feature/utils.windows/RUN_DBStart.bat index ab393389d1..b187043425 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_DBStart.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_DBStart.bat @@ -1,10 +1,10 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Start DataBase Service - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Start DataBase Service - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem $Id: RUN_DBStart.bat,v 1.6 2005/01/22 21:59:15 jjanke Exp $ @CALL %ADEMPIERE_DB_PATH%\Start.bat -@Echo Done starting database %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@Echo Done starting database %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem Sleep 60 @CHOICE /C YN /T 60 /D N > NUL \ No newline at end of file diff --git a/org.adempiere.server-feature/utils.windows/RUN_DBStop.bat b/org.adempiere.server-feature/utils.windows/RUN_DBStop.bat index 9012cd7748..c6b1d6e33c 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_DBStop.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_DBStop.bat @@ -1,10 +1,10 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Stop DataBase Service - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Stop DataBase Service - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem $Id: RUN_DBStop.bat,v 1.5 2005/01/22 21:59:15 jjanke Exp $ @CALL %ADEMPIERE_DB_PATH%\Stop.bat -@Echo Done stopping database %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@Echo Done stopping database %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem Sleep 60 @CHOICE /C YN /T 60 /D N > NUL \ No newline at end of file diff --git a/org.adempiere.server-feature/utils.windows/RUN_Env.bat b/org.adempiere.server-feature/utils.windows/RUN_Env.bat index ae12084340..7ff8813726 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_Env.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_Env.bat @@ -2,7 +2,7 @@ @Rem $Id: RUN_Env.bat,v 1.16 2005/01/22 21:59:15 jjanke Exp $ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat) @Echo General ... @Echo PATH = %PATH% @@ -10,7 +10,7 @@ @Echo . @Echo Homes ... -@Echo ADEMPIERE_HOME = %ADEMPIERE_HOME% +@Echo IDEMPIERE_HOME = %IDEMPIERE_HOME% @Echo JAVA_HOME = %JAVA_HOME% @Echo ADEMPIERE_DB_URL = %ADEMPIERE_DB_URL% diff --git a/org.adempiere.server-feature/utils.windows/RUN_GetAdempiereTemplate.bat b/org.adempiere.server-feature/utils.windows/RUN_GetAdempiereTemplate.bat deleted file mode 100644 index c3eb1e54ce..0000000000 --- a/org.adempiere.server-feature/utils.windows/RUN_GetAdempiereTemplate.bat +++ /dev/null @@ -1,22 +0,0 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Download Adempiere.jar Database into %ADEMPIERE_HOME%\data - -@Rem $Id: RUN_GetAdempiereTemplate.bat,v 1.1 2002/10/08 04:31:20 jjanke Exp $ - -@Echo Download Adempiere.jar Database into %ADEMPIERE_HOME%\data - -@ping @ADEMPIERE_FTP_SERVER@ -@cd %ADEMPIERE_HOME%\data -@del Adempiere.jar - -@ftp -s:%ADEMPIERE_HOME%\utils\ftpGetAdempiere.txt - -@Echo Unpacking ... -@jar xvf Adempiere.jar - -@Echo ........ Received - -@cd %ADEMPIERE_HOME%\utils -@START RUN_ImportAdempiere.bat - -@pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_ImportAdempiere.bat b/org.adempiere.server-feature/utils.windows/RUN_ImportAdempiere.bat deleted file mode 100644 index 019ce11c5b..0000000000 --- a/org.adempiere.server-feature/utils.windows/RUN_ImportAdempiere.bat +++ /dev/null @@ -1,18 +0,0 @@ -@Rem $Id: RUN_ImportAdempiere.bat,v 1.12 2005/01/22 21:59:15 jjanke Exp $ - -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Import Adempiere - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) - - -@echo Re-Create Adempiere User and import %ADEMPIERE_HOME%\data\Adempiere.dmp - (%ADEMPIERE_DB_NAME%) -@dir %ADEMPIERE_HOME%\data\Adempiere.dmp -@echo == The import will show warnings. This is OK == -@pause - -@Rem Parameter: -@Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle) -@call %ADEMPIERE_DB_PATH%\ImportAdempiere system/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM% - -@call %ADEMPIERE_HOME%\utils\RUN_SignDatabaseBuild > NUL 2>&1 - -@pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_ImportIdempiere.bat b/org.adempiere.server-feature/utils.windows/RUN_ImportIdempiere.bat new file mode 100644 index 0000000000..8190f7aa87 --- /dev/null +++ b/org.adempiere.server-feature/utils.windows/RUN_ImportIdempiere.bat @@ -0,0 +1,16 @@ +@Rem $Id: RUN_ImportIdempiere.bat,v 1.12 2005/01/22 21:59:15 jjanke Exp $ + +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Import idempiere - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) + + +@echo Re-Create idempiere User and import %IDEMPIERE_HOME%\data\Adempiere.dmp - (%ADEMPIERE_DB_NAME%) +@dir %IDEMPIERE_HOME%\data\Adempiere.dmp +@echo == The import will show warnings. This is OK == +@pause + +@Rem Parameter: +@Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle) +@call %ADEMPIERE_DB_PATH%\ImportIdempiere system/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM% + +@pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_ImportReference.bat b/org.adempiere.server-feature/utils.windows/RUN_ImportReference.bat index 50c03fd1e5..ffd0a96745 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_ImportReference.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_ImportReference.bat @@ -1,15 +1,15 @@ @Rem $Id: RUN_ImportReference.bat,v 1.11 2005/01/22 21:59:15 jjanke Exp $ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Import Reference - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Import Reference - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) -@echo Re-Create Reference User and import %ADEMPIERE_HOME%\data\Adempiere.dmp - (%ADEMPIERE_DB_NAME%) -@dir %ADEMPIERE_HOME%\data\Adempiere.dmp +@echo Re-Create Reference User and import %IDEMPIERE_HOME%\data\Adempiere.dmp - (%ADEMPIERE_DB_NAME%) +@dir %IDEMPIERE_HOME%\data\Adempiere.dmp @echo == The import will show warnings. This is OK == @pause @Rem Parameter: -@call %ADEMPIERE_DB_PATH%\ImportAdempiere system/%ADEMPIERE_DB_SYSTEM% reference reference +@call %ADEMPIERE_DB_PATH%\ImportIdempiere system/%ADEMPIERE_DB_SYSTEM% reference reference @pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_Migrate.bat b/org.adempiere.server-feature/utils.windows/RUN_Migrate.bat deleted file mode 100644 index 1198844a1d..0000000000 --- a/org.adempiere.server-feature/utils.windows/RUN_Migrate.bat +++ /dev/null @@ -1 +0,0 @@ -Start /MIN http://www.adempiere.com/wiki/index.php/Migration \ No newline at end of file diff --git a/org.adempiere.server-feature/utils.windows/RUN_PostMigration.bat b/org.adempiere.server-feature/utils.windows/RUN_PostMigration.bat new file mode 100644 index 0000000000..13cceeadbd --- /dev/null +++ b/org.adempiere.server-feature/utils.windows/RUN_PostMigration.bat @@ -0,0 +1,6 @@ +@Title ... Post Migration +@Echo off + +cd %IDEMPIERE_HOME% + +idempiere --launcher.ini setup.ini -application org.adempiere.base.PostMigration -consoleLog diff --git a/org.adempiere.server-feature/utils.windows/RUN_PutExportTemplate.bat b/org.adempiere.server-feature/utils.windows/RUN_PutExportTemplate.bat deleted file mode 100644 index 03cd2f82da..0000000000 --- a/org.adempiere.server-feature/utils.windows/RUN_PutExportTemplate.bat +++ /dev/null @@ -1,23 +0,0 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Export Database ExpDat.jar - %ADEMPIERE_HOME% - -@Rem $Id: RUN_PutExportTemplate.bat,v 1.3 2002/10/22 14:56:40 jjanke Exp $ - -@Echo ........ Export DB -@call %ADEMPIERE_DB_PATH%\DBExport %ADEMPIERE_DB_USER%/%ADEMPIERE_DB_PASSWORD% - -@Rem Echo ........ Stop DB -@Rem sqlplus "system/%ADEMPIERE_DB_SYSTEM% AS SYSDBA" @%ADEMPIERE_HOME%\utils\%ADEMPIERE_BP_PATH%\Stop.sql - -@Title Transafer Database ExpDat.jar - %ADEMPIERE_HOME%\data -@Echo Transfer Database ExpDat.jar - %ADEMPIERE_HOME%\data - -@Echo ........ FTP -@ping @ADEMPIERE_FTP_SERVER@ -@cd %ADEMPIERE_HOME%\data -@dir ExpDat.* - -@ftp -s:%ADEMPIERE_HOME%\utils\ftpPutExport.txt - -@Echo ........ Done -@pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_Server2.bat b/org.adempiere.server-feature/utils.windows/RUN_Server2.bat index 6dedb24272..b9e46a295c 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_Server2.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_Server2.bat @@ -1,5 +1,5 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Adempiere Server Start - %ADEMPIERE_HOME% (%ADEMPIERE_APPS_TYPE%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Adempiere Server Start - %IDEMPIERE_HOME% (%ADEMPIERE_APPS_TYPE%) @Rem $Id: RUN_Server2.bat,v 1.24 2005/10/26 00:38:18 jjanke Exp $ @@ -20,6 +20,6 @@ @Rem SET SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure @SET SECURE= -VMARGS="-Dosgi.compatibility.bootdelegation=true -Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DADEMPIERE_HOME=%ADEMPIERE_HOME%" +VMARGS="-Dosgi.compatibility.bootdelegation=true -Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DIDEMPIERE_HOME=%IDEMPIERE_HOME%" # headless option if you don't have X installed on the server -@"%JAVA%" -server %VMARGS% -jar %ADEMPIERE_HOME%/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -install %ADEMPIERE_HOME%/osgi -configuration %ADEMPIERE_HOME%/osgi/server -clean -console +@"%JAVA%" -server %VMARGS% -jar %IDEMPIERE_HOME%/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -install %IDEMPIERE_HOME%/osgi -configuration %IDEMPIERE_HOME%/osgi/server -clean -console diff --git a/org.adempiere.server-feature/utils.windows/RUN_Server2Stop.bat b/org.adempiere.server-feature/utils.windows/RUN_Server2Stop.bat index db90ce0428..a91648cd67 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_Server2Stop.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_Server2Stop.bat @@ -1,5 +1,5 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Adempiere Server Stop - %ADEMPIERE_HOME% +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Adempiere Server Stop - %IDEMPIERE_HOME% @Rem $Id: RUN_Server2Stop.bat,v 1.12 2005/09/06 02:46:16 jjanke Exp $ @@ -10,12 +10,12 @@ @Set NOPAUSE=Yes @Set JBOSS_LIB=%JBOSS_HOME%\lib @Set JBOSS_SERVERLIB=%JBOSS_HOME%\server\adempiere\lib -@Set JBOSS_CLASSPATH=%ADEMPIERE_HOME%\lib\jboss.jar;%JBOSS_LIB%\jboss-system.jar +@Set JBOSS_CLASSPATH=%IDEMPIERE_HOME%\lib\jboss.jar;%JBOSS_LIB%\jboss-system.jar @CD %JBOSS_HOME%\bin Call shutdown --server=jnp://%ADEMPIERE_APPS_SERVER%:%ADEMPIERE_JNP_PORT% --shutdown -@Echo Done Stopping Adempiere Apps Server %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@Echo Done Stopping Adempiere Apps Server %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @GOTO END :UNSUPPORTED diff --git a/org.adempiere.server-feature/utils.windows/RUN_SignDatabaseBuild.bat b/org.adempiere.server-feature/utils.windows/RUN_SignDatabaseBuild.bat deleted file mode 100644 index 462d687e18..0000000000 --- a/org.adempiere.server-feature/utils.windows/RUN_SignDatabaseBuild.bat +++ /dev/null @@ -1,14 +0,0 @@ -@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 (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat) - -@Set JAVA=%JAVA_HOME%\bin\java - -@Echo ======================================= -@Echo Sign Database Build -@Echo ======================================= -@SET CP=%ADEMPIERE_HOME%\lib\CInstall.jar;%ADEMPIERE_HOME%\lib\Adempiere.jar;%ADEMPIERE_HOME%\lib\CCTools.jar;%ADEMPIERE_HOME%\lib\oracle.jar;%ADEMPIERE_HOME%\lib\jboss.jar;%ADEMPIERE_HOME%\lib\postgresql.jar; - -@"%JAVA%" -classpath %CP% -DADEMPIERE_HOME=%ADEMPIERE_HOME% org.adempiere.process.SignDatabaseBuild diff --git a/org.adempiere.server-feature/utils.windows/RUN_Start.bat b/org.adempiere.server-feature/utils.windows/RUN_Start.bat index d4c8d27f5c..a92462a21d 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_Start.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_Start.bat @@ -1,9 +1,9 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Start Adempiere - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Start Adempiere - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem $Id: RUN_Start.bat,v 1.11 2005/01/22 21:59:15 jjanke Exp $ @Echo Starting Database @CALL %ADEMPIERE_DB_PATH%\Start.bat -@START %ADEMPIERE_HOME%\utils\RUN_Server2.bat +@START %IDEMPIERE_HOME%\utils\RUN_Server2.bat diff --git a/org.adempiere.server-feature/utils.windows/RUN_Stop.bat b/org.adempiere.server-feature/utils.windows/RUN_Stop.bat index 234ce55e42..21206fa7e7 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_Stop.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_Stop.bat @@ -1,9 +1,9 @@ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Stop Adempiere - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Stop Adempiere - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @Rem $Id: RUN_Stop.bat,v 1.11 2005/01/22 21:59:15 jjanke Exp $ -@CALL %ADEMPIERE_HOME%\utils\RUN_Server2Stop.bat +@CALL %IDEMPIERE_HOME%\utils\RUN_Server2Stop.bat @CALL %ADEMPIERE_DB_PATH%\Stop.bat diff --git a/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat b/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat index eeae0bb593..9d8b189d2f 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat @@ -1,10 +1,10 @@ @Rem $Id: RUN_TrlExport.bat,v 1.4 2005/09/16 00:49:37 jjanke Exp $ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Export Translation - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Export Translation - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @SET AD_LANGUAGE=de_DE -@SET DIRECTORY=%ADEMPIERE_HOME%\data\%AD_LANGUAGE% +@SET DIRECTORY=%IDEMPIERE_HOME%\data\%AD_LANGUAGE% @echo This Procedure exports language %AD_LANGUAGE% into directory %DIRECTORY% @pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat b/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat index f670824453..1c071c8836 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat @@ -1,10 +1,10 @@ @Rem $Id: RUN_TrlImport.bat,v 1.4 2005/09/16 00:49:37 jjanke Exp $ -@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) -@Title Import Translation - %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) +@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) +@Title Import Translation - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%) @SET AD_LANGUAGE=de_DE -@SET DIRECTORY=%ADEMPIERE_HOME%\data\%AD_LANGUAGE% +@SET DIRECTORY=%IDEMPIERE_HOME%\data\%AD_LANGUAGE% @echo This Procedure imports language %AD_LANGUAGE% from directory %DIRECTORY% @pause diff --git a/org.adempiere.server-feature/utils.windows/RUN_WinEnvTemplate.bat b/org.adempiere.server-feature/utils.windows/RUN_WinEnvTemplate.bat index ba0e5f13f8..e61ecdb6a5 100644 --- a/org.adempiere.server-feature/utils.windows/RUN_WinEnvTemplate.bat +++ b/org.adempiere.server-feature/utils.windows/RUN_WinEnvTemplate.bat @@ -5,5 +5,5 @@ @Echo Setup Client Environment @Echo =================================== -@cscript //nologo @ADEMPIERE_HOME@\utils\WinEnv.js "@ADEMPIERE_HOME@" "@JAVA_HOME@" +@cscript //nologo @IDEMPIERE_HOME@\utils\WinEnv.js "@IDEMPIERE_HOME@" "@JAVA_HOME@" diff --git a/org.adempiere.server-feature/utils.windows/WinEnv.js b/org.adempiere.server-feature/utils.windows/WinEnv.js index 686bbe75b4..4c2b3137ad 100644 --- a/org.adempiere.server-feature/utils.windows/WinEnv.js +++ b/org.adempiere.server-feature/utils.windows/WinEnv.js @@ -1,4 +1,4 @@ -// Usage: WinEnv ADEMPIERE_HOME JAVA_HOME +// Usage: WinEnv IDEMPIERE_HOME JAVA_HOME // Example: WinEnv C:\Adempiere C:\Program Files\Java\jdk1.5.0_05 // Example: cscript WinEnv.js C:\Adempiere C:\Program Files\Java\jdk1.5.0_05 // @@ -15,7 +15,7 @@ var SysEnv = Shell.Environment("SYSTEM"); if (Args.length != 2) { - WScript.Echo("Usage: cscript WinEnv.js ADEMPIERE_HOME JAVA_HOME" + WScript.Echo("Usage: cscript WinEnv.js IDEMPIERE_HOME JAVA_HOME" + "\nExample:\ncscript WinEnv.js C:\\Adempiere \"C:\\Program Files\\Java\\jdk1.5.0_05\""); WScript.Quit (1); } @@ -23,8 +23,8 @@ if (Args.length != 2) // Set Environment Variables var home = Args(0).replace("\"",""); -SysEnv("ADEMPIERE_HOME") = home; -WScript.Echo ("SET ADEMPIERE_HOME="+ home); +SysEnv("IDEMPIERE_HOME") = home; +WScript.Echo ("SET IDEMPIERE_HOME="+ home); home = Args(1).replace("\"",""); SysEnv("JAVA_HOME") = home; diff --git a/org.adempiere.server-feature/utils.windows/myDBcopyTemplate.bat b/org.adempiere.server-feature/utils.windows/myDBcopyTemplate.bat index 3bfb596ce8..552d0ce3b4 100644 --- a/org.adempiere.server-feature/utils.windows/myDBcopyTemplate.bat +++ b/org.adempiere.server-feature/utils.windows/myDBcopyTemplate.bat @@ -8,16 +8,16 @@ @Rem Note that the %DATE% parameter is local specific. @Rem In Germany, it is %DATE:~3,2% @Rem When called, the following files were created: -@Rem %ADEMPIERE_HOME%\data\ExpDat.dmp -@Rem %ADEMPIERE_HOME%\data\ExpDat.log -@Rem %ADEMPIERE_HOME%\data\ExpDat.jar (containing the above) +@Rem %IDEMPIERE_HOME%\data\ExpDat.dmp +@Rem %IDEMPIERE_HOME%\data\ExpDat.log +@Rem %IDEMPIERE_HOME%\data\ExpDat.jar (containing the above) @set DATETIME=%date:~6,4%%date:~3,2%%date:~0,2%_%TIME:~0,2%%TIME:~3,2%%TIME:~6,2% @Echo Creating ExpDat_%DATETIME%.jar ren ExpDat.jar "ExpDat%DATETIME%.jar" @dir ExpDat%DATETIME%.jar -@Echo copy %ADEMPIERE_HOME%\data\ExpDat%DATETIME%.jar to backup media +@Echo copy %IDEMPIERE_HOME%\data\ExpDat%DATETIME%.jar to backup media @Rem Sleep 30 @CHOICE /C YN /T 30 /D N > NUL \ No newline at end of file diff --git a/org.adempiere.server-feature/utils.windows/myEnvironmentTemplate.bat b/org.adempiere.server-feature/utils.windows/myEnvironmentTemplate.bat index 8bc5bde1d5..9b36e362b5 100644 --- a/org.adempiere.server-feature/utils.windows/myEnvironmentTemplate.bat +++ b/org.adempiere.server-feature/utils.windows/myEnvironmentTemplate.bat @@ -5,14 +5,14 @@ @Echo Setting myEnvironment .... @Rem Clients only needs -@Rem ADEMPIERE_HOME +@Rem IDEMPIERE_HOME @Rem JAVA_HOME @Rem Server install needs to check @Rem ADEMPIERE_DB_NAME (for Oracle) @Rem passwords @Rem Homes ... -@SET ADEMPIERE_HOME=@ADEMPIERE_HOME@ +@SET IDEMPIERE_HOME=@IDEMPIERE_HOME@ @SET JAVA_HOME=@JAVA_HOME@ @@ -29,8 +29,8 @@ @SET ADEMPIERE_DB_SYSTEM=@ADEMPIERE_DB_SYSTEM@ @Rem Homes(2) -@SET ADEMPIERE_DB_HOME=@ADEMPIERE_HOME@\utils\@ADEMPIERE_DB_TYPE@ -@SET JBOSS_HOME=@ADEMPIERE_HOME@\jboss +@SET ADEMPIERE_DB_HOME=@IDEMPIERE_HOME@\utils\@ADEMPIERE_DB_TYPE@ +@SET JBOSS_HOME=@IDEMPIERE_HOME@\jboss @Rem Apps Server @SET ADEMPIERE_APPS_TYPE=@ADEMPIERE_APPS_TYPE@ @@ -44,14 +44,10 @@ @SET ADEMPIERE_KEYSTOREWEBALIAS=@ADEMPIERE_KEYSTOREWEBALIAS@ @SET ADEMPIERE_KEYSTOREPASS=@ADEMPIERE_KEYSTOREPASS@ -@Rem etc. -@SET ADEMPIERE_FTP_SERVER=@ADEMPIERE_FTP_SERVER@ -@SET ADEMPIERE_FTP_USER=@ADEMPIERE_FTP_USER@ - @Rem Java @SET ADEMPIERE_JAVA=@JAVA_HOME@\bin\java -@SET ADEMPIERE_JAVA_OPTIONS=@ADEMPIERE_JAVA_OPTIONS@ -DADEMPIERE_HOME=@ADEMPIERE_HOME@ -@SET CLASSPATH="@ADEMPIERE_HOME@\lib\Adempiere.jar;@ADEMPIERE_HOME@\lib\AdempiereCLib.jar;" +@SET ADEMPIERE_JAVA_OPTIONS=@ADEMPIERE_JAVA_OPTIONS@ -DIDEMPIERE_HOME=@IDEMPIERE_HOME@ +@SET CLASSPATH="@IDEMPIERE_HOME@\lib\Adempiere.jar;@IDEMPIERE_HOME@\lib\AdempiereCLib.jar;" @Rem Save Environment file @if (%1) == () copy myEnvironment.bat myEnvironment_%RANDOM%.bat /Y diff --git a/org.adempiere.server-feature/utils.windows/oracle/DBExport.bat b/org.adempiere.server-feature/utils.windows/oracle/DBExport.bat index bc6e6583d2..de8d5a76d8 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/DBExport.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/DBExport.bat @@ -2,9 +2,9 @@ @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 +@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %IDEMPIERE_HOME%\data\ExpDat.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -12,12 +12,12 @@ @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 +@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 +@exp %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%IDEMPIERE_HOME%\data\ExpDat.dmp Log=%IDEMPIERE_HOME%\data\ExpDat.log CONSISTENT=Y STATISTICS=NONE OWNER=%1 -@cd %ADEMPIERE_HOME%\Data +@cd %IDEMPIERE_HOME%\Data @copy ExpDat.jar ExpDatOld.jar @jar cvfM ExpDat.jar ExpDat.dmp ExpDat.log @@ -25,7 +25,7 @@ :environment @Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\Adempiere +@Echo IDEMPIERE_HOME e.g. D:\Adempiere @Echo ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org :usage diff --git a/org.adempiere.server-feature/utils.windows/oracle/DBExportFull.bat b/org.adempiere.server-feature/utils.windows/oracle/DBExportFull.bat index 874666c854..a830f0b3c7 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/DBExportFull.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/DBExportFull.bat @@ -2,9 +2,9 @@ @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 +@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %IDEMPIERE_HOME%\data\ExpDatFull.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -12,19 +12,19 @@ @if (%1) == () goto usage -@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql +@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 +@exp %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%IDEMPIERE_HOME%\data\ExpDatFull.dmp Log=%IDEMPIERE_HOME%\data\ExpDatFull.log CONSISTENT=Y STATISTICS=NONE FULL=Y -@cd %ADEMPIERE_HOME%\data +@cd %IDEMPIERE_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 IDEMPIERE_HOME e.g. D:\Adempiere @Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org :usage diff --git a/org.adempiere.server-feature/utils.windows/oracle/DBExportFulldp.bat b/org.adempiere.server-feature/utils.windows/oracle/DBExportFulldp.bat index 71a9c8a74c..7aa2c36c52 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/DBExportFulldp.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/DBExportFulldp.bat @@ -2,9 +2,9 @@ @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 +@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %IDEMPIERE_HOME%\data\ExpDatFull.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -14,18 +14,18 @@ @echo ------------------------------------- @echo Re-Create DataPump Directory @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateDataPumpDir.sql %ADEMPIERE_HOME%\data +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateDataPumpDir.sql %IDEMPIERE_HOME%\data @expdp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% DIRECTORY=ADEMPIERE_DATA_PUMP_DIR DUMPFILE=ExpDatFull.dmp LOGFILE=ExpDatFull.log EXCLUDE=STATISTICS FULL=Y -@cd %ADEMPIERE_HOME%\data +@cd %IDEMPIERE_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 IDEMPIERE_HOME e.g. D:\Adempiere @Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org :usage diff --git a/org.adempiere.server-feature/utils.windows/oracle/DBExportdp.bat b/org.adempiere.server-feature/utils.windows/oracle/DBExportdp.bat index 0af91f20ca..a4dc3000fa 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/DBExportdp.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/DBExportdp.bat @@ -2,9 +2,9 @@ @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 +@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %IDEMPIERE_HOME%\data\ExpDat.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -12,17 +12,17 @@ @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 +@sqlplus %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Daily.sql @echo ------------------------------------- @echo Re-Create DataPump Directory @echo ------------------------------------- -@sqlplus %3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateDataPumpDir.sql %ADEMPIERE_HOME%\data +@sqlplus %3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateDataPumpDir.sql %IDEMPIERE_HOME%\data @Rem The Export @expdp %1/%2@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% DIRECTORY=ADEMPIERE_DATA_PUMP_DIR DUMPFILE=ExpDat.dmp LOGFILE=ExpDat.log EXCLUDE=STATISTICS SCHEMAS=%1 -@cd %ADEMPIERE_HOME%\Data +@cd %IDEMPIERE_HOME%\Data @copy ExpDat.jar ExpDatOld.jar @jar cvfM ExpDat.jar ExpDat.dmp ExpDat.log @@ -30,7 +30,7 @@ :environment @Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\Adempiere +@Echo IDEMPIERE_HOME e.g. D:\Adempiere @Echo ADEMPIERE_DB_NAME e.g. adempiere.adempiere.org :usage diff --git a/org.adempiere.server-feature/utils.windows/oracle/DBRestore.bat b/org.adempiere.server-feature/utils.windows/oracle/DBRestore.bat index 82bc83639f..2a5967d326 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/DBRestore.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/DBRestore.bat @@ -2,9 +2,9 @@ @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 +@Echo Restoring Adempiere DB from %IDEMPIERE_HOME%\data\ExpDat.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -16,29 +16,29 @@ @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 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 +@imp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%IDEMPIERE_HOME%\data\ExpDat.dmp FROMUSER=(%2) TOUSER=%2 STATISTICS=RECALCULATE @echo ------------------------------------- @echo Create SQLJ @echo ------------------------------------- -@call %ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\create %ADEMPIERE_DB_USER%/%ADEMPIERE_DB_PASSWORD% +@call %IDEMPIERE_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 +@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 IDEMPIERE_HOME e.g. D:\Adempiere @Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org :usage diff --git a/org.adempiere.server-feature/utils.windows/oracle/DBRestoredp.bat b/org.adempiere.server-feature/utils.windows/oracle/DBRestoredp.bat index 2e7266f861..7ca2332b4e 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/DBRestoredp.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/DBRestoredp.bat @@ -2,9 +2,9 @@ @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 +@Echo Restoring Adempiere DB from %IDEMPIERE_HOME%\data\ExpDat.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -16,12 +16,12 @@ @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 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateUser.sql %2 %3 @echo ------------------------------------- @echo Re-Create DataPump Directory @echo ------------------------------------- -@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%ADEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateDataPumpDir.sql %ADEMPIERE_HOME%\data +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\CreateDataPumpDir.sql %IDEMPIERE_HOME%\data @echo ------------------------------------- @echo Import ExpDat @@ -31,19 +31,19 @@ @echo ------------------------------------- @echo Create SQLJ @echo ------------------------------------- -@call %ADEMPIERE_HOME%\Utils\%ADEMPIERE_DB_PATH%\create %ADEMPIERE_DB_USER%/%ADEMPIERE_DB_PASSWORD% +@call %IDEMPIERE_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 +@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 IDEMPIERE_HOME e.g. D:\Adempiere @Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org :usage diff --git a/org.adempiere.server-feature/utils.windows/oracle/ImportAdempiere.bat b/org.adempiere.server-feature/utils.windows/oracle/ImportIdempiere.bat similarity index 69% rename from org.adempiere.server-feature/utils.windows/oracle/ImportAdempiere.bat rename to org.adempiere.server-feature/utils.windows/oracle/ImportIdempiere.bat index a04d1b4eb9..42e0555432 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/ImportAdempiere.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/ImportIdempiere.bat @@ -1,10 +1,10 @@ -@Echo Adempiere Database Import $Revision: 1.9 $ +@Echo idempiere Database Import $Revision: 1.9 $ -@Rem $Id: ImportAdempiere.bat,v 1.9 2005/09/24 01:50:41 jjanke Exp $ +@Rem $Id: ImportIdempiere.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%) +@Echo Importing idempiere DB from %IDEMPIERE_HOME%\data\Adempiere.dmp (%ADEMPIERE_DB_NAME%) -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -16,28 +16,28 @@ @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 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 +@imp %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% FILE=%IDEMPIERE_HOME%\data\Adempiere.dmp FROMUSER=(reference) TOUSER=%2 STATISTICS=RECALCULATE @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 +@sqlplus %2/%3@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 IDEMPIERE_HOME e.g. D:\idempiere @Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org :usage @echo Usage: %0 -@echo Example: %0 system/manager Adempiere Adempiere +@echo Example: %0 system/manager idempiere idempiere :end diff --git a/org.adempiere.server-feature/utils.windows/oracle/ImportReference.bat b/org.adempiere.server-feature/utils.windows/oracle/ImportReference.bat index 0e1ea1c96a..86dc8242dd 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/ImportReference.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/ImportReference.bat @@ -2,9 +2,9 @@ @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 +@Echo Importing Reference DB from %IDEMPIERE_HOME%\data\Reference.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -14,24 +14,24 @@ @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 +@sqlplus %1@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 +imp %1@%ADEMPIERE_DB_NAME% FILE=%IDEMPIERE_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 +@sqlplus reference/adempiere@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% @%IDEMPIERE_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 IDEMPIERE_HOME e.g. D:\Adempiere @Echo ADEMPIERE_DB_NAME e.g. dev1.adempiere.org :usage diff --git a/org.adempiere.server-feature/utils.windows/oracle/Start.bat b/org.adempiere.server-feature/utils.windows/oracle/Start.bat index af58d01cf6..244bb8f00f 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/Start.bat +++ b/org.adempiere.server-feature/utils.windows/oracle/Start.bat @@ -4,7 +4,7 @@ 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 +@sqlplus "system/%ADEMPIERE_DB_SYSTEM%@%ADEMPIERE_DB_SERVER%:%ADEMPIERE_DB_PORT%/%ADEMPIERE_DB_NAME% AS SYSDBA" @%IDEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Start.sql @Echo Starting optional agent .... agentctl start diff --git a/org.adempiere.server-feature/utils.windows/oracle/Stop.bat b/org.adempiere.server-feature/utils.windows/oracle/Stop.bat index 6a663d6e44..358cfb81d9 100644 --- a/org.adempiere.server-feature/utils.windows/oracle/Stop.bat +++ b/org.adempiere.server-feature/utils.windows/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_PORT%/%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" @%IDEMPIERE_HOME%\utils\%ADEMPIERE_DB_PATH%\Stop.sql @Echo Stopping Listener .... lsnrctl stop diff --git a/org.adempiere.server-feature/utils.windows/postgresql/DBExport.bat b/org.adempiere.server-feature/utils.windows/postgresql/DBExport.bat index a54a355c38..2f79202db5 100644 --- a/org.adempiere.server-feature/utils.windows/postgresql/DBExport.bat +++ b/org.adempiere.server-feature/utils.windows/postgresql/DBExport.bat @@ -2,9 +2,9 @@ @Rem $Id: DBExport.bat,v 1.2 2005/01/22 21:59:15 jjanke Exp $ -@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %ADEMPIERE_HOME%\data\ExpDat.dmp +@Echo Saving database %1@%ADEMPIERE_DB_NAME% to %IDEMPIERE_HOME%\data\ExpDat.dmp -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -12,17 +12,17 @@ @if (%1) == () goto usage @set PGPASSWORD=%2 -pg_dump -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -U %1 %ADEMPIERE_DB_NAME% > %ADEMPIERE_HOME%\data\ExpDat.dmp +pg_dump -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -U %1 %ADEMPIERE_DB_NAME% > %IDEMPIERE_HOME%\data\ExpDat.dmp @set PGPASSWORD= -@cd %ADEMPIERE_HOME%\Data +@cd %IDEMPIERE_HOME%\Data @jar cvfM ExpDat.jar ExpDat.dmp @goto end :environment @Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\ADEMPIERE2 +@Echo IDEMPIERE_HOME e.g. D:\ADEMPIERE2 @Echo ADEMPIERE_DB_NAME e.g. adempiere or xe @Echo ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org @Echo ADEMPIERE_DB_PORT e.g. 5432 or 1521 diff --git a/org.adempiere.server-feature/utils.windows/postgresql/DBRestore.bat b/org.adempiere.server-feature/utils.windows/postgresql/DBRestore.bat index 5e932927b5..0d834bb32e 100644 --- a/org.adempiere.server-feature/utils.windows/postgresql/DBRestore.bat +++ b/org.adempiere.server-feature/utils.windows/postgresql/DBRestore.bat @@ -1,8 +1,8 @@ @Echo ADempiere Database Import -@Echo Importing ADempiere DB from %ADEMPIERE_HOME%\data\ExpDat.dmp (%ADEMPIERE_DB_NAME%) +@Echo Importing ADempiere DB from %IDEMPIERE_HOME%\data\ExpDat.dmp (%ADEMPIERE_DB_NAME%) -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -31,7 +31,7 @@ @psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -c "drop schema sqlj cascade" @set ADEMPIERE_ALTER_ROLE_SQL="ALTER ROLE %2 SET search_path TO adempiere, pg_catalog" @psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -c "%ADEMPIERE_ALTER_ROLE_SQL%" -@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -f %ADEMPIERE_HOME%/data/ExpDat.dmp +@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -f %IDEMPIERE_HOME%/data/ExpDat.dmp @set ADEMPIERE_ALTER_ROLE_SQL= @set PGPASSWORD= @@ -39,7 +39,7 @@ :environment @Echo Please make sure that the environment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\ADEMPIERE2 +@Echo IDEMPIERE_HOME e.g. D:\ADEMPIERE2 @Echo ADEMPIERE_DB_NAME e.g. adempiere or xe @Echo ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org @Echo ADEMPIERE_DB_PORT e.g. 5432 or 1521 diff --git a/org.adempiere.server-feature/utils.windows/postgresql/ImportAdempiere.bat b/org.adempiere.server-feature/utils.windows/postgresql/ImportIdempiere.bat similarity index 70% rename from org.adempiere.server-feature/utils.windows/postgresql/ImportAdempiere.bat rename to org.adempiere.server-feature/utils.windows/postgresql/ImportIdempiere.bat index b5e1e4d09d..09e33cc344 100644 --- a/org.adempiere.server-feature/utils.windows/postgresql/ImportAdempiere.bat +++ b/org.adempiere.server-feature/utils.windows/postgresql/ImportIdempiere.bat @@ -1,10 +1,10 @@ -@Echo Adempiere Database Import $Revision: 1.3 $ +@Echo idempiere Database Import $Revision: 1.3 $ -@Rem $Id: ImportAdempiere.bat,v 1.3 2005/01/22 21:59:15 jjanke Exp $ +@Rem $Id: ImportIdempiere.bat,v 1.3 2005/01/22 21:59:15 jjanke Exp $ -@Echo Importing Adempiere DB from %ADEMPIERE_HOME%\data\Adempiere_pg.dmp (%ADEMPIERE_DB_NAME%) +@Echo Importing idempiere DB from %IDEMPIERE_HOME%\data\Adempiere_pg.dmp (%ADEMPIERE_DB_NAME%) -@if (%ADEMPIERE_HOME%) == () goto environment +@if (%IDEMPIERE_HOME%) == () goto environment @if (%ADEMPIERE_DB_NAME%) == () goto environment @if (%ADEMPIERE_DB_SERVER%) == () goto environment @if (%ADEMPIERE_DB_PORT%) == () goto environment @@ -29,9 +29,9 @@ @echo ------------------------------------- @echo Import Adempiere_pg.dmp @echo ------------------------------------- -@set ADEMPIERE_ALTER_ROLE_SQL=ALTER ROLE %2 SET search_path TO adempiere, pg_catalog +@set ADEMPIERE_ALTER_ROLE_SQL=ALTER ROLE %2 SET search_path TO idempiere, pg_catalog @psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -c "%ADEMPIERE_ALTER_ROLE_SQL%" -@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -f %ADEMPIERE_HOME%/data/Adempiere_pg.dmp +@psql -h %ADEMPIERE_DB_SERVER% -p %ADEMPIERE_DB_PORT% -d %ADEMPIERE_DB_NAME% -U %2 -f %IDEMPIERE_HOME%/data/Adempiere_pg.dmp @set ADEMPIERE_ALTER_ROLE_SQL= @@ -40,13 +40,13 @@ :environment @Echo Please make sure that the enviroment variables are set correctly: -@Echo ADEMPIERE_HOME e.g. D:\ADEMPIERE2 -@Echo ADEMPIERE_DB_NAME e.g. adempiere or xe -@Echo ADEMPIERE_DB_SERVER e.g. dbserver.adempiere.org -@Echo ADEMPIERE_DB_PORT e.g. 5432 or 1521 +@Echo IDEMPIERE_HOME e.g. D:\idempiere +@Echo ADEMPIERE_DB_NAME e.g. adempiere +@Echo ADEMPIERE_DB_SERVER e.g. dbserver.idempiere.org +@Echo ADEMPIERE_DB_PORT e.g. 5432 :usage @echo Usage: %0 -@echo Example: %0 postgres Adempiere Adempiere postgresPwd +@echo Example: %0 postgres idempiere idempiere postgresPwd :end diff --git a/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Install.bat b/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Install.bat deleted file mode 100644 index 7f0b38c5e7..0000000000 --- a/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Install.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off - -REM Adempiere_Service_Install.bat - globalqss - based on http://javaservice.objectweb.org - -if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) - -%ADEMPIERE_HOME%\utils\windows\AdempiereService.exe -install ADempiere "%JAVA_HOME%\jre\bin\server\jvm.dll" -Xmx256M -Djava.class.path="%JAVA_HOME%\lib\tools.jar";"%ADEMPIERE_HOME%\jboss\bin\run.jar" -server %ADEMPIERE_JAVA_OPTIONS% -Djetty.port=%ADEMPIERE_WEB_PORT% -Djetty.ssl=%ADEMPIERE_SSL_PORT% -Djetty.keystore=%ADEMPIERE_KEYSTORE% -Djetty.password=%ADEMPIERE_KEYSTORE_PASSWORD% -start org.jboss.Main -params -c adempiere -b %ADEMPIERE_APPS_SERVER% -stop org.jboss.Main -method systemExit -out "%ADEMPIERE_HOME%\jboss\bin\out.txt" -current "%ADEMPIERE_HOME%\jboss\bin" -manual -overwrite -description "ADempiere JBoss server" - -rem IT DEPENDS ON OTHER SERVICE? -rem add this option for dependency with postgresql service (replace with proper service name) -rem -depends pgsql-8.2 -rem add this option for dependency with oracle service (replace with proper service name) -rem -depends oraclexe -rem NOTE: The -depends parameter must be put before -manual or -automatic parameter - -rem DO YOU WANT AUTOMATIC STARTUP? -rem replace -manual by -auto to make service run automatically on system startup - -rem other usefult options can be: -rem -err err_log_file -rem -shutdown seconds -rem -user user_name -rem -password password -rem -append or -overwrite -rem -description service_desc diff --git a/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Uninstall.bat b/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Uninstall.bat deleted file mode 100644 index a226e61312..0000000000 --- a/org.adempiere.server-feature/utils.windows/windows/Adempiere_Service_Uninstall.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off - -REM Adempiere_Service_Uninstall.bat - globalqss - based on http://javaservice.objectweb.org - -if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat Server) - -NET STOP Adempiere -%ADEMPIERE_HOME%\utils\windows\AdempiereService.exe -uninstall Adempiere diff --git a/org.adempiere.server-feature/utils.windows/windows/AdempiereService.exe b/org.adempiere.server-feature/utils.windows/windows/idempiereService.exe similarity index 100% rename from org.adempiere.server-feature/utils.windows/windows/AdempiereService.exe rename to org.adempiere.server-feature/utils.windows/windows/idempiereService.exe diff --git a/org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Install.bat b/org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Install.bat new file mode 100644 index 0000000000..d096f8308f --- /dev/null +++ b/org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Install.bat @@ -0,0 +1,25 @@ +@echo off + +REM idempiere_Service_Install.bat - globalqss - based on http://javaservice.objectweb.org + +if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) + +%IDEMPIERE_HOME%\utils\windows\idempiereService.exe -install idempiere "%JAVA_HOME%\jre\bin\server\jvm.dll" -Xmx256M -server %ADEMPIERE_JAVA_OPTIONS% -start idempiere -stop -method systemExit -out "%IDEMPIERE_HOME%\out.txt" -current "%IDEMPIERE_HOME%" -manual -overwrite -description "iDempiere server" + +rem IT DEPENDS ON OTHER SERVICE? +rem add this option for dependency with postgresql service (replace with proper service name) +rem -depends pgsql-8.4 +rem add this option for dependency with oracle service (replace with proper service name) +rem -depends oraclexe +rem NOTE: The -depends parameter must be put before -manual or -automatic parameter + +rem DO YOU WANT AUTOMATIC STARTUP? +rem replace -manual by -auto to make service run automatically on system startup + +rem other usefult options can be: +rem -err err_log_file +rem -shutdown seconds +rem -user user_name +rem -password password +rem -append or -overwrite +rem -description service_desc diff --git a/org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Uninstall.bat b/org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Uninstall.bat new file mode 100644 index 0000000000..59191b1a71 --- /dev/null +++ b/org.adempiere.server-feature/utils.windows/windows/idempiere_Service_Uninstall.bat @@ -0,0 +1,8 @@ +@echo off + +REM Adempiere_Service_Uninstall.bat - globalqss - based on http://javaservice.objectweb.org + +if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server) + +NET STOP Adempiere +%IDEMPIERE_HOME%\utils\windows\AdempiereService.exe -uninstall Adempiere diff --git a/org.adempiere.server/index.html b/org.adempiere.server/index.html index de6ee62fb9..a8b1b08a4c 100644 --- a/org.adempiere.server/index.html +++ b/org.adempiere.server/index.html @@ -1,7 +1,7 @@ - ADempiere - + iDempiere + diff --git a/org.adempiere.server/src/main/server/org/adempiere/server/Application.java b/org.adempiere.server/src/main/server/org/adempiere/server/Application.java index 28ecee0b8c..b18f5079cf 100644 --- a/org.adempiere.server/src/main/server/org/adempiere/server/Application.java +++ b/org.adempiere.server/src/main/server/org/adempiere/server/Application.java @@ -41,7 +41,7 @@ public class Application implements IApplication { String propertyFile = Ini.getFileName(false); File file = new File(propertyFile); if (!file.exists()) { - throw new IllegalStateException("Adempiere.properties file missing. Path="+file.getAbsolutePath()); + throw new IllegalStateException("idempiere.properties file missing. Path="+file.getAbsolutePath()); } if (!Adempiere.isStarted()) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml index 533f8f9d21..94cfdf2c4a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml +++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml @@ -19,7 +19,7 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI). org.adempiere.webui.AdempiereWebUI - 3.5 + 1.0.0 diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index e8f98e7e6d..0d5c173cd8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -80,9 +80,9 @@ public class AdempiereWebUI extends Window implements EventListener, IWeb */ private static final long serialVersionUID = 3744725245132180915L; - public static final String APP_NAME = "Adempiere"; + public static final String APP_NAME = "iDempiere"; - public static final String UID = "3.5"; + public static final String UID = "1.0.0"; private WLogin loginDesktop; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java index b9f697529c..0b36a34d9f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java @@ -62,6 +62,7 @@ public class WindowContainer extends AbstractUIPart tabbox.appendChild(tabpanels); tabbox.setWidth("100%"); tabbox.setHeight("100%"); + tabbox.setStyle("margin-top: 2px;"); if (parent != null) tabbox.setParent(parent); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java index 21893172d9..38bf71ee70 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java @@ -71,7 +71,7 @@ public class WebUIServlet extends DHtmlLayoutServlet File file = new File(propertyFile); if (!file.exists()) { - throw new IllegalStateException("Adempiere.properties is not setup. PropertyFile="+propertyFile); + throw new IllegalStateException("idempiere.properties is not setup. PropertyFile="+propertyFile); } if (!Adempiere.isStarted()) { diff --git a/org.adempiere.ui.zk/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml index 04b7e432a7..69d8086ea6 100644 --- a/org.adempiere.ui.zk/WEB-INF/web.xml +++ b/org.adempiere.ui.zk/WEB-INF/web.xml @@ -195,7 +195,7 @@ diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml index 130a87c055..d6b4b6d00d 100644 --- a/org.adempiere.ui.zk/WEB-INF/zk.xml +++ b/org.adempiere.ui.zk/WEB-INF/zk.xml @@ -5,9 +5,9 @@ --> - + - ADempiere WebUI Context management + iDempiere WebUI Context management org.adempiere.webui.session.SessionContextListener @@ -88,18 +88,5 @@ org.zkoss.zul.theme.fontSizeMS 11px - - - - PollingServerPush.delay.min - 200 - - - PollingServerPush.delay.max - 10000 - - - PollingServerPush.delay.factor - 1 - + diff --git a/org.adempiere.webstore.resource/customize.html b/org.adempiere.webstore.resource/customize.html index 7ab46f7013..4d03807385 100644 --- a/org.adempiere.webstore.resource/customize.html +++ b/org.adempiere.webstore.resource/customize.html @@ -37,7 +37,7 @@
  • Change the UI of the *.html and *.jsp files as required
  • Repackage it under another name, e.g. myStore.war before copying it to - $ADEMPIERE_HOME/jboss/server/adempiere/deploy + $IDEMPIERE_HOME/jboss/server/adempiere/deploy

    •  

    diff --git a/org.adempiere.webstore/WEB-INF/web-original.xml b/org.adempiere.webstore/WEB-INF/web-original.xml deleted file mode 100644 index 6760b6ac98..0000000000 --- a/org.adempiere.webstore/WEB-INF/web-original.xml +++ /dev/null @@ -1,341 +0,0 @@ - - - - /C32.gif - - ADempiere Web Store - - - - #W_Store_ID - 0 - - - ADempiere Web Store Filter - Web Store Filter - WebStoreFilter - org.compiere.wstore.StoreFilter - - - WebStoreFilter - /* - - - - - - SSL pages - /login.jsp - /loginServlet - /checkOutServlet - /orderServlet - - - - CONFIDENTIAL - - - - - Web Store Advertisement - AdvertisementServlet - org.compiere.wstore.AdvertisementServlet - 3 - - - Web Store Assets - AssetServlet - org.compiere.wstore.AssetServlet - 2 - - - Web Basket Servlet - BasketServlet - org.compiere.wstore.BasketServlet - 1 - - - Web CheckOut Servlet - CheckOutServlet - org.compiere.wstore.CheckOutServlet - 1 - - - ADempiere Click - Click - org.compiere.wstore.Click - 1 - - - Web Expense Report - ExpenseServlet - org.compiere.wstore.ExpenseServlet - 3 - - - Web Page Counter - Counter - org.compiere.wstore.Counter - 1 - - - Web Store Interest Area Servlet - InfoServlet - org.compiere.wstore.InfoServlet - 2 - - - Web Store Invoices - InvoiceServlet - org.compiere.wstore.InvoiceServlet - 1 - - - Web Store Location Servlet - LocationServlet - org.compiere.wstore.LocationServlet - 1 - - - Web User Login Servlet - LoginServlet - org.compiere.wstore.LoginServlet - 1 - - - Web Notification - NoteServlet - org.compiere.wstore.NoteServlet - 3 - - - Web Store Order - OrderServlet - org.compiere.wstore.OrderServlet - 2 - - - Web Store Payment Processing - PaymentServlet - org.compiere.wstore.PaymentServlet - 2 - - - Web Product Search - ProductServlet - org.compiere.wstore.ProductServlet - 1 - - - Web Registration Servlet - RegistrationServlet - org.compiere.wstore.RegistrationServlet - 1 - - - Web Request Servlet - RequestServlet - org.compiere.wstore.RequestServlet - 1 - - - Web RfQ Servlet - RfQServlet - org.compiere.wstore.RfQServlet - 2 - - - Web Store Search Servlet - SearchServlet - org.compiere.wstore.SearchServlet - 1 - - - Web User Update Servlet - UpdateServlet - org.compiere.wstore.UpdateServlet - 1 - - - Web Workflow Servlet - WorkflowServlet - org.compiere.wstore.WorkflowServlet - 1 - - - Web Index Page - Index - /index.jsp - 1 - - - Web Basket Page - Basket - /basket.jsp - 1 - - - Web Login Page - Login - /login.jsp - 1 - - - Web Request Page - Request - /request.jsp - 1 - - - Web Info Page - Info - /info.jsp - 1 - - - Web EMail Servlet - EMailServlet - org.compiere.wstore.EMailServlet - 1 - - - Adempiere Issue Reporting - IssueReportServlet - org.compiere.wstore.IssueReportServlet - 1 - - - AdvertisementServlet - /advertisementServlet/* - - - AssetServlet - /assetServlet/* - - - BasketServlet - /basketServlet - - - CheckOutServlet - /checkOutServlet - - - Click - /click/* - - - ExpenseServlet - /expenseServlet - - - Counter - /counter/* - - - InfoServlet - /infoServlet - - - InvoiceServlet - /invoiceServlet/* - - - LocationServlet - /locationServlet - - - LoginServlet - /loginServlet - - - NoteServlet - /noteServlet/* - - - OrderServlet - /orderServlet - - - PaymentServlet - /paymentServlet - - - ProductServlet - /productServlet/* - - - RegistrationServlet - /registrationServlet - - - RequestServlet - /requestServlet/* - - - RfQServlet - /rfqServlet/* - - - SearchServlet - /searchServlet - - - UpdateServlet - /updateServlet - - - WorkflowServlet - /workflowServlet/* - - - Index - /index.jsp/* - - - Basket - /basket.jsp/* - - - Login - /login.jsp/* - - - Request - /request.jsp/* - - - Info - /info.jsp - - - EMailServlet - /emailServlet/* - - - IssueReportServlet - /issueReportServlet/* - - - - 30 - - - - css - text/css - - - - index.jsp - - - - diff --git a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java index 1cbf949e17..c87b976ccd 100755 --- a/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java +++ b/org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/config/ConfigPostgreSQL.java @@ -55,6 +55,7 @@ public class ConfigPostgreSQL implements IDatabaseConfig public void init(ConfigurationData configurationData) { configurationData.setDatabasePort(String.valueOf(Database.DB_POSTGRESQL_DEFAULT_PORT)); + configurationData.setDatabaseName("idempiere"); } // init /** From 20c846a64cca60390b1c80a6b9e27f8043e2fc4a Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 6 Jun 2012 22:26:42 +0800 Subject: [PATCH 2/4] IDEMPIERE-290 Zk6: Send Email Dialog layout broken after migration to Zk6 --- .../adempiere/webui/window/WEMailDialog.java | 62 +++++++++++-------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java index a25b0975f2..f4ba4baed1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java @@ -23,6 +23,8 @@ import java.util.StringTokenizer; import java.util.logging.Level; import org.adempiere.webui.apps.AEnv; +import org.adempiere.webui.component.Column; +import org.adempiere.webui.component.Columns; import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Label; @@ -66,7 +68,7 @@ import org.zkoss.zul.Separator; * globalqss - Carlos Ruiz - implement CC - FR [ 1754879 ] Enhancements on sending e-mail * */ -public class WEMailDialog extends Window implements EventListener, ValueChangeListener +public class WEMailDialog extends Window implements EventListener, ValueChangeListener { /** * @@ -89,7 +91,7 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi super(); this.setTitle(title); this.setWidth("500px"); - this.setHeight("500px"); + this.setHeight("600px"); this.setClosable(true); this.setBorder("normal"); this.setStyle("position:absolute"); @@ -152,10 +154,6 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi /** Logger */ private static CLogger log = CLogger.getCLogger(WEMailDialog.class); -// private CPanel mainPanel = new CPanel(); -// private BorderLayout mainLayout = new BorderLayout(); -// private CPanel headerPanel = new CPanel(); -// private GridBagLayout headerLayout = new GridBagLayout(); private Textbox fFrom = new Textbox();//20); private Textbox fTo = new Textbox();//20); private Textbox fCc = new Textbox();//20); @@ -187,10 +185,19 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi // Grid grid = new Grid(); - grid.setWidth("480px"); - grid.setStyle("margin:0; padding:0; position: absolute; align: center; valign: center;"); + grid.setWidth("100%"); + grid.setHeight("100%"); + grid.setStyle("margin:0; padding:0; position: absolute; align: center; valign: center; border:0"); grid.makeNoStrip(); - grid.setOddRowSclass("even"); + + Columns columns = new Columns(); + Column column = new Column(); + column.setWidth("30%"); + columns.appendChild(column); + column = new Column(); + column.setWidth("70%"); + columns.appendChild(column); + grid.appendChild(columns); Rows rows = new Rows(); grid.appendChild(rows); @@ -202,7 +209,7 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi div.appendChild(lFrom); row.appendChild(div); row.appendChild(fFrom); - fFrom.setWidth("100%"); + fFrom.setHflex("1"); row = new Row(); rows.appendChild(row); @@ -211,13 +218,13 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi div.appendChild(lTo); row.appendChild(div); row.appendChild(fUser.getComponent()); - fUser.getComponent().setWidth("100%"); + fUser.getComponent().setHflex("1"); row = new Row(); rows.appendChild(row); row.appendChild(new Label("")); row.appendChild(fTo); - fTo.setWidth("100%"); + fTo.setHflex("1"); row = new Row(); rows.appendChild(row); @@ -226,13 +233,13 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi div.appendChild(lCc); row.appendChild(div); row.appendChild(fCcUser.getComponent()); - fCcUser.getComponent().setWidth("100%"); + fCcUser.getComponent().setHflex("1"); row = new Row(); rows.appendChild(row); row.appendChild(new Label("")); row.appendChild(fCc); - fCc.setWidth("100%"); + fCc.setHflex("1"); row = new Row(); rows.appendChild(row); @@ -246,7 +253,7 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi div.appendChild(lSubject); row.appendChild(div); row.appendChild(fSubject); - fSubject.setWidth("100%"); + fSubject.setHflex("1"); row = new Row(); rows.appendChild(row); @@ -260,35 +267,36 @@ public class WEMailDialog extends Window implements EventListener, ValueChangeLi div.appendChild(lAttachment); row.appendChild(div); row.appendChild(fAttachment); - fAttachment.setWidth("100%"); + fAttachment.setHflex("1"); row = new Row(); rows.appendChild(row); row.setSpans("2"); row.appendChild(fMessage); - fMessage.setWidth("100%"); + fMessage.setHflex("1"); fMessage.setRows(10); - row = new Row(); - rows.appendChild(row); - row.setSpans("2"); - row.appendChild(confirmPanel); confirmPanel.addActionListener(this); Borderlayout layout = new Borderlayout(); - layout.setWidth("490px"); - layout.setHeight("470px"); - layout.setStyle("background-color: white; position: absolute;"); + layout.setWidth("95%"); + layout.setHeight("92%"); + layout.setStyle("background-color: white; position: absolute; margin:0; border:0; padding:0"); Center center = new Center(); center.appendChild(grid); layout.appendChild(center); - center.setStyle("background-color: white"); + center.setStyle("background-color: white; border: 0"); + center.setFlex(true); South south = new South(); - south.appendChild(statusBar); + Div southDiv = new Div(); + south.appendChild(southDiv); layout.appendChild(south); - south.setStyle("background-color: white"); + south.setStyle("background-color: white; border: 0"); + + southDiv.appendChild(confirmPanel); + southDiv.appendChild(statusBar); this.appendChild(layout); } // jbInit From b94843f98eb8a52bf3471c5e0f3b2cff3fd60413 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 6 Jun 2012 22:52:35 +0800 Subject: [PATCH 3/4] IDEMPIERE-291 Zk Report Viewer: Drill across dropdown should be visible only for html output, label and tooltip shouldn't have the & character. --- .../webui/window/ZkReportViewer.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java index 242ce45088..fce56457ed 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java @@ -64,6 +64,7 @@ import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.KeyNamePair; import org.compiere.util.Msg; +import org.compiere.util.Util; import org.zkoss.util.media.AMedia; import org.zkoss.util.media.Media; import org.zkoss.zk.ui.Component; @@ -247,31 +248,31 @@ public class ZkReportViewer extends Window implements EventListener, ITab toolBar.appendChild(summary); bCustomize.setImage("/images/Preference24.png"); - bCustomize.setTooltiptext(Msg.getMsg(Env.getCtx(), "PrintCustomize")); + bCustomize.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "PrintCustomize"))); toolBar.appendChild(bCustomize); bCustomize.addEventListener(Events.ON_CLICK, this); bFind.setImage("/images/Find24.png"); - bFind.setTooltiptext(Msg.getMsg(Env.getCtx(), "Find")); + bFind.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Find"))); toolBar.appendChild(bFind); bFind.addEventListener(Events.ON_CLICK, this); toolBar.appendChild(new Separator("vertical")); bSendMail.setImage("/images/SendMail24.png"); - bSendMail.setTooltiptext(Msg.getMsg(Env.getCtx(), "SendMail")); + bSendMail.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "SendMail"))); toolBar.appendChild(bSendMail); bSendMail.addEventListener(Events.ON_CLICK, this); bArchive.setImage("/images/Archive24.png"); - bArchive.setTooltiptext(Msg.getMsg(Env.getCtx(), "Archive")); + bArchive.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Archive"))); toolBar.appendChild(bArchive); bArchive.addEventListener(Events.ON_CLICK, this); if (m_isCanExport) { bExport.setImage("/images/ExportX24.png"); - bExport.setTooltiptext(Msg.getMsg(Env.getCtx(), "Export")); + bExport.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Export"))); toolBar.appendChild(bExport); bExport.addEventListener(Events.ON_CLICK, this); } @@ -279,7 +280,7 @@ public class ZkReportViewer extends Window implements EventListener, ITab toolBar.appendChild(new Separator("vertical")); bRefresh.setImage("/images/Refresh24.png"); - bRefresh.setTooltiptext(Msg.getMsg(Env.getCtx(), "Refresh")); + bRefresh.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Refresh"))); toolBar.appendChild(bRefresh); bRefresh.addEventListener(Events.ON_CLICK, this); @@ -374,6 +375,9 @@ public class ZkReportViewer extends Window implements EventListener, ITab File file = File.createTempFile(prefix, ".pdf", new File(path)); m_reportEngine.createPDF(file); media = new AMedia(file.getName(), "pdf", "application/pdf", file, true); + + labelDrill.setVisible(false); + comboDrill.setVisible(false); } else if ("HTML".equals(previewType.getSelectedItem().getValue())) { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(m_reportEngine.getName()); @@ -384,6 +388,9 @@ public class ZkReportViewer extends Window implements EventListener, ITab File file = File.createTempFile(prefix, ".html", new File(path)); m_reportEngine.createHTML(file, false, AEnv.getLanguage(Env.getCtx()), new HTMLExtension(Executions.getCurrent().getContextPath(), "rp", this.getUuid())); media = new AMedia(file.getName(), "html", "text/html", file, false); + + labelDrill.setVisible(true); + comboDrill.setVisible(true); } else if ("XLS".equals(previewType.getSelectedItem().getValue())) { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(m_reportEngine.getName()); @@ -394,6 +401,9 @@ public class ZkReportViewer extends Window implements EventListener, ITab File file = File.createTempFile(prefix, ".xls", new File(path)); m_reportEngine.createXLS(file, AEnv.getLanguage(Env.getCtx())); media = new AMedia(file.getName(), "xls", "application/vnd.ms-excel", file, true); + + labelDrill.setVisible(false); + comboDrill.setVisible(false); } Events.echoEvent("onPreviewReport", this, null); @@ -543,7 +553,7 @@ public class ZkReportViewer extends Window implements EventListener, ITab private void revalidate() { // Report Info - setTitle(Msg.getMsg(Env.getCtx(), "Report") + ": " + m_reportEngine.getName() + " " + Env.getHeader(Env.getCtx(), 0)); + setTitle(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Report") + ": " + m_reportEngine.getName() + " " + Env.getHeader(Env.getCtx(), 0))); StringBuffer sb = new StringBuffer (); sb.append(Msg.getMsg(Env.getCtx(), "DataCols")).append("=") .append(m_reportEngine.getColumnCount()) @@ -655,7 +665,7 @@ public class ZkReportViewer extends Window implements EventListener, ITab renderReport(); } catch (Exception e) { throw new AdempiereException("Failed to render report", e); - } + } } /** @@ -750,6 +760,7 @@ public class ZkReportViewer extends Window implements EventListener, ITab winExportFile = new Window(); winExportFile.setTitle(Msg.getMsg(Env.getCtx(), "Export") + ": " + getTitle()); winExportFile.setWidth("450px"); + winExportFile.setHeight("300px"); winExportFile.setClosable(true); winExportFile.setBorder("normal"); winExportFile.setStyle("position:absolute"); @@ -774,13 +785,16 @@ public class ZkReportViewer extends Window implements EventListener, ITab hb.appendChild(div); hb.appendChild(cboType); cboType.setWidth("100%"); + hb.setVflex("1"); Vbox vb = new Vbox(); - vb.setWidth("390px"); + vb.setVflex("1"); + vb.setWidth("100%"); winExportFile.appendChild(vb); vb.appendChild(hb); vb.appendChild(confirmPanel); confirmPanel.addActionListener(this); + confirmPanel.setVflex("0"); } AEnv.showCenterScreen(winExportFile); From b925e6e958f4cc1477fd8d44495064ace76bdb02 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 7 Jun 2012 01:38:43 +0800 Subject: [PATCH 4/4] IDEMPIERE-292 Zk: use #333 instead of #000 ( black ) for text and label --- .../WEB-INF/src/org/adempiere/webui/editor/WEditor.java | 2 +- org.adempiere.ui.zk/theme/default/css/theme.css.dsp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java index 368ec1bcfc..28e8a686fa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java @@ -572,6 +572,6 @@ public abstract class WEditor implements EventListener, PropertyChangeLis } private static final String STYLE_ZOOMABLE_LABEL = "cursor: pointer; text-decoration: underline;"; - private static final String STYLE_NORMAL_LABEL = "color: black;"; + private static final String STYLE_NORMAL_LABEL = "color: #333;"; private static final String STYLE_EMPTY_MANDATORY_LABEL = "color: red;"; } diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp index 43da38f913..363eb2e6d8 100644 --- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp @@ -7,6 +7,7 @@ html,body { height: 100%; width: 100%; background-color: #D4E3F4; + color: #333; overflow: hidden; } @@ -116,7 +117,7 @@ html,body { .menu-href { font-size: 11px; font-weight: normal; - color: black !important; + color: #333 !important; text-decoration: none !important; } @@ -540,3 +541,9 @@ img.z-group-img-close { .z-tab-hm-close { padding-right:18px; } + +<%-- set color for text and label --%> +.z-tab-seld .z-tab-text, .z-tab .z-tab-text, div.z-treefooter-cnt, div.z-treecell-cnt, div.z-treecol-cnt, +.z-label, .z-toolbarbutton-cnt, tr.z-treerow, tr.z-treerow a, tr.z-treerow a:visited { + color: #333; +}