diff --git a/org.adempiere.ui/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
similarity index 100%
rename from org.adempiere.ui/synchronize-terminology.app.launch
rename to org.adempiere.base-feature/synchronize-terminology.app.launch
diff --git a/org.adempiere.ui/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
similarity index 100%
rename from org.adempiere.ui/translation.app.launch
rename to org.adempiere.base-feature/translation.app.launch
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index fdd7a1a621..9fa4627e99 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -255,6 +255,7 @@ Export-Package: bsh,
org.compiere.db,
org.compiere.dbPort,
org.compiere.impexp,
+ org.compiere.install,
org.compiere.interfaces,
org.compiere.interfaces.impl,
org.compiere.model,
diff --git a/org.adempiere.base/plugin.xml b/org.adempiere.base/plugin.xml
index b5cd9343e1..0779342114 100644
--- a/org.adempiere.base/plugin.xml
+++ b/org.adempiere.base/plugin.xml
@@ -116,4 +116,16 @@
+
+
+
+
+
+
diff --git a/org.adempiere.ui/src/org/compiere/install/Translation.java b/org.adempiere.base/src/org/compiere/install/Translation.java
similarity index 100%
rename from org.adempiere.ui/src/org/compiere/install/Translation.java
rename to org.adempiere.base/src/org/compiere/install/Translation.java
diff --git a/org.adempiere.ui/src/org/compiere/install/TranslationHandler.java b/org.adempiere.base/src/org/compiere/install/TranslationHandler.java
similarity index 100%
rename from org.adempiere.ui/src/org/compiere/install/TranslationHandler.java
rename to org.adempiere.base/src/org/compiere/install/TranslationHandler.java
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index e4ecfac5a6..4b5a4c7a3b 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -35,6 +35,9 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
javax.xml.rpc,\
javax.xml.soap,\
javax.xml,\
+ org.apache.xerces@3:start,\
+ org.apache.xml.resolver@3:start,\
+ org.apache.xml.serializer@3:start,\
javax.activation,\
org.apache.activemq.activemq-core,\
org.apache.activemq.kahadb,\
diff --git a/org.adempiere.server-feature/utils.unix/RUN_SyncTerm.sh b/org.adempiere.server-feature/utils.unix/RUN_SyncTerm.sh
new file mode 100644
index 0000000000..a4c9008bb8
--- /dev/null
+++ b/org.adempiere.server-feature/utils.unix/RUN_SyncTerm.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+if [ $IDEMPIERE_HOME ]; then
+ cd $IDEMPIERE_HOME/utils
+else
+ cd "`dirname $0`"
+fi
+. ./myEnvironment.sh Server
+
+if [ $JAVA_HOME ]; then
+ JAVA=$JAVA_HOME/bin/java
+else
+ JAVA=java
+fi
+
+# RUN_SyncTerm.sh
+echo Synchronize idempiere Terminology - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\)
+
+cd ..
+
+echo This Procedure synchronize terminology
+
+$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.install.translation sync
+
+echo Done
+echo .
+echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh b/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh
index 568728f9bf..9875a132d2 100644
--- a/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh
+++ b/org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh
@@ -1,21 +1,42 @@
#!/bin/sh
-# $Id: RUN_TrlExport.sh,v 1.4 2005/01/22 21:59:15 jjanke Exp $
-
if [ $IDEMPIERE_HOME ]; then
- cd $IDEMPIERE_HOME/utils
+ cd $IDEMPIERE_HOME/utils
+else
+ cd "`dirname $0`"
fi
. ./myEnvironment.sh Server
-echo Export idempiere Translation - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\)
+if [ $JAVA_HOME ]; then
+ JAVA=$JAVA_HOME/bin/java
+else
+ JAVA=java
+fi
-# need to change this to reflect your language
-export AD_LANGUAGE=ca_ES
+# $Id: RUN_TrlExport.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $
+echo Export idempiere Translation - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\)
-export DIRECTORY=$IDEMPIERE_HOME/data/$AD_LANGUAGE
+if [ $# -gt 0 ]
+then
+ export AD_LANGUAGE=$1
+else
+ # need to change this to reflect your language
+ export AD_LANGUAGE=es_CO
+fi
-echo This Procedure exports language $AD_LANGUAGE to directory $DIRECTORY
+if [ $# -gt 1 ]
+then
+ export DIRECTORY=$2
+else
+ export DIRECTORY=$IDEMPIERE_HOME/data/$AD_LANGUAGE
+fi
-$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.*.jar -console 12612 -application org.adempiere.ui.translation export $DIRECTORY $AD_LANGUAGE
+cd ..
-echo Done
+echo This Procedure exports language $AD_LANGUAGE to directory $DIRECTORY
+
+$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.install.translation export $DIRECTORY $AD_LANGUAGE
+
+echo Done
+echo .
+echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh b/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh
index d65811112b..cc34b233bd 100644
--- a/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh
+++ b/org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh
@@ -1,21 +1,42 @@
#!/bin/sh
-# $Id: RUN_TrlImport.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $
-
if [ $IDEMPIERE_HOME ]; then
- cd $IDEMPIERE_HOME/utils
+ cd $IDEMPIERE_HOME/utils
+else
+ cd "`dirname $0`"
fi
. ./myEnvironment.sh Server
-echo Import idempiere Translation - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\)
+if [ $JAVA_HOME ]; then
+ JAVA=$JAVA_HOME/bin/java
+else
+ JAVA=java
+fi
-# need to change this to reflect your language
-export AD_LANGUAGE=ca_ES
+# $Id: RUN_TrlImport.sh,v 1.3 2005/01/22 21:59:15 jjanke Exp $
+echo Import idempiere Translation - $IDEMPIERE_HOME \($ADEMPIERE_DB_NAME\)
-export DIRECTORY=$IDEMPIERE_HOME/data/$AD_LANGUAGE
+if [ $# -gt 0 ]
+then
+ export AD_LANGUAGE=$1
+else
+ # need to change this to reflect your language
+ export AD_LANGUAGE=es_CO
+fi
-echo This Procedure imports language $AD_LANGUAGE from directory $DIRECTORY
+if [ $# -gt 1 ]
+then
+ export DIRECTORY=$2
+else
+ export DIRECTORY=$IDEMPIERE_HOME/data/$AD_LANGUAGE
+fi
-$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.*.jar -console 12612 -application org.adempiere.ui.translation import $DIRECTORY $AD_LANGUAGE
+cd ..
-echo Done
+echo This Procedure imports language $AD_LANGUAGE from directory $DIRECTORY
+
+$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.install.translation import $DIRECTORY $AD_LANGUAGE
+
+echo Done
+echo .
+echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/utils.windows/RUN_SyncTerm.bat b/org.adempiere.server-feature/utils.windows/RUN_SyncTerm.bat
new file mode 100644
index 0000000000..5c4ad6336b
--- /dev/null
+++ b/org.adempiere.server-feature/utils.windows/RUN_SyncTerm.bat
@@ -0,0 +1,12 @@
+@Rem $Id: RUN_TrlImport.bat,v 1.4 2005/09/16 00:49:37 jjanke Imp $
+
+@if (%IDEMPIERE_HOME%) == () (CALL myEnvironment.bat Server) else (CALL %IDEMPIERE_HOME%\utils\myEnvironment.bat Server)
+@Title Import Translation - %IDEMPIERE_HOME% (%ADEMPIERE_DB_NAME%)
+
+@echo This Procedure synchronizes idempiere terminology
+@pause
+
+FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
+@"%JAVA_HOME%\bin\java" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar %JARFILE% -application org.adempiere.install.translation sync
+
+@pause
diff --git a/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat b/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat
index 9d8b189d2f..539d4b9d24 100644
--- a/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat
+++ b/org.adempiere.server-feature/utils.windows/RUN_TrlExport.bat
@@ -3,12 +3,13 @@
@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 AD_LANGUAGE=es_CO
@SET DIRECTORY=%IDEMPIERE_HOME%\data\%AD_LANGUAGE%
@echo This Procedure exports language %AD_LANGUAGE% into directory %DIRECTORY%
@pause
-@"%JAVA_HOME%\bin\java" -cp %CLASSPATH% org.compiere.install.Translation %DIRECTORY% %AD_LANGUAGE% export
+FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
+@"%JAVA_HOME%\bin\java" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar %JARFILE% -application org.adempiere.install.translation export %DIRECTORY% %AD_LANGUAGE%
@pause
diff --git a/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat b/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat
index 1c071c8836..067ee165ee 100644
--- a/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat
+++ b/org.adempiere.server-feature/utils.windows/RUN_TrlImport.bat
@@ -1,14 +1,15 @@
-@Rem $Id: RUN_TrlImport.bat,v 1.4 2005/09/16 00:49:37 jjanke Exp $
+@Rem $Id: RUN_TrlImport.bat,v 1.4 2005/09/16 00:49:37 jjanke Imp $
@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 AD_LANGUAGE=es_CO
@SET DIRECTORY=%IDEMPIERE_HOME%\data\%AD_LANGUAGE%
@echo This Procedure imports language %AD_LANGUAGE% from directory %DIRECTORY%
@pause
-@"%JAVA_HOME%\bin\java" -cp %CLASSPATH% org.compiere.install.Translation %DIRECTORY% %AD_LANGUAGE% import
+FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
+@"%JAVA_HOME%\bin\java" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar %JARFILE% -application org.adempiere.install.translation import %DIRECTORY% %AD_LANGUAGE%
@pause
diff --git a/org.adempiere.ui/plugin.xml b/org.adempiere.ui/plugin.xml
deleted file mode 100644
index be62b70e1b..0000000000
--- a/org.adempiere.ui/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-