The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+
If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at http://www.eclipse.org.
+
+
Third Party Content
+
+
The Content includes items that have been sourced from third parties as set out below. If you
+did not receive this Content directly from the Eclipse Foundation, the following is provided
+for informational purposes only, and you should look to the Redistributor’s license for
+terms and conditions of use.
+
+
Ant 1.7.1
+
The plug-in includes software developed by The Apache Software Foundation as part of the Ant project.
+
+
The Ant binary code in ant.jar and the scripts ant, ant.bat, ant.cmd, antenv.cmd, antRun, antRun.bat, antRun.pl, complete-ant-cmd.pl, envset.cmd, lcp.bat, runant.pl, runant.py and runrc.cmd are included with the plug-in with no modifications.
+The Ant source code is located in the zip files named ant-*src.zip.
+
+
Your use of the Ant code and the scripts is subject to the terms and conditions of the Apache License, Version 2.0. A copy of the license is contained
+in the file asl-v20.txt and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.
+
+
The names "Ant" and "Apache Software Foundation" must not be used to endorse or promote products derived from this
+software without prior written permission. For written permission, please contact apache@apache.org.
+
+
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.
SAX is developed by the SAX project (http://www.saxproject.org). Your use of SAX is subject to the
+ terms and conditions of the license found in the file LICENSE.sax.txt which is included with this plug-in.
+
+
+
\ No newline at end of file
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.dom.html b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.dom.html
new file mode 100644
index 0000000000..97e7898475
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.dom.html
@@ -0,0 +1,82 @@
+
+
+
+License
+
+
+
+
+This W3C work (including software, documents, or other related
+items) is being provided by the copyright holders under the
+following license. By obtaining, using and/or copying this work,
+you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions:
+Permission to use, copy, modify, and distribute this software
+and its documentation, with or without modification, for any
+purpose and without fee or royalty is hereby granted, provided that
+you include the following on ALL copies of the software and
+documentation or portions thereof, including modifications, that
+you make:
+
+
+The full text of this NOTICE in a location viewable to users of
+the redistributed or derivative work.
+Notice of any changes or modifications to the W3C files,
+including the date changes were made. (We recommend you provide
+URIs to the location from which the code is derived.)
+
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+SOFTWARE OR DOCUMENTATION.
+
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without
+specific, written prior permission. Title to copyright in this
+software and any associated documentation will at all times remain
+with copyright holders.
+
+
+____________________________________
+This formulation of W3C's notice and license became active on
+August 14 1998 so as to improve compatibility with GPL. This
+version ensures that W3C software licensing terms are no more
+restrictive than GPL and consequently W3C software may be
+distributed in GPL packages. See the older formulation for the
+policy prior to this date. Please see our Copyright FAQ for common
+questions about using materials from
+our site, including specific terms and conditions for packages like
+libwww, Amaya, and Jigsaw.
+Other questions about this notice can be
+directed to site-policy@w3.org.
+
+
+
\ No newline at end of file
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.sax.txt b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.sax.txt
new file mode 100644
index 0000000000..d46b3dce08
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/LICENSE.sax.txt
@@ -0,0 +1,20 @@
+This license came from: http://www.megginson.com/SAX/copying.html
+ However please note future versions of SAX may be covered
+ under http://saxproject.org/?selected=pd
+
+
+This page is now out of date -- see the new SAX site at
+http://www.saxproject.org/ for more up-to-date
+releases and other information. Please change your bookmarks.
+
+
+SAX2 is Free!
+
+I hereby abandon any property rights to SAX 2.0 (the Simple API for
+XML), and release all of the SAX 2.0 source code, compiled code, and
+documentation contained in this distribution into the Public Domain.
+SAX comes with NO WARRANTY or guarantee of fitness for any
+purpose.
+
+David Megginson, david@megginson.com
+2000-05-05
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/NOTICE b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/NOTICE
new file mode 100644
index 0000000000..4c88cc6659
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/NOTICE
@@ -0,0 +1,26 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Ant distribution. ==
+ =========================================================================
+
+ Apache Ant
+ Copyright 1999-2008 The Apache Software Foundation
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes also software developed by :
+ - the W3C consortium (http://www.w3c.org) ,
+ - the SAX project (http://www.saxproject.org)
+
+ The task is based on code Copyright (c) 2002, Landmark
+ Graphics Corp that has been kindly donated to the Apache Software
+ Foundation.
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/asl-v20.txt b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/asl-v20.txt
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/about_files/asl-v20.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant
new file mode 100644
index 0000000000..2e60839241
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant
@@ -0,0 +1,326 @@
+#! /bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Extract launch and ant arguments, (see details below).
+ant_exec_args=
+no_config=false
+use_jikes_default=false
+ant_exec_debug=false
+show_help=false
+for arg in "$@" ; do
+ if [ "$arg" = "--noconfig" ] ; then
+ no_config=true
+ elif [ "$arg" = "--usejikes" ] ; then
+ use_jikes_default=true
+ elif [ "$arg" = "--execdebug" ] ; then
+ ant_exec_debug=true
+ elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then
+ show_help=true
+ ant_exec_args="$ant_exec_args -h"
+ else
+ if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then
+ show_help=true
+ fi
+ ant_exec_args="$ant_exec_args \"$arg\""
+ fi
+done
+
+# Source/default ant configuration
+if $no_config ; then
+ rpm_mode=false
+ usejikes=$use_jikes_default
+else
+ # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
+ if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
+ if [ -f "/etc/ant.conf" ] ; then
+ . /etc/ant.conf
+ fi
+ fi
+
+ # load user ant configuration
+ if [ -f "$HOME/.ant/ant.conf" ] ; then
+ . $HOME/.ant/ant.conf
+ fi
+ if [ -f "$HOME/.antrc" ] ; then
+ . "$HOME/.antrc"
+ fi
+
+ # provide default configuration values
+ if [ -z "$rpm_mode" ] ; then
+ rpm_mode=false
+ fi
+ if [ -z "$usejikes" ] ; then
+ usejikes=$use_jikes_default
+ fi
+fi
+
+# Setup Java environment in rpm mode
+if $rpm_mode ; then
+ if [ -f /usr/share/java-utils/java-functions ] ; then
+ . /usr/share/java-utils/java-functions
+ set_jvm
+ set_javacmd
+ fi
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ ;;
+esac
+
+if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
+ ## resolve links - $0 may be a link to ant's home
+ PRG="$0"
+ progname=`basename "$0"`
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+ done
+
+ ANT_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$ANT_HOME" ] &&
+ ANT_HOME=`cygpath --unix "$ANT_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# set ANT_LIB location
+ANT_LIB="${ANT_HOME}/lib"
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then
+ JAVACMD="$JAVA_HOME/jre/bin/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java 2> /dev/null `
+ if [ -z "$JAVACMD" ] ; then
+ JAVACMD=java
+ fi
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+# Build local classpath using just the launcher in non-rpm mode or
+# use the Jpackage helper in rpm mode with basic and default jars
+# specified in the ant.conf configuration. Because the launcher is
+# used, libraries linked in ANT_HOME/lib will also be included, but this
+# is discouraged as it is not java-version safe. A user should
+# request optional jars and their dependencies via the OPT_JAR_LIST
+# variable
+if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then
+ LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+
+ # If no optional jars have been specified then build the default list
+ if [ -z "$OPT_JAR_LIST" ] ; then
+ for file in /etc/ant.d/*; do
+ if [ -f "$file" ]; then
+ case "$file" in
+ *~) ;;
+ *#*) ;;
+ *.rpmsave) ;;
+ *.rpmnew) ;;
+ *)
+ for dep in `cat "$file"`; do
+ case "$OPT_JAR_LIST" in
+ *"$dep"*) ;;
+ *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+ esac
+ done
+ esac
+ fi
+ done
+ fi
+
+ # If the user requested to try to add some other jars to the classpath
+ if [ -n "$OPT_JAR_LIST" ] ; then
+ _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
+ if [ -n "$_OPTCLASSPATH" ] ; then
+ LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH"
+ fi
+ fi
+
+ # Explicitly add javac path to classpath, assume JAVA_HOME set
+ # properly in rpm mode
+ if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
+ LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+ fi
+ if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
+ LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
+ fi
+
+ # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
+ # user CLASSPATH first and ant-found jars after.
+ # In that case, the user CLASSPATH will override ant-found jars
+ #
+ # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
+ # with ant-found jars first and user CLASSPATH after
+ if [ -n "$CLASSPATH" ] ; then
+ # merge local and specified classpath
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH="$CLASSPATH"
+ elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
+ LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
+ else
+ LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
+ fi
+
+ # remove class path from launcher -cp option
+ CLASSPATH=""
+ fi
+else
+ # not using rpm_mode; use launcher to determine classpaths
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+ else
+ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
+ fi
+fi
+
+if [ -n "$JAVA_HOME" ] ; then
+ # OSX hack to make Ant work with jikes
+ if $darwin ; then
+ OSXHACK="${JAVA_HOME}/../Classes"
+ if [ -d "${OSXHACK}" ] ; then
+ for i in "${OSXHACK}"/*.jar
+ do
+ JIKESPATH="$JIKESPATH:$i"
+ done
+ fi
+ fi
+fi
+
+# Allow Jikes support (off by default)
+if $usejikes; then
+ ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
+fi
+
+# For Cygwin, switch paths to appropriate format before running java
+# For PATHs convert to unix format first, then to windows format to ensure
+# both formats are supported. Probably this will fail on directories with ;
+# in the name in the path. Let's assume that paths containing ; are more
+# rare than windows style paths on cygwin.
+if $cygwin; then
+ if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
+ format=mixed
+ else
+ format=windows
+ fi
+ ANT_HOME=`cygpath --$format "$ANT_HOME"`
+ ANT_LIB=`cygpath --$format "$ANT_LIB"`
+ JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+ LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+ LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
+ if [ -n "$CLASSPATH" ] ; then
+ CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+ CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
+ fi
+ CYGHOME=`cygpath --$format "$HOME"`
+fi
+
+# Show script help if requested
+if $show_help ; then
+ echo $0 '[script options] [options] [target [target2 [target3] ..]]'
+ echo 'Script Options:'
+ echo ' --help, --h print this message and ant help'
+ echo ' --noconfig suppress sourcing of /etc/ant.conf,'
+ echo ' $HOME/.ant/ant.conf, and $HOME/.antrc'
+ echo ' configuration files'
+ echo ' --usejikes enable use of jikes by default, unless'
+ echo ' set explicitly in configuration files'
+ echo ' --execdebug print ant exec line generated by this'
+ echo ' launch script'
+ echo ' '
+fi
+# add a second backslash to variables terminated by a backslash under cygwin
+if $cygwin; then
+ case "$ANT_HOME" in
+ *\\ )
+ ANT_HOME="$ANT_HOME\\"
+ ;;
+ esac
+ case "$CYGHOME" in
+ *\\ )
+ CYGHOME="$CYGHOME\\"
+ ;;
+ esac
+ case "$JIKESPATH" in
+ *\\ )
+ JIKESPATH="$JIKESPATH\\"
+ ;;
+ esac
+ case "$LOCALCLASSPATH" in
+ *\\ )
+ LOCALCLASSPATH="$LOCALCLASSPATH\\"
+ ;;
+ esac
+ case "$CLASSPATH" in
+ *\\ )
+ CLASSPATH="$CLASSPATH\\"
+ ;;
+ esac
+fi
+# Execute ant using eval/exec to preserve spaces in paths,
+# java options, and ant args
+ant_sys_opts=
+if [ -n "$CYGHOME" ]; then
+ if [ -n "$JIKESPATH" ]; then
+ ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
+ else
+ ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\""
+ fi
+else
+ if [ -n "$JIKESPATH" ]; then
+ ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
+ fi
+fi
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+if $ant_exec_debug ; then
+ echo $ant_exec_command
+fi
+eval $ant_exec_command
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.bat b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.bat
new file mode 100644
index 0000000000..6d57c81ea5
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.bat
@@ -0,0 +1,226 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+REM This is an inordinately troublesome piece of code, particularly because it
+REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x
+REM support, things would be much easier, but sadly, it is not yet time.
+REM Be cautious about editing this, and only add WinNT specific stuff in code that
+REM only runs on WinNT.
+
+if "%HOME%"=="" goto homeDrivePathPre
+if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
+
+:homeDrivePathPre
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre
+if exist "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat"
+
+:userProfilePre
+if "%USERPROFILE%"=="" goto alpha
+if "%USERPROFILE%"=="%HOME%" goto alpha
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha
+if exist "%USERPROFILE%\antrc_pre.bat" call "%USERPROFILE%\antrc_pre.bat"
+
+:alpha
+
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+if "%ANT_HOME%"=="" goto setDefaultAntHome
+
+:stripAntHome
+if not _%ANT_HOME:~-1%==_\ goto checkClasspath
+set ANT_HOME=%ANT_HOME:~0,-1%
+goto stripAntHome
+
+:setDefaultAntHome
+rem %~dp0 is expanded pathname of the current script under NT
+set ANT_HOME=%~dp0..
+
+:checkClasspath
+set _USE_CLASSPATH=yes
+rem CLASSPATH must not be used if it is equal to ""
+if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no
+if "%CLASSPATH%"=="" set _USE_CLASSPATH=no
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+set ANT_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+if ""%1""==""-noclasspath"" goto clearclasspath
+set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+rem here is there is a -noclasspath in the options
+:clearclasspath
+set _USE_CLASSPATH=no
+shift
+goto setupArgs
+
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+:doneStart
+
+if _USE_CLASSPATH==no goto findAntHome
+
+:stripClasspath
+if not _%CLASSPATH:~-1%==_\ goto findAntHome
+set CLASSPATH=%CLASSPATH:~0,-1%
+goto stripClasspath
+
+:findAntHome
+rem find ANT_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
+
+rem check for ant in Program Files
+if not exist "%ProgramFiles%\ant" goto checkSystemDrive
+set ANT_HOME=%ProgramFiles%\ant
+goto checkJava
+
+:checkSystemDrive
+rem check for ant in root directory of system drive
+if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
+set ANT_HOME=%SystemDrive%\ant
+goto checkJava
+
+:checkCDrive
+rem check for ant in C:\ant for Win9X users
+if not exist C:\ant\lib\ant.jar goto noAntHome
+set ANT_HOME=C:\ant
+goto checkJava
+
+:noAntHome
+echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto checkJikes
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+
+:checkJikes
+if not "%JIKESPATH%"=="" goto runAntWithJikes
+
+:runAnt
+if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
+:runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:runAntNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:runAntWithJikes
+
+if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath
+set JIKESPATH=%JIKESPATH:~0,-1%
+goto runAntWithJikes
+
+:checkJikesAndClasspath
+
+if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
+
+:runAntWithJikesAndClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:runAntWithJikesNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:onError
+rem Windows 9x way of checking the error code. It matches via brute force.
+for %%i in (1 10 100) do set err%%i=
+for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i
+if %err100%==2 goto onError200
+if %err100%==0 set err100=
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i
+if "%err100%"=="" if %err10%==0 set err10=
+:onError1
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i
+goto onErrorEnd
+:onError200
+for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i
+if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i
+if not err10==5 goto onError1
+:onErrorEnd
+set ANT_ERROR=%err100%%err10%%err1%
+for %%i in (1 10 100) do set err%%i=
+
+:end
+rem bug ID 32069: resetting an undefined env variable changes the errorlevel.
+if not "%_JAVACMD%"=="" set _JAVACMD=
+if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS=
+
+if "%ANT_ERROR%"=="0" goto mainEnd
+
+rem Set the return code if we are not in NT. We can only set
+rem a value of 1, but it's better than nothing.
+if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
+
+rem Set the ERRORLEVEL if we are running NT.
+if "%OS%"=="Windows_NT" color 00
+
+goto omega
+
+:mainEnd
+
+rem If there were no errors, we run the post script.
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
+if "%HOME%"=="" goto homeDrivePathPost
+if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
+
+:homeDrivePathPost
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost
+if exist "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat"
+
+:userProfilePost
+if "%USERPROFILE%"=="" goto omega
+if "%USERPROFILE%"=="%HOME%" goto omega
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega
+if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat"
+
+:omega
+
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.cmd b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.cmd
new file mode 100644
index 0000000000..d221a40959
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/ant.cmd
@@ -0,0 +1,93 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Run ant
+*/
+
+'@echo off'
+parse arg mode envarg '::' antarg
+
+if mode\='.' & mode\='..' & mode\='/' then do
+ envarg = mode envarg
+ mode = ''
+end
+
+if antarg = '' then do
+ antarg = envarg
+ envarg = ''
+end
+
+x = setlocal()
+
+env="OS2ENVIRONMENT"
+antenv = _getenv_('antenv')
+if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
+
+if mode = '' then mode = _getenv_('ANT_MODE' '..')
+if mode \= '/' then do
+ runrc = _getenv_('runrc')
+ antrc = _getenv_('antrc' 'antrc.cmd')
+ if mode = '..' then mode = '-r'
+ else mode = ''
+ interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
+end
+
+if _testenv_() = 0 then do
+ say 'Ant environment is not set properly'
+ x = endlocal()
+ exit 16
+end
+
+settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
+
+java = _getenv_('javacmd' 'java')
+opts = value('ANT_OPTS',,env)
+args = value('ANT_ARGS',,env)
+lcp = value('LOCALCLASSPATH',,env)
+cp = value('CLASSPATH',,env)
+if value('ANT_USE_CP',,env) \= '' then do
+ if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
+ lcp = lcp || cp
+ 'SET CLASSPATH='
+end
+if lcp\='' then lcp = '-classpath' lcp
+
+cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
+launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
+if launcher = '' then entry = 'org.apache.tools.ant.Main'
+else entry = 'org.apache.tools.ant.launch.Launcher'
+java opts lcp entry settings args antarg
+
+x = endlocal()
+
+return rc
+
+_testenv_: procedure expose env ANT_HOME JAVA_HOME
+ANT_HOME = value('ANT_HOME',,env)
+if ANT_HOME = '' then return 0
+JAVA_HOME = value('JAVA_HOME',,env)
+if JAVA_HOME = '' then return 0
+cp = translate(value('CLASSPATH',,env))
+if pos(translate(ANT_HOME), cp) = 0 then return 0
+if pos(translate(JAVA_HOME), cp) = 0 then return 0
+return 1
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun
new file mode 100644
index 0000000000..8110f86efe
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Args: DIR command
+cd "$1"
+CMD="$2"
+shift
+shift
+
+exec "$CMD" "$@"
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.bat b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.bat
new file mode 100644
index 0000000000..10d2bbc78a
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.bat
@@ -0,0 +1,50 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+if ""%1""=="""" goto runCommand
+
+rem Change drive and directory to %1
+if "%OS%"=="Windows_NT" goto nt_cd
+if "%OS%"=="WINNT" goto nt_cd
+cd ""%1""
+goto end_cd
+:nt_cd
+cd /d ""%1""
+:end_cd
+shift
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+set ANT_RUN_CMD=%1
+if ""%1""=="""" goto runCommand
+shift
+:loop
+if ""%1""=="""" goto runCommand
+set ANT_RUN_CMD=%ANT_RUN_CMD% %1
+shift
+goto loop
+
+:runCommand
+rem echo %ANT_RUN_CMD%
+%ANT_RUN_CMD%
+
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl
new file mode 100644
index 0000000000..dbea10f2a8
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl
@@ -0,0 +1,66 @@
+#!/usr/bin/perl
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#######################################################################
+#
+# antRun.pl
+#
+# wrapper script for invoking commands on a platform with Perl installed
+# this is akin to antRun.bat, and antRun the SH script
+#
+# created: 2001-10-18
+# author: Jeff Tulley jtulley@novell.com
+#######################################################################
+#be fussy about variables
+use strict;
+
+#turn warnings on during dev; generates a few spurious uninitialised var access warnings
+#use warnings;
+
+#and set $debug to 1 to turn on trace info (currently unused)
+my $debug=1;
+
+#######################################################################
+# change drive and directory to "%1"
+my $ANT_RUN_CMD = @ARGV[0];
+
+# assign current run command to "%2"
+chdir (@ARGV[0]) || die "Can't cd to $ARGV[0]: $!\n";
+if ($^O eq "NetWare") {
+ # There is a bug in Perl 5 on NetWare, where chdir does not
+ # do anything. On NetWare, the following path-prefixed form should
+ # always work. (afaict)
+ $ANT_RUN_CMD .= "/".@ARGV[1];
+}
+else {
+ $ANT_RUN_CMD = @ARGV[1];
+}
+
+# dispose of the first two arguments, leaving only the command's args.
+shift;
+shift;
+
+# run the command
+my $returnValue = system $ANT_RUN_CMD, @ARGV;
+if ($returnValue eq 0) {
+ exit 0;
+}
+else {
+ # only 0 and 1 are widely recognized as exit values
+ # so change the exit value to 1
+ exit 1;
+}
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antenv.cmd b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antenv.cmd
new file mode 100644
index 0000000000..170d89f346
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/antenv.cmd
@@ -0,0 +1,98 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+'@echo off'
+call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
+call SysLoadFuncs
+
+/* Prepare the parameters for later use */
+parse arg argv
+mode = ''
+args = ''
+opts = ''
+cp = ''
+lcp = ''
+
+do i = 1 to words(argv)
+ param = word(argv, i)
+ select
+ when param='-lcp' then mode = 'l'
+ when param='-cp' | param='-classpath' then mode = 'c'
+ when abbrev('-opts', param, 4) then mode = 'o'
+ when abbrev('-args', param, 4) then mode = 'a'
+ otherwise
+ select
+ when mode = 'a' then args = space(args param, 1)
+ when mode = 'c' then cp = space(cp param, 1)
+ when mode = 'l' then lcp = space(lcp param, 1)
+ when mode = 'o' then opts = space(opts param, 1)
+ otherwise
+ say 'Option' param 'ignored'
+ end
+ end
+end
+
+env="OS2ENVIRONMENT"
+antconf = _getenv_('antconf' 'antconf.cmd')
+runrc = _getenv_('runrc')
+interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
+ANT_HOME = value('ANT_HOME',,env)
+JAVA_HOME = value('JAVA_HOME',,env)
+classpath = value('CLASSPATH',,env)
+classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+
+classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
+'SET CLASSPATH=' || classpath
+
+/* Setting classpathes, options and arguments */
+envset = _getenv_('envset')
+if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
+if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
+if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
+if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
+
+exit 0
+
+addpath: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if substr(path, length(path)) = ';' then glue = ''
+else glue = ';'
+if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
+return path
+
+prepend: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
+return path
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl
new file mode 100644
index 0000000000..b58c26e15c
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl
@@ -0,0 +1,114 @@
+#!/usr/bin/perl
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# A script to allow Bash or Z-Shell to complete an Ant command-line.
+#
+# To install for Bash 2.0 or better, add the following to ~/.bashrc:
+#
+# $ complete -C complete-ant-cmd ant build.sh
+#
+# To install for Z-Shell 2.5 or better, add the following to ~/.zshrc:
+#
+# function ant_complete () {
+# local args_line args
+# read -l args_line
+# set -A args $args_line
+# set -A reply $(COMP_LINE=$args_line complete-ant-cmd ${args[1]} $1)
+# }
+# compctl -K ant_complete ant build.sh
+#
+# @author Mike Williams
+
+my $cmdLine = $ENV{'COMP_LINE'};
+my $antCmd = $ARGV[0];
+my $word = $ARGV[1];
+
+my @completions;
+if ($word =~ /^-/) {
+ list( restrict( $word, getArguments() ));
+} elsif ($cmdLine =~ /-(f|buildfile)\s+\S*$/) {
+ list( getBuildFiles($word) );
+} else {
+ list( restrict( $word, getTargets() ));
+}
+
+exit(0);
+
+sub list {
+ for (@_) {
+ print "$_\n";
+ }
+}
+
+sub restrict {
+ my ($word, @completions) = @_;
+ grep( /^\Q$word\E/, @completions );
+}
+
+sub getArguments {
+ qw(-buildfile -debug -emacs -f -find -help -listener -logfile
+ -logger -projecthelp -quiet -verbose -version);
+}
+
+
+sub getBuildFiles {
+ my ($word) = @_;
+ grep( /\.xml$/, glob( "$word*" ));
+}
+
+sub getTargets {
+
+ # Look for build-file
+ my $buildFile = 'build.xml';
+ if ($cmdLine =~ /-(f|buildfile)\s+(\S+)/) {
+ $buildFile = $2;
+ }
+ return () unless (-f $buildFile);
+
+ # Run "ant -projecthelp" to list targets. Keep a cache of results in a
+ # cache-file.
+ my $cacheFile = $buildFile;
+ $cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|;
+ if ((!-e $cacheFile) || (-M $buildFile) < (-M $cacheFile)) {
+ open( CACHE, '>'.$cacheFile ) || die "can\'t write $cacheFile: $!\n";
+ open( HELP, "$antCmd -projecthelp -f '$buildFile'|" ) || return();
+ my %targets;
+ while( ) {
+ if (/^\s+(\S+)/) {
+ $targets{$1}++;
+ }
+ }
+ my @targets = sort keys %targets;
+ for (@targets) { print CACHE "$_\n"; }
+ return @targets;
+ }
+
+ # Read the target-cache
+ open( CACHE, $cacheFile ) || die "can\'t read $cacheFile: $!\n";
+ my @targets;
+ while () {
+ chop;
+ s/\r$//; # for Cygwin
+ push( @targets, $_ );
+ }
+ close( CACHE );
+ @targets;
+
+}
+
+
+
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/envset.cmd b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/envset.cmd
new file mode 100644
index 0000000000..3b074193e9
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/envset.cmd
@@ -0,0 +1,131 @@
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+SET environment variables
+First optional parameter:
+ ; parameters are considered parts of a path variable, semicolons are
+ appended to each element if not already present
+ -D parameters are properties for Java or Makefile etc., -D will be
+ prepended and the parameters will be separated by a space
+ =D the same as above but equal sign is not required
+ , parameters should be comma separated in the environment variable
+ - parameters should be separated by the next parameter
+ Other values mean that the first parameter is missing and the environment
+ variable will be set to the space separated parameters
+
+Second parameter: name of the environment variable
+
+Next parameters: values
+; implies that the equal sign is considered a part of the parameter and is
+not interpreted
+
+-D requires parameters in the form name=value. If the equal sign is not found,
+the parameters are changed to name=expanded_name
+
+Other options have optional equal sign. If it is found, only the part after
+the equal sign will be oprionally expanded.
+
+If the parameter is the minus sign, the next parameter will not be expanded.
+If the parameter is a single dot, it will be replaced with the value of the
+environment variable as it existed before envset was invoked.
+
+For other parameters the batch looks for the environment variable with the
+same name (in uppercase). If it is found, it forms the expanded_name. If
+the environment variable with such a name does not exist, the expanded_name
+will hold the parameter name without case conversion.
+*/
+
+parse arg mode envar args
+
+equal = 0
+sep = ' '
+
+/* Parse command line parameters */
+select
+ when mode='-' then do
+ sep = envar
+ parse var args envar args
+ end
+ when mode=';' then do
+ sep = ''
+ equal = -1
+ end
+ when mode='-D' then equal = 1
+ when mode='=D' then mode = '-D'
+ when mode=',' then sep = ','
+otherwise
+ args = envar args
+ envar = mode
+ mode = ''
+end
+
+env = 'OS2ENVIRONMENT'
+envar = translate(envar)
+orig = value(envar,,env)
+newval = ''
+expand = 1
+
+/* for each parameter... */
+do i = 1 to words(args)
+ if expand > 0 & word(args, i) = '-' then expand = 0
+ else call addval word(args, i)
+end
+
+/* Optionally enclose path variable by quotes */
+if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
+
+/* Set the new value, 'SET' cannot be used since it does not allow '=' */
+x = value(envar, newval, env)
+exit 0
+
+addval: procedure expose sep equal orig expand newval mode env
+parse arg var
+
+if var = '.' then expvar = orig
+else do
+ if equal >= 0 then do
+ parse var var name '=' val
+ if val = '' then var = name
+ else var = val
+ end
+ if expand = 0 then expvar = var
+ else expvar = value(translate(var),,env)
+ if expvar = '' then expvar = var
+ if equal >= 0 then do
+ if val = '' then do
+ parse var expvar key '=' val
+ if val <> '' then name = key
+ else do
+ if equal > 0 then val = key
+ else name = key
+ end
+ end
+ else val = expvar
+ if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
+ if val = '' then expvar = name
+ else expvar = name || '=' || val
+ end
+ if mode = '-D' then expvar = '-D' || expvar
+ if mode = ';' then do
+ if right(expvar, 1) <> ';' then expvar = expvar || ';'
+ end
+end
+
+if newval = '' then newval = expvar
+else newval = newval || sep || expvar
+expand = 1
+return
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/lcp.bat b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/lcp.bat
new file mode 100644
index 0000000000..4bf2e7ce1c
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/lcp.bat
@@ -0,0 +1,31 @@
+REM
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM
+REM
+
+set _CLASSPATHCOMPONENT=%1
+if ""%1""=="""" goto gotAllArgs
+shift
+
+:argCheck
+if ""%1""=="""" goto gotAllArgs
+set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
+shift
+goto argCheck
+
+:gotAllArgs
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT%
+
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl
new file mode 100644
index 0000000000..5f8307ac33
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl
@@ -0,0 +1,153 @@
+#!/usr/bin/perl
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#######################################################################
+#
+# runant.pl
+#
+# wrapper script for invoking ant in a platform with Perl installed
+# this may include cgi-bin invocation, which is considered somewhat daft.
+# (slo: that should be a separate file which can be derived from this
+# and returns the XML formatted output)
+#
+# the code is not totally portable due to classpath and directory splitting
+# issues. oops. (NB, use File::Spec::Functions will help and the code is
+# structured for the catfile() call, but because of perl version funnies
+# the code is not included.
+#
+# created: 2000-8-24
+# author: Steve Loughran steve_l@sourceforge.net
+#######################################################################
+#
+# Assumptions:
+#
+# - the "java" executable/script is on the command path
+# - ANT_HOME has been set
+# - target platform uses ":" as classpath separator or perl indicates it is dos/win32
+# - target platform uses "/" as directory separator.
+
+#be fussy about variables
+use strict;
+
+#platform specifics (disabled)
+#use File::Spec::Functions;
+
+#turn warnings on during dev; generates a few spurious uninitialised var access warnings
+#use warnings;
+
+#and set $debug to 1 to turn on trace info
+my $debug=1;
+
+#######################################################################
+#
+# check to make sure environment is setup
+#
+
+my $HOME = $ENV{ANT_HOME};
+if ($HOME eq "")
+ {
+ die "\n\nANT_HOME *MUST* be set!\n\n";
+ }
+
+my $JAVACMD = $ENV{JAVACMD};
+$JAVACMD = "java" if $JAVACMD eq "";
+
+my $onnetware = 0;
+if ($^O eq "NetWare")
+{
+ $onnetware = 1;
+}
+
+my $oncygwin = ($^O eq "cygwin");
+
+#ISSUE: what java wants to split up classpath varies from platform to platform
+#and perl is not too hot at hinting which box it is on.
+#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed.
+my $s=":";
+if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin") ||
+ ($onnetware == 1))
+ {
+ $s=";";
+ }
+
+#build up standard classpath
+my $localpath = "$HOME/lib/ant-launcher.jar";
+#set JVM options and Ant arguments, if any
+my @ANT_OPTS=split(" ", $ENV{ANT_OPTS});
+my @ANT_ARGS=split(" ", $ENV{ANT_ARGS});
+
+#jikes
+if($ENV{JIKESPATH} ne "")
+ {
+ push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}";
+ }
+
+#construct arguments to java
+my @ARGS;
+push @ARGS, @ANT_OPTS;
+
+my $CYGHOME = "";
+
+my $classpath=$ENV{CLASSPATH};
+if ($oncygwin == 1) {
+ $localpath = `cygpath --path --windows $localpath`;
+ chomp ($localpath);
+ if (! $classpath eq "")
+ {
+ $classpath = `cygpath --path --windows "$classpath"`;
+ chomp ($classpath);
+ }
+ $HOME = `cygpath --path --windows $HOME`;
+ chomp ($HOME);
+ $CYGHOME = `cygpath --path --windows $ENV{HOME}`;
+ chomp ($CYGHOME);
+}
+push @ARGS, "-classpath", "$localpath";
+push @ARGS, "-Dant.home=$HOME";
+if ( ! $CYGHOME eq "" )
+{
+ push @ARGS, "-Dcygwin.user.home=\"$CYGHOME\""
+}
+push @ARGS, "org.apache.tools.ant.launch.Launcher", @ANT_ARGS;
+push @ARGS, @ARGV;
+if (! $classpath eq "")
+{
+ if ($onnetware == 1)
+ {
+ # make classpath literally $CLASSPATH
+ # this is to avoid pushing us over the 512 character limit
+ # even skip the ; - that is already in $localpath
+ push @ARGS, "-lib", "\$CLASSPATH";
+ }
+ else
+ {
+ push @ARGS, "-lib", "$classpath";
+ }
+}
+print "\n $JAVACMD @ARGS\n\n" if ($debug);
+
+my $returnValue = system $JAVACMD, @ARGS;
+if ($returnValue eq 0)
+ {
+ exit 0;
+ }
+else
+ {
+ # only 0 and 1 are widely recognized as exit values
+ # so change the exit value to 1
+ exit 1;
+ }
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.py b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.py
new file mode 100644
index 0000000000..eec549ebd4
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.py
@@ -0,0 +1,102 @@
+#!/usr/bin/python
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+"""
+
+ runant.py
+
+ This script is a translation of the runant.pl written by Steve Loughran.
+ It runs ant with/out arguments, it should be quite portable (thanks to
+ the python os library)
+ This script has been tested with Python2.0/Win2K
+
+ created: 2001-04-11
+ author: Pierre Dittgen pierre.dittgen@criltelecom.com
+
+ Assumptions:
+
+ - the "java" executable/script is on the command path
+"""
+import os, os.path, string, sys
+
+# Change it to 1 to get extra debug information
+debug = 0
+
+#######################################################################
+
+# If ANT_HOME is not set default to script's parent directory
+if os.environ.has_key('ANT_HOME'):
+ ANT_HOME = os.environ['ANT_HOME']
+else:
+ ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+
+# set ANT_LIB location
+ANT_LIB = os.path.join(ANT_HOME, 'lib')
+
+# set JAVACMD (check variables JAVACMD and JAVA_HOME)
+JAVACMD = None
+if not os.environ.has_key('JAVACMD'):
+ if os.environ.has_key('JAVA_HOME'):
+ if not os.path.exists(os.environ['JAVA_HOME']):
+ print "Warning: JAVA_HOME is not defined correctly."
+ else:
+ JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java')
+ else:
+ print "Warning: JAVA_HOME not set."
+else:
+ JAVACMD = os.environ['JAVACMD']
+if not JAVACMD:
+ JAVACMD = 'java'
+
+launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
+if not os.path.exists(launcher_jar):
+ print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \
+ ANT_LIB
+
+# Build up standard classpath (LOCALCLASSPATH)
+LOCALCLASSPATH = launcher_jar
+if os.environ.has_key('LOCALCLASSPATH'):
+ LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
+
+ANT_OPTS = ""
+if os.environ.has_key('ANT_OPTS'):
+ ANT_OPTS = os.environ['ANT_OPTS']
+
+OPTS = ""
+if os.environ.has_key('JIKESPATH'):
+ OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
+
+ANT_ARGS = ""
+if os.environ.has_key('ANT_ARGS'):
+ ANT_ARGS = os.environ['ANT_ARGS']
+
+CLASSPATH = ""
+if os.environ.has_key('CLASSPATH'):
+ CLASSPATH = os.environ['CLASSPATH']
+
+# Builds the commandline
+cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
+ 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
+ % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
+ CLASSPATH, string.join(sys.argv[1:], ' '))
+
+if debug:
+ print '\n%s\n\n' % (cmdline)
+sys.stdout.flush()
+
+# Run the biniou!
+os.system(cmdline)
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runrc.cmd b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runrc.cmd
new file mode 100644
index 0000000000..c68f04d4aa
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runrc.cmd
@@ -0,0 +1,60 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ Run RC file, name is in the first arg, second arg is either PATH
+ ENV or -r or nothing
+*/
+
+parse arg name path rest
+
+if name = '' then do
+ say 'RC file name is missing'
+ exit 1
+end
+
+if rest \= '' then do
+ say 'Too many parameters'
+ exit 1
+end
+
+call runit name path
+exit 0
+
+runit: procedure
+parse arg name path dir
+
+if path \= '' & path \= '-r' then do
+ dir = value(translate(path),,'OS2ENVIRONMENT')
+ if dir = '' then return
+ dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
+end
+
+if dir = '' then dir = directory()
+
+if path = '-r' then do /* recursive call */
+ subdir = filespec('path', dir)
+ if subdir \= '\' then do
+ subdir = left(subdir, length(subdir)-1)
+ call runit name path filespec('drive', dir) || subdir
+ end
+end
+
+/* Look for the file and run it */
+if right(dir, 1) \= '\' then dir = dir || '\'
+rcfile = stream(dir || name, 'c', 'query exists')
+if rcfile \= '' then interpret 'call "' || rcfile || '"'
+
+return
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/changelog.xsl b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/changelog.xsl
new file mode 100644
index 0000000000..c6aef8fde1
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/etc/changelog.xsl
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <xsl:value-of select="$title"/>
+
+
+
+
+ To ensure accurate test runs on Java applications, developers need to know how much of
+ the code has been tested, and where to find any untested code. Coverage helps you
+ locate untested code, and measure precisely how much code has been exercised.
+ The result is a higher quality application in a shorter period of time.
+
+
The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability.
+
A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0).
+
The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible.
The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability.
+
A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0).
+
The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible.
+ Note: Rules checked have originated from style guidelines suggested by the language designers,
+ experience from the Java development community and insite experience. Violations are generally
+ reported with a reference to the Java Language Specifications (JLS x.x.x)
+ and Metamata Audit rules (x.x).
+ Please consult these documents for additional information about violations.
+
+ Rules checked also enforce adherence to Sun Java coding guidelines in use at Jakarta.
+
+ One should note that these violations do not necessary underline errors but should be used
+ as an indication for possible errors. As always, use your best judgment and review
+ them carefully, it might save you hours of debugging.
+
+This metric was introduced in the 1970s to measure the amount of control
+flow complexity or branching complexity in a module such as a
+subroutine. It gives the number of paths that may be taken through the
+code, and was initially developed to give some measure of the cost of
+producing a test case for the module by executing each path.
+
+Methods with a high cyclomatic complexity tend to be more difficult to
+understand and maintain. In general the more complex the methods of an
+application, the more difficult it will be to test it, and this will adversely
+affect its reliability.
+
+V(G) is a measure of the control flow complexity of a method or
+constructor. It counts the number of branches in the body of the method,
+defined as:
+
+
while statements;
+
if statements;
+
for statements.
+
+
+The metric can also be configured to count each case of a switch
+statement as well.
+
+
+
Lines of Code - LOC
+
+This is perhaps the simplest of all the metrics to define and compute.
+Counting lines has a long history as a software metric dating from before
+the rise of structured programming, and it is still in widespread use today.
+The size of a method affects the ease with which it can be understood, its
+reusability and its maintainability. There are a variety of ways that the size
+can be calculated. These include counting all the lines of code, the number
+of statements, the blank lines of code, the lines of commentary, and the
+lines consisting only of syntax such as block delimiters.
+
+This metric can also be used for sizing other constructs as well, for
+example, the overall size of a Java class or package can be measured by
+counting the number of source lines it consists of.
+
+LOC can be used to determine the size of a compilation unit (source file),
+class or interface, method, constructor, or field. It can be configured to
+ignore:
+
+
blank lines;
+
lines consisting only of comments;
+
lines consisting only of opening and closing braces.
+
+
+
+
Depth of Inheritance Hierarchy - DIT
+
+This metric calculates how far down the inheritance hierarchy a class is
+declared. In Java all classes have java.lang.Object as their ultimate
+superclass, which is defined to have a depth of 1. So a class that
+immediately extends java.lang.Object has a metric value of 2; any of its
+subclasses will have a value of 3, and so on.
+
+A class that is deep within the tree inherits more methods and state
+variables, thereby increasing its complexity and making it difficult to
+predict its behavior. It can be harder to understand a system with many
+inheritance layers.
+
+DIT is defined for classes and interfaces:
+
+
all interface types have a depth of 1;
+
the class java.lang.Object has a depth of 1;
+
all other classes have a depth of 1 + the depth of their super class.
+
+
+
+
Number of Attributes - NOA
+
+The number of distinct state variables in a class serves as one measure of
+its complexity. The more state a class represents the more difficult it is to
+maintain invariants for it. It also hinders comprehensibility and reuse.
+
+In Java, state can be exposed to subclasses through protected fields, which
+entails that the subclass also be aware of and maintain any invariants. This
+interference with the class's data encapsulation can be a source of defects
+and hidden dependencies between the state variables.
+
+NOA is defined for classes and interfaces. It counts the number of fields
+declared in the class or interface.
+
+
+
Number of Remote Methods - NRM
+
+NRM is defined for classes. A remote method call is defined as an
+invocation of a method that is not declared in any of:
+
+
the class itself;
+
a class or interface that the class extends or implements;
+
a class or method that extends the class.
+
+
+The value is the count of all the remote method calls in all of the methods
+and constructors of the class.
+
+
+
Number of Local Methods - NLM
+
+NLM is defined for classes and interfaces. A local method is defined as a
+method that is declared in the class or interface. NLM can be configured to
+include the local methods of all of the class's superclasses. Methods with
+public, protected, package and private visibility can be independently
+counted by setting configuration parameters.
+
+
+
Weighted Methods per Class - WMC
+
+If the number of methods in a class can be determined during the design
+and modeling phase of a project, it can be used as a predictor of how
+much time and effort is needed to develop, debug and maintain it. This
+metric can be further refined by incorporating a weighting for the
+complexity of each method. The usual weighting is given by the cyclomatic
+complexity of the method.
+
+The subclasses of a class inherit all of its public and protected methods,
+and possibly its package methods as well, so the number of methods a
+class has directly impacts the complexity of its subclasses. Classes with
+large numbers of methods are often specific to a particular application,
+reducing the ability to reuse them.
+
+The definition of WMC is based upon NLM, and it provides the same
+configuration parameters for counting inherited methods and of varying
+visibility. The main difference is that NLM always counts each method as 1,
+whereas WMC will weight each method. There are two weighting schemes:
+
+
V(G) the cyclomatic complexity of the method is used as its weight.
+ Methods from class files are given a V(G) of 1.
+
the arity, or the number of parameters of the method are used to
+ determine the weight.
+
+
+
+
Response For Class - RFC
+
+The response set of a class is the set of all methods that can be invoked as
+a result of a message sent to an object of the class. This includes methods
+in the class's inheritance hierarchy and methods that can be invoked on
+other objects. The Response For Class metric is defined to be size of the
+response set for the class. A class which provides a larger response set is
+considered to be more complex than one with a smaller response set.
+
+One reason for this is that if a method call on a class can result in a large
+number of different method calls on the target and other classes, then it
+can be harder to test the behavior of the class and debug problems. It will
+typically require a deeper understanding of the potential interactions that
+objects of the class can have with the rest of the system.
+
+RFC is defined as the sum of NLM and NRM for the class. The local methods
+include all of the public, protected, package and private methods, but not
+methods declared only in a superclass.
+
+
+
Data Abstraction Coupling - DAC
+
+DAC is defined for classes and interfaces. It counts the number of reference
+types that are used in the field declarations of the class or interface. The
+component types of arrays are also counted. Any field with a type that is
+either a supertype or a subtype of the class is not counted.
+
+
+
Fan Out - FANOUT
+
+FANOUT is defined for classes and interfaces, constructors and methods. It
+counts the number of reference types that are used in:
+
+
field declarations;
+
formal parameters and return types;
+
throws declarations;
+
local variables.
+
+
+The component types of arrays are also counted. Any type that is either a
+supertype or a subtype of the class is not counted.
+
+
+
Coupling Between Objects - CBO
+
+When one object or class uses another object or class they are said to be
+coupled. One major source of coupling is that between a superclass and a
+subclass. A coupling is also introduced when a method or field in another
+class is accessed, or when an object of another class is passed into or out
+of a method invocation. Coupling Between Objects is a measure of the
+non-inheritance coupling between two objects.
+
+A high value of coupling reduces the modularity of the class and makes
+reuse more difficult. The more independent a class is the more likely it is
+that it will be possible to reuse it in another part of the system. When a
+class is coupled to another class it becomes sensitive to changes in that
+class, thereby making maintenance for difficult. In addition, a class that is
+overly dependent on other classes can be difficult to understand and test in
+isolation.
+
+CBO is defined for classes and interfaces, constructors and methods. It
+counts the number of reference types that are used in:
+
+
field declarations
+
formal parameters and return types
+
throws declarations
+
local variables
+
+
+It also counts:
+
+
types from which field and method selections are made
+
+
+The component types of arrays are also counted. Any type that is either a
+supertype or a subtype of the class is not counted.
+
+
+
Lack of Cohesion Of Methods - LCOM
+
+The cohesion of a class is the degree to which its methods are related to
+each other. It is determined by examining the pattern of state variable
+accesses within the set of methods. If all the methods access the same state
+variables then they have high cohesion; if they access disjoint sets of
+variables then the cohesion is low. An extreme example of low cohesion
+would be if none of the methods accessed any of the state variables.
+
+If a class exhibits low method cohesion it indicates that the design of the
+class has probably been partitioned incorrectly, and could benefit by being
+split into more classes with individually higher cohesion. On the other
+hand, a high value of cohesion (a low lack of cohesion) implies that the
+class is well designed. A cohesive class will tend to provide a high degree
+of encapsulation, whereas a lack of cohesion decreases encapsulation and
+increases complexity.
+
+Another form of cohesion that is useful for Java programs is cohesion
+between nested and enclosing classes. A nested class that has very low
+cohesion with its enclosing class would probably better designed as a peer
+class rather than a nested class.
+
+LCOM is defined for classes. Operationally, LCOM takes each pair of
+methods in the class and determines the set of fields they each access. If
+they have disjoint sets of field accesses increase the count P by one. If they
+share at least one field access then increase Q by one. After considering
+each pair of methods,
+LCOM = (P > Q) ? (P - Q) : 0
+
+Indirect access to fields via local methods can be considered by setting a
+metric configuration parameter.
+
+
+
Number Of Classes - NOC
+
+The overall size of the system can be estimated by calculating the number
+of classes it contains. A large system with more classes is more complex
+than a smaller one because the number of potential interactions between
+objects is higher. This reduces the comprehensibility of the system which
+in turn makes it harder to test, debug and maintain.
+
+If the number of classes in the system can be projected during the initial
+design phase of the project it can serve as a base for estimating the total
+effort and cost of developing, debugging and maintaining the system.
+
+The NOC metric can also usefully be applied at the package and class level
+as well as the total system.
+
+NOCL is defined for class and interfaces. It counts the number of classes or
+interfaces that are declared. This is usually 1, but nested class declarations
+will increase this number.
+
+
+
+
+
+
+ .bannercell {
+ border: 0px;
+ padding: 0px;
+ }
+ body {
+ margin-left: 10;
+ margin-right: 10;
+ font:normal 80% arial,helvetica,sanserif;
+ background-color:#FFFFFF;
+ color:#000000;
+ }
+ .a td {
+ background: #efefef;
+ }
+ .b td {
+ background: #fff;
+ }
+ th, td {
+ text-align: left;
+ vertical-align: top;
+ }
+ th {
+ font-weight:bold;
+ background: #ccc;
+ color: black;
+ }
+ table, th, td {
+ font-size:100%;
+ border: none
+ }
+ table.log tr td, tr th {
+
+ }
+ h2 {
+ font-weight:bold;
+ font-size:140%;
+ margin-bottom: 5;
+ }
+ h3 {
+ font-size:100%;
+ font-weight:bold;
+ background: #525D76;
+ color: white;
+ text-decoration: none;
+ padding: 5px;
+ margin-right: 2px;
+ margin-left: 2px;
+ margin-bottom: 0;
+ }
+ .Error {
+ font-weight:bold; color:red;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
+ various kind of complexity. Complexity is a common source of problems and defects in software.
+ High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
+ a program.
+
+ The primary use of metrics is to focus your attention on those parts of code that potentially are
+ complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
+ actions.
+ For additional information about metrics and their meaning, please consult
+ Metamata Metrics manual.
+
+
+
+
+
Packages
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Package
+
+
+
+
+
+
+
+
+
+ Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
+ various kind of complexity. Complexity is a common source of problems and defects in software.
+ High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
+ a program.
+
+ The primary use of metrics is to focus your attention on those parts of code that potentially are
+ complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
+ actions.
+ For additional information about metrics and their meaning, please consult
+ Metamata Metrics manual.
+
+
+
+
+
+
+
+
+
diff --git a/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/plugin.properties b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/plugin.properties
new file mode 100644
index 0000000000..658714d777
--- /dev/null
+++ b/equinox-target/plugins/org.apache.ant_1.7.1.v20100518-1145/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2010 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+pluginName = Apache Ant
+providerName = Eclipse Orbit
diff --git a/extend/build.xml b/extend/build.xml
deleted file mode 100644
index 531d9081a0..0000000000
--- a/extend/build.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-
- This buildfile is used to build the extend subproject within
- the Adempiere project.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/oracleProvider/META-INF/MANIFEST.MF b/oracleProvider/META-INF/MANIFEST.MF
deleted file mode 100644
index 12d80bb545..0000000000
--- a/oracleProvider/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OracleProvider
-Bundle-SymbolicName: org.compiere.db.oracleProvider;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.tools;bundle-version="1.0.0"
-Bundle-ClassPath: .,
- ojdbc6.jar
diff --git a/oracleProvider/build.xml b/oracleProvider/build.xml
deleted file mode 100644
index 5e2f50e3fd..0000000000
--- a/oracleProvider/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
- This buildfile is used to build the client subproject within
- the Adempiere project.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.base-feature/.project b/org.adempiere.base-feature/.project
new file mode 100644
index 0000000000..9efdfe0ab5
--- /dev/null
+++ b/org.adempiere.base-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.base-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.base-feature/build.properties b/org.adempiere.base-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.base-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
new file mode 100644
index 0000000000..82a027fafc
--- /dev/null
+++ b/org.adempiere.base-feature/feature.xml
@@ -0,0 +1,348 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JasperReportsClient/.classpath b/org.adempiere.base.callout/.classpath
similarity index 100%
rename from JasperReportsClient/.classpath
rename to org.adempiere.base.callout/.classpath
diff --git a/org.adempiere.base.callout/.project b/org.adempiere.base.callout/.project
new file mode 100644
index 0000000000..f483a782fd
--- /dev/null
+++ b/org.adempiere.base.callout/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.base.callout
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b3ab3997db
--- /dev/null
+++ b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Sep 27 17:21:19 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.base.callout/.settings/org.eclipse.pde.core.prefs b/org.adempiere.base.callout/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..0d05d718d0
--- /dev/null
+++ b/org.adempiere.base.callout/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 27 17:21:19 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..0b8e9e875a
--- /dev/null
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Callout
+Bundle-SymbolicName: org.adempiere.base.callout
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Eclipse-RegisterBuddy: org.adempiere.base
+
diff --git a/plugins/pluginUtils/build.properties b/org.adempiere.base.callout/build.properties
similarity index 100%
rename from plugins/pluginUtils/build.properties
rename to org.adempiere.base.callout/build.properties
diff --git a/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerLocation.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerLocation.java
new file mode 100644
index 0000000000..a140483503
--- /dev/null
+++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerLocation.java
@@ -0,0 +1,85 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
+ * 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. *
+ * For the text or an alternative of this public license, you may reach us *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA *
+ * or via info@compiere.org or http://www.compiere.org/license.html *
+ *****************************************************************************/
+package org.adempiere.model;
+
+import java.util.Properties;
+
+import org.compiere.model.CalloutEngine;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+import org.compiere.model.MBPartnerLocation;
+import org.compiere.model.MColumn;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+
+/**
+ * BPartnerLocation Callouts.
+ *
+ * @author Jesus Garcia / Carlos Ruiz - globalqss
+ */
+public class CalloutBPartnerLocation extends CalloutEngine
+{
+
+ /**
+ * Format Phone No based on Country.
+ * Called from C_BPartnerLocation.C_Location_ID
+ *
+ * @param ctx Context
+ * @param WindowNo current Window No
+ * @param mTab Model Tab
+ * @param mField Model Field
+ * @param value The new value
+ * @param oldvalue The old value
+ * @return Error message or ""
+ */
+ public String formatPhone (Properties ctx, int WindowNo,
+ GridTab mTab, GridField mField, Object value, Object oldValue)
+ {
+ log.info("");
+ // Called from C_Location_ID field
+ Integer location_int = (Integer) mField.getValue();
+
+ String phone_frm = null;
+ if (location_int != null)
+ // take the phone format from country
+ phone_frm = DB.getSQLValueString(null, "SELECT ExpressionPhone FROM C_Country c, C_Location l WHERE c.C_Country_ID = l.C_Country_ID AND l.C_location_ID = ?", location_int);
+
+ GridField fPhone = mTab.getField(MBPartnerLocation.COLUMNNAME_Phone);
+ MColumn colPhone = null;
+ if (fPhone != null)
+ colPhone = MColumn.get(Env.getCtx(), fPhone.getAD_Column_ID());
+ GridField fPhone2 = mTab.getField(MBPartnerLocation.COLUMNNAME_Phone2);
+ MColumn colPhone2 = null;
+ if (fPhone2 != null)
+ colPhone2 = MColumn.get(Env.getCtx(), fPhone2.getAD_Column_ID());
+ GridField fFax = mTab.getField(MBPartnerLocation.COLUMNNAME_Fax);
+ MColumn colFax = null;
+ if (fFax != null)
+ colFax = MColumn.get(Env.getCtx(), fFax.getAD_Column_ID());
+
+ // Apply the country format if the column doesn't have format
+ if (colPhone != null && (colPhone.getVFormat() == null || colPhone.getVFormat().length() == 0))
+ fPhone.setVFormat(phone_frm);
+ if (colPhone2 != null && (colPhone2.getVFormat() == null || colPhone2.getVFormat().length() == 0))
+ fPhone2.setVFormat(phone_frm);
+ if (colFax != null && (colFax.getVFormat() == null || colFax.getVFormat().length() == 0))
+ fFax.setVFormat(phone_frm);
+
+ return "";
+ } // formatPhone
+
+} // CalloutBPartnerLocation
\ No newline at end of file
diff --git a/base/src/org/compiere/util/CLogMgtLog4J.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
similarity index 51%
rename from base/src/org/compiere/util/CLogMgtLog4J.java
rename to org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
index cad7769cf7..3bd6e895d8 100644
--- a/base/src/org/compiere/util/CLogMgtLog4J.java
+++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
@@ -13,56 +13,48 @@
* For the text or an alternative of this public license, you may reach us *
* ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA *
* or via info@compiere.org or http://www.compiere.org/license.html *
- *****************************************************************************/
-package org.compiere.util;
+ *****************************************************************************/
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+package org.adempiere.model;
+
+import java.util.Properties;
+
+import org.compiere.model.CalloutEngine;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+import org.compiere.util.DB;
/**
- * Log4J Utilities.
- * Not intended to be called directly
- *
- * @author Jorg Janke
- * @version $Id: CLogMgtLog4J.java,v 1.2 2006/07/30 00:54:36 jjanke Exp $
+ *
+ * @author Ashley G Ramdass
*/
-public class CLogMgtLog4J
+public class CalloutRMA extends CalloutEngine
{
- /**
- * Initialize Logging
- * @param isClient client
- */
- protected static void initialize(boolean isClient)
- {
- if (isClient)
- {
- LogManager.resetConfiguration();
- Logger rootLogger = LogManager.getRootLogger();
- rootLogger.setLevel(s_currentLevelLog4J);
- }
- } // initialize
- /** Current Lo4J Level */
- private static Level s_currentLevelLog4J = Level.WARN;
-
-
- /**
- * Enable/Disable Log4J logging
- * @param enableLogging false assumed
- */
- public static void enable (boolean enableLogging)
- {
- Logger rootLogger = LogManager.getRootLogger();
- if (enableLogging)
- rootLogger.setLevel(s_currentLevelLog4J);
- else
- {
- Level level = rootLogger.getLevel();
- rootLogger.setLevel(Level.OFF);
- s_currentLevelLog4J = level;
- }
- } // enableLog4J
-
-
-} // ClientLogMgtLog4J
+ /**
+ * docType - set document properties based on document type.
+ * @param ctx
+ * @param WindowNo
+ * @param mTab
+ * @param mField
+ * @param value
+ * @return error message or ""
+ */
+ public String docType (Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value)
+ {
+ Integer C_DocType_ID = (Integer)value;
+ if (C_DocType_ID == null || C_DocType_ID.intValue() == 0)
+ return "";
+
+ String sql = "SELECT d.IsSoTrx "
+ + "FROM C_DocType d WHERE C_DocType_ID=?";
+
+ String docSOTrx = DB.getSQLValueString(null, sql, C_DocType_ID);
+
+ boolean isSOTrx = "Y".equals(docSOTrx);
+
+ mTab.setValue("IsSOTrx", isSOTrx);
+
+ return "";
+ }
+}
diff --git a/base/src/org/compiere/model/CalloutAssignment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutAssignment.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java
diff --git a/base/src/org/compiere/model/CalloutBankStatement.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutBankStatement.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutBankStatement.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutBankStatement.java
diff --git a/base/src/org/compiere/model/CalloutCashJournal.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutCashJournal.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java
diff --git a/base/src/org/compiere/model/CalloutClient.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutClient.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutClient.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutClient.java
diff --git a/base/src/org/compiere/model/CalloutGLJournal.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutGLJournal.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java
diff --git a/base/src/org/compiere/model/CalloutInOut.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutInOut.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java
diff --git a/base/src/org/compiere/model/CalloutInventory.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInventory.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutInventory.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutInventory.java
diff --git a/base/src/org/compiere/model/CalloutInvoice.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutInvoice.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
diff --git a/base/src/org/compiere/model/CalloutInvoiceBatch.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutInvoiceBatch.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
diff --git a/base/src/org/compiere/model/CalloutMovement.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutMovement.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutMovement.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutMovement.java
diff --git a/base/src/org/compiere/model/CalloutOrder.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutOrder.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
diff --git a/base/src/org/compiere/model/CalloutPaySelection.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutPaySelection.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java
diff --git a/base/src/org/compiere/model/CalloutPayment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutPayment.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java
diff --git a/base/src/org/compiere/model/CalloutPaymentAllocate.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutPaymentAllocate.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java
diff --git a/base/src/org/compiere/model/CalloutProductCategory.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutProductCategory.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java
diff --git a/base/src/org/compiere/model/CalloutProduction.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutProduction.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java
diff --git a/base/src/org/compiere/model/CalloutProject.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutProject.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java
diff --git a/base/src/org/compiere/model/CalloutRequest.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutRequest.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java
diff --git a/base/src/org/compiere/model/CalloutRequisition.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutRequisition.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java
diff --git a/base/src/org/compiere/model/CalloutTimeExpense.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutTimeExpense.java
rename to org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java
diff --git a/base/src/org/compiere/model/Callout_AD_Column.java b/org.adempiere.base.callout/src/org/compiere/model/Callout_AD_Column.java
similarity index 100%
rename from base/src/org/compiere/model/Callout_AD_Column.java
rename to org.adempiere.base.callout/src/org/compiere/model/Callout_AD_Column.java
diff --git a/pipo/.classpath b/org.adempiere.base.model/.classpath
similarity index 100%
rename from pipo/.classpath
rename to org.adempiere.base.model/.classpath
diff --git a/oracleProvider/.project b/org.adempiere.base.model/.project
similarity index 94%
rename from oracleProvider/.project
rename to org.adempiere.base.model/.project
index 599b5c3239..e3ee38435b 100644
--- a/oracleProvider/.project
+++ b/org.adempiere.base.model/.project
@@ -1,6 +1,6 @@
- oracleProvider
+ org.adempiere.base.model
diff --git a/org.adempiere.base.model/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.model/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..78482a7b3a
--- /dev/null
+++ b/org.adempiere.base.model/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Sep 27 17:55:58 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.base.model/.settings/org.eclipse.pde.core.prefs b/org.adempiere.base.model/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..15e63748b4
--- /dev/null
+++ b/org.adempiere.base.model/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 27 17:55:58 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.base.model/META-INF/MANIFEST.MF b/org.adempiere.base.model/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..3d02e0a6fe
--- /dev/null
+++ b/org.adempiere.base.model/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Adempiere Model
+Bundle-SymbolicName: org.adempiere.base.model
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.adempiere.base;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tomcatConfig/build.properties b/org.adempiere.base.model/build.properties
similarity index 100%
rename from tomcatConfig/build.properties
rename to org.adempiere.base.model/build.properties
diff --git a/pipoHandlers/.classpath b/org.adempiere.base.process/.classpath
similarity index 100%
rename from pipoHandlers/.classpath
rename to org.adempiere.base.process/.classpath
diff --git a/org.adempiere.base.process/.project b/org.adempiere.base.process/.project
new file mode 100644
index 0000000000..e6c4a6063b
--- /dev/null
+++ b/org.adempiere.base.process/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.base.process
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..9a68a15ddf
--- /dev/null
+++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Sep 27 16:09:02 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.base.process/.settings/org.eclipse.pde.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..3f37966fef
--- /dev/null
+++ b/org.adempiere.base.process/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 27 16:09:03 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..2826f06d34
--- /dev/null
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Adempiere Processes
+Bundle-SymbolicName: org.adempiere.base.process
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Export-Package: org.adempiere.process
+Import-Package: javax.mail;version="1.4.1",
+ javax.mail.internet;version="1.4.1",
+ javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
+ org.apache.commons.collections.keyvalue;version="3.2.1"
+Eclipse-RegisterBuddy: org.adempiere.base
diff --git a/org.adempiere.base.process/build.properties b/org.adempiere.base.process/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/org.adempiere.base.process/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/base/src/org/adempiere/process/ASPGenerateFields.java b/org.adempiere.base.process/src/org/adempiere/process/ASPGenerateFields.java
similarity index 100%
rename from base/src/org/adempiere/process/ASPGenerateFields.java
rename to org.adempiere.base.process/src/org/adempiere/process/ASPGenerateFields.java
diff --git a/base/src/org/adempiere/process/ASPGenerateLevel.java b/org.adempiere.base.process/src/org/adempiere/process/ASPGenerateLevel.java
similarity index 100%
rename from base/src/org/adempiere/process/ASPGenerateLevel.java
rename to org.adempiere.base.process/src/org/adempiere/process/ASPGenerateLevel.java
diff --git a/base/src/org/adempiere/process/AllocateSalesOrders.java b/org.adempiere.base.process/src/org/adempiere/process/AllocateSalesOrders.java
similarity index 51%
rename from base/src/org/adempiere/process/AllocateSalesOrders.java
rename to org.adempiere.base.process/src/org/adempiere/process/AllocateSalesOrders.java
index 91541d30df..c4bb976096 100644
--- a/base/src/org/adempiere/process/AllocateSalesOrders.java
+++ b/org.adempiere.base.process/src/org/adempiere/process/AllocateSalesOrders.java
@@ -2,15 +2,11 @@ package org.adempiere.process;
import java.math.BigDecimal;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
import java.util.logging.Level;
+import org.compiere.model.MOrder;
import org.compiere.model.MOrderLine;
import org.compiere.model.MOrgInfo;
import org.compiere.model.MProduct;
@@ -19,7 +15,6 @@ import org.compiere.model.MWarehouse;
import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess;
import org.compiere.util.DB;
-import org.compiere.util.Env;
/**
* This process finds all complete sales orders that has physical items yet to
@@ -32,27 +27,6 @@ public class AllocateSalesOrders extends SvrProcess {
private int m_warehouseId;
- public static class StockInfo {
-
- public int productId;
- public BigDecimal qtyOnHand;
- public BigDecimal qtyAvailable;
- public BigDecimal qtyReserved;
- public BigDecimal qtyAllocated;
-
- public StockInfo() {}
-
- }
-
- private static final String
- query = "select C_OrderLine.* from C_OrderLine " +
- "JOIN C_Order ON C_OrderLine.C_Order_ID=C_Order.C_Order_ID " +
- "JOIN M_Product ON C_OrderLine.M_Product_ID=M_Product.M_Product_ID " +
- "where C_Order.IsSOTrx='Y' AND C_Order.DocStatus='CO' AND QtyAllocated<(QtyOrdered-QtyDelivered) " +
- "AND M_Product.M_Product_ID=? " +
- "order by PriorityRule, C_OrderLine.Created ";
-
-
@Override
protected void prepare() {
@@ -71,80 +45,13 @@ public class AllocateSalesOrders extends SvrProcess {
}
- /**
- * Finds all order lines that contains not yet delivered physical items of a specific product.
- *
- * @param conn An open connection.
- * @param productId The product id being allocated
- * @return Order lines to allocate products to.
- * @throws SQLException
- */
- public static List getOrderLinesToAllocate(Connection conn, int productId, String trxName) throws SQLException {
- List result = new Vector();
- Properties ctx = Env.getCtx();
- MOrderLine line;
- PreparedStatement ps = conn.prepareStatement(query);
- ps.setInt(1, productId);
- ResultSet rs = ps.executeQuery();
- while(rs.next()) {
- line = new MOrderLine(ctx, rs, trxName);
- result.add(line);
- }
- rs.close();
- ps.close();
- return(result);
- }
- /**
- * Finds all products that can be allocated. A product can be allocated if there are more items
- * on hand than what is already allocated. To be allocated the item must also be in demand
- * (reserved < allocated)
- *
- * @param conn
- * @return
- * @throws SQLException
- */
- public static List getProductsToAllocate(Connection conn, int WarehouseID) throws SQLException {
-
- List result = new Vector();
- StockInfo si;
- String query1 = "select M_Product_ID, sum(qtyonhand), sum(qtyreserved), sum(m_Product_Stock_v.qtyallocated) " +
- "from M_Product_Stock_v " +
- "WHERE M_Warehouse_ID=? AND M_Product_ID in " +
- "(select DISTINCT C_OrderLine.M_Product_ID FROM C_OrderLine " +
- "JOIN C_Order ON C_OrderLine.C_Order_ID=C_Order.C_Order_ID " +
- "JOIN M_Product ON C_OrderLine.M_Product_ID=M_Product.M_Product_ID " +
- "JOIN M_Product_Stock_v ON C_OrderLine.M_Product_ID=M_Product_Stock_v.M_Product_ID " +
- "WHERE " +
- "C_Order.IsSOTrx='Y' AND C_Order.DocStatus='CO' AND C_OrderLine.M_Warehouse_ID=? AND " +
- "(QtyOrdered-QtyDelivered)>0 AND (QtyOrdered-QtyDelivered)>C_OrderLine.QtyAllocated)" +
- "group by M_Product_ID " +
- "order by M_Product_ID";
-
- PreparedStatement ps = conn.prepareStatement(query1);
- ps.setInt(1, WarehouseID);
- ps.setInt(2, WarehouseID);
- ResultSet rs = ps.executeQuery();
-
- while(rs.next()) {
- si = new StockInfo();
- si.productId = rs.getInt(1);
- si.qtyOnHand = rs.getBigDecimal(2);
- si.qtyReserved = rs.getBigDecimal(3);
- si.qtyAvailable = si.qtyOnHand.subtract(si.qtyReserved);
- si.qtyAllocated = rs.getBigDecimal(4);
- result.add(si);
- }
- rs.close();
- ps.close();
- return(result);
- }
@Override
protected String doIt() throws Exception {
Connection conn = DB.getConnectionRO();
- List products = AllocateSalesOrders.getProductsToAllocate(conn, m_warehouseId);
+ List products = MOrder.getProductsToAllocate(conn, m_warehouseId);
conn.close();
List lines;
MOrderLine line;
@@ -154,7 +61,7 @@ public class AllocateSalesOrders extends SvrProcess {
BigDecimal allocated;
BigDecimal qtyAvailable;
BigDecimal willAllocate;
- StockInfo si;
+ MOrder.StockInfo si;
// Make sure we have settings that needs allocation
MWarehouse warehouse = new MWarehouse(getCtx(), m_warehouseId, get_TrxName());
@@ -169,13 +76,13 @@ public class AllocateSalesOrders extends SvrProcess {
}
/** Iterate through all products to allocate */
- for (Iterator it = products.iterator(); it.hasNext();) {
+ for (Iterator it = products.iterator(); it.hasNext();) {
MProduct product = null;
si = it.next();
conn = DB.getConnectionRO();
// Get all lines to allocate
- lines = AllocateSalesOrders.getOrderLinesToAllocate(conn, si.productId, get_TrxName());
+ lines = MOrder.getOrderLinesToAllocate(conn, si.productId, get_TrxName());
conn.close();
// Check if there are any lines to allocate
diff --git a/base/src/org/adempiere/process/ApplyMigrationScripts.java b/org.adempiere.base.process/src/org/adempiere/process/ApplyMigrationScripts.java
similarity index 100%
rename from base/src/org/adempiere/process/ApplyMigrationScripts.java
rename to org.adempiere.base.process/src/org/adempiere/process/ApplyMigrationScripts.java
diff --git a/base/src/org/adempiere/process/ClientAcctProcessor.java b/org.adempiere.base.process/src/org/adempiere/process/ClientAcctProcessor.java
similarity index 100%
rename from base/src/org/adempiere/process/ClientAcctProcessor.java
rename to org.adempiere.base.process/src/org/adempiere/process/ClientAcctProcessor.java
diff --git a/base/src/org/adempiere/process/ExpenseTypesFromAccounts.java b/org.adempiere.base.process/src/org/adempiere/process/ExpenseTypesFromAccounts.java
similarity index 100%
rename from base/src/org/adempiere/process/ExpenseTypesFromAccounts.java
rename to org.adempiere.base.process/src/org/adempiere/process/ExpenseTypesFromAccounts.java
diff --git a/base/src/org/adempiere/process/Export.java b/org.adempiere.base.process/src/org/adempiere/process/Export.java
similarity index 100%
rename from base/src/org/adempiere/process/Export.java
rename to org.adempiere.base.process/src/org/adempiere/process/Export.java
diff --git a/base/src/org/adempiere/process/HouseKeeping.java b/org.adempiere.base.process/src/org/adempiere/process/HouseKeeping.java
similarity index 100%
rename from base/src/org/adempiere/process/HouseKeeping.java
rename to org.adempiere.base.process/src/org/adempiere/process/HouseKeeping.java
diff --git a/base/src/org/adempiere/process/ImmediateBankTransfer.java b/org.adempiere.base.process/src/org/adempiere/process/ImmediateBankTransfer.java
similarity index 100%
rename from base/src/org/adempiere/process/ImmediateBankTransfer.java
rename to org.adempiere.base.process/src/org/adempiere/process/ImmediateBankTransfer.java
diff --git a/base/src/org/adempiere/process/ImportPriceList.java b/org.adempiere.base.process/src/org/adempiere/process/ImportPriceList.java
similarity index 100%
rename from base/src/org/adempiere/process/ImportPriceList.java
rename to org.adempiere.base.process/src/org/adempiere/process/ImportPriceList.java
diff --git a/base/src/org/adempiere/process/InOutGenerateRMA.java b/org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java
similarity index 100%
rename from base/src/org/adempiere/process/InOutGenerateRMA.java
rename to org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java
diff --git a/base/src/org/adempiere/process/InitialClientSetup.java b/org.adempiere.base.process/src/org/adempiere/process/InitialClientSetup.java
similarity index 100%
rename from base/src/org/adempiere/process/InitialClientSetup.java
rename to org.adempiere.base.process/src/org/adempiere/process/InitialClientSetup.java
diff --git a/base/src/org/adempiere/process/InvoiceGenerateRMA.java b/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java
similarity index 100%
rename from base/src/org/adempiere/process/InvoiceGenerateRMA.java
rename to org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java
diff --git a/base/src/org/adempiere/process/PrepareMigrationScripts.java b/org.adempiere.base.process/src/org/adempiere/process/PrepareMigrationScripts.java
similarity index 100%
rename from base/src/org/adempiere/process/PrepareMigrationScripts.java
rename to org.adempiere.base.process/src/org/adempiere/process/PrepareMigrationScripts.java
diff --git a/base/src/org/adempiere/process/RMACreateOrder.java b/org.adempiere.base.process/src/org/adempiere/process/RMACreateOrder.java
similarity index 100%
rename from base/src/org/adempiere/process/RMACreateOrder.java
rename to org.adempiere.base.process/src/org/adempiere/process/RMACreateOrder.java
diff --git a/base/src/org/adempiere/process/SignDatabaseBuild.java b/org.adempiere.base.process/src/org/adempiere/process/SignDatabaseBuild.java
similarity index 100%
rename from base/src/org/adempiere/process/SignDatabaseBuild.java
rename to org.adempiere.base.process/src/org/adempiere/process/SignDatabaseBuild.java
diff --git a/base/src/org/adempiere/process/UpdateRoleMenu.java b/org.adempiere.base.process/src/org/adempiere/process/UpdateRoleMenu.java
similarity index 100%
rename from base/src/org/adempiere/process/UpdateRoleMenu.java
rename to org.adempiere.base.process/src/org/adempiere/process/UpdateRoleMenu.java
diff --git a/base/src/org/adempiere/process/UpdateSequenceNo.java b/org.adempiere.base.process/src/org/adempiere/process/UpdateSequenceNo.java
similarity index 100%
rename from base/src/org/adempiere/process/UpdateSequenceNo.java
rename to org.adempiere.base.process/src/org/adempiere/process/UpdateSequenceNo.java
diff --git a/base/src/org/compiere/process/AD_PrintPaper_Default.java b/org.adempiere.base.process/src/org/compiere/process/AD_PrintPaper_Default.java
similarity index 100%
rename from base/src/org/compiere/process/AD_PrintPaper_Default.java
rename to org.adempiere.base.process/src/org/compiere/process/AD_PrintPaper_Default.java
diff --git a/base/src/org/compiere/process/AcctSchemaCopyAcct.java b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java
similarity index 100%
rename from base/src/org/compiere/process/AcctSchemaCopyAcct.java
rename to org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java
diff --git a/base/src/org/compiere/process/AcctSchemaDefaultCopy.java b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaDefaultCopy.java
similarity index 100%
rename from base/src/org/compiere/process/AcctSchemaDefaultCopy.java
rename to org.adempiere.base.process/src/org/compiere/process/AcctSchemaDefaultCopy.java
diff --git a/base/src/org/compiere/process/Aging.java b/org.adempiere.base.process/src/org/compiere/process/Aging.java
similarity index 100%
rename from base/src/org/compiere/process/Aging.java
rename to org.adempiere.base.process/src/org/compiere/process/Aging.java
diff --git a/base/src/org/compiere/process/AllocationAuto.java b/org.adempiere.base.process/src/org/compiere/process/AllocationAuto.java
similarity index 100%
rename from base/src/org/compiere/process/AllocationAuto.java
rename to org.adempiere.base.process/src/org/compiere/process/AllocationAuto.java
diff --git a/base/src/org/compiere/process/AllocationReset.java b/org.adempiere.base.process/src/org/compiere/process/AllocationReset.java
similarity index 100%
rename from base/src/org/compiere/process/AllocationReset.java
rename to org.adempiere.base.process/src/org/compiere/process/AllocationReset.java
diff --git a/base/src/org/compiere/process/AssetDelivery.java b/org.adempiere.base.process/src/org/compiere/process/AssetDelivery.java
similarity index 100%
rename from base/src/org/compiere/process/AssetDelivery.java
rename to org.adempiere.base.process/src/org/compiere/process/AssetDelivery.java
diff --git a/base/src/org/compiere/process/BOMValidate.java b/org.adempiere.base.process/src/org/compiere/process/BOMValidate.java
similarity index 100%
rename from base/src/org/compiere/process/BOMValidate.java
rename to org.adempiere.base.process/src/org/compiere/process/BOMValidate.java
diff --git a/base/src/org/compiere/process/BPGroupAcctCopy.java b/org.adempiere.base.process/src/org/compiere/process/BPGroupAcctCopy.java
similarity index 100%
rename from base/src/org/compiere/process/BPGroupAcctCopy.java
rename to org.adempiere.base.process/src/org/compiere/process/BPGroupAcctCopy.java
diff --git a/base/src/org/compiere/process/BPartnerOrgLink.java b/org.adempiere.base.process/src/org/compiere/process/BPartnerOrgLink.java
similarity index 100%
rename from base/src/org/compiere/process/BPartnerOrgLink.java
rename to org.adempiere.base.process/src/org/compiere/process/BPartnerOrgLink.java
diff --git a/base/src/org/compiere/process/BPartnerOrgUnLink.java b/org.adempiere.base.process/src/org/compiere/process/BPartnerOrgUnLink.java
similarity index 100%
rename from base/src/org/compiere/process/BPartnerOrgUnLink.java
rename to org.adempiere.base.process/src/org/compiere/process/BPartnerOrgUnLink.java
diff --git a/base/src/org/compiere/process/BPartnerValidate.java b/org.adempiere.base.process/src/org/compiere/process/BPartnerValidate.java
similarity index 100%
rename from base/src/org/compiere/process/BPartnerValidate.java
rename to org.adempiere.base.process/src/org/compiere/process/BPartnerValidate.java
diff --git a/base/src/org/compiere/process/BankStatementMatcher.java b/org.adempiere.base.process/src/org/compiere/process/BankStatementMatcher.java
similarity index 100%
rename from base/src/org/compiere/process/BankStatementMatcher.java
rename to org.adempiere.base.process/src/org/compiere/process/BankStatementMatcher.java
diff --git a/base/src/org/compiere/process/BankStatementPayment.java b/org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java
similarity index 100%
rename from base/src/org/compiere/process/BankStatementPayment.java
rename to org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java
diff --git a/base/src/org/compiere/process/CacheReset.java b/org.adempiere.base.process/src/org/compiere/process/CacheReset.java
similarity index 100%
rename from base/src/org/compiere/process/CacheReset.java
rename to org.adempiere.base.process/src/org/compiere/process/CacheReset.java
diff --git a/base/src/org/compiere/process/ChangeLogProcess.java b/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java
similarity index 100%
rename from base/src/org/compiere/process/ChangeLogProcess.java
rename to org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java
diff --git a/base/src/org/compiere/process/ColumnEncryption.java b/org.adempiere.base.process/src/org/compiere/process/ColumnEncryption.java
similarity index 100%
rename from base/src/org/compiere/process/ColumnEncryption.java
rename to org.adempiere.base.process/src/org/compiere/process/ColumnEncryption.java
diff --git a/base/src/org/compiere/process/ColumnSync.java b/org.adempiere.base.process/src/org/compiere/process/ColumnSync.java
similarity index 100%
rename from base/src/org/compiere/process/ColumnSync.java
rename to org.adempiere.base.process/src/org/compiere/process/ColumnSync.java
diff --git a/base/src/org/compiere/process/CommissionAPInvoice.java b/org.adempiere.base.process/src/org/compiere/process/CommissionAPInvoice.java
similarity index 100%
rename from base/src/org/compiere/process/CommissionAPInvoice.java
rename to org.adempiere.base.process/src/org/compiere/process/CommissionAPInvoice.java
diff --git a/base/src/org/compiere/process/CommissionCalc.java b/org.adempiere.base.process/src/org/compiere/process/CommissionCalc.java
similarity index 100%
rename from base/src/org/compiere/process/CommissionCalc.java
rename to org.adempiere.base.process/src/org/compiere/process/CommissionCalc.java
diff --git a/base/src/org/compiere/process/CommissionCopy.java b/org.adempiere.base.process/src/org/compiere/process/CommissionCopy.java
similarity index 100%
rename from base/src/org/compiere/process/CommissionCopy.java
rename to org.adempiere.base.process/src/org/compiere/process/CommissionCopy.java
diff --git a/base/src/org/compiere/process/CopyColumnsFromTable.java b/org.adempiere.base.process/src/org/compiere/process/CopyColumnsFromTable.java
similarity index 100%
rename from base/src/org/compiere/process/CopyColumnsFromTable.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyColumnsFromTable.java
diff --git a/base/src/org/compiere/process/CopyFromInvoice.java b/org.adempiere.base.process/src/org/compiere/process/CopyFromInvoice.java
similarity index 100%
rename from base/src/org/compiere/process/CopyFromInvoice.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyFromInvoice.java
diff --git a/base/src/org/compiere/process/CopyFromJournal.java b/org.adempiere.base.process/src/org/compiere/process/CopyFromJournal.java
similarity index 100%
rename from base/src/org/compiere/process/CopyFromJournal.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyFromJournal.java
diff --git a/base/src/org/compiere/process/CopyFromOrder.java b/org.adempiere.base.process/src/org/compiere/process/CopyFromOrder.java
similarity index 100%
rename from base/src/org/compiere/process/CopyFromOrder.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyFromOrder.java
diff --git a/base/src/org/compiere/process/CopyFromProject.java b/org.adempiere.base.process/src/org/compiere/process/CopyFromProject.java
similarity index 100%
rename from base/src/org/compiere/process/CopyFromProject.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyFromProject.java
diff --git a/base/src/org/compiere/process/CopyOrder.java b/org.adempiere.base.process/src/org/compiere/process/CopyOrder.java
similarity index 100%
rename from base/src/org/compiere/process/CopyOrder.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyOrder.java
diff --git a/base/src/org/compiere/process/CopyProduct.java b/org.adempiere.base.process/src/org/compiere/process/CopyProduct.java
similarity index 100%
rename from base/src/org/compiere/process/CopyProduct.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyProduct.java
diff --git a/base/src/org/compiere/process/CopyReportProcess.java b/org.adempiere.base.process/src/org/compiere/process/CopyReportProcess.java
similarity index 100%
rename from base/src/org/compiere/process/CopyReportProcess.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyReportProcess.java
diff --git a/base/src/org/compiere/process/CopyRole.java b/org.adempiere.base.process/src/org/compiere/process/CopyRole.java
similarity index 100%
rename from base/src/org/compiere/process/CopyRole.java
rename to org.adempiere.base.process/src/org/compiere/process/CopyRole.java
diff --git a/base/src/org/compiere/process/CostCreate.java b/org.adempiere.base.process/src/org/compiere/process/CostCreate.java
similarity index 100%
rename from base/src/org/compiere/process/CostCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/CostCreate.java
diff --git a/base/src/org/compiere/process/CostUpdate.java b/org.adempiere.base.process/src/org/compiere/process/CostUpdate.java
similarity index 100%
rename from base/src/org/compiere/process/CostUpdate.java
rename to org.adempiere.base.process/src/org/compiere/process/CostUpdate.java
diff --git a/base/src/org/compiere/process/DiscountSchemaReSeq.java b/org.adempiere.base.process/src/org/compiere/process/DiscountSchemaReSeq.java
similarity index 100%
rename from base/src/org/compiere/process/DiscountSchemaReSeq.java
rename to org.adempiere.base.process/src/org/compiere/process/DiscountSchemaReSeq.java
diff --git a/base/src/org/compiere/process/DistributionCreate.java b/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java
similarity index 100%
rename from base/src/org/compiere/process/DistributionCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java
diff --git a/base/src/org/compiere/process/DistributionRun.java b/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java
similarity index 100%
rename from base/src/org/compiere/process/DistributionRun.java
rename to org.adempiere.base.process/src/org/compiere/process/DistributionRun.java
diff --git a/base/src/org/compiere/process/DistributionVerify.java b/org.adempiere.base.process/src/org/compiere/process/DistributionVerify.java
similarity index 100%
rename from base/src/org/compiere/process/DistributionVerify.java
rename to org.adempiere.base.process/src/org/compiere/process/DistributionVerify.java
diff --git a/base/src/org/compiere/process/DocTypeCounterValidate.java b/org.adempiere.base.process/src/org/compiere/process/DocTypeCounterValidate.java
similarity index 100%
rename from base/src/org/compiere/process/DocTypeCounterValidate.java
rename to org.adempiere.base.process/src/org/compiere/process/DocTypeCounterValidate.java
diff --git a/base/src/org/compiere/process/DocumentTypeVerify.java b/org.adempiere.base.process/src/org/compiere/process/DocumentTypeVerify.java
similarity index 100%
rename from base/src/org/compiere/process/DocumentTypeVerify.java
rename to org.adempiere.base.process/src/org/compiere/process/DocumentTypeVerify.java
diff --git a/base/src/org/compiere/process/DunningPrint.java b/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java
similarity index 100%
rename from base/src/org/compiere/process/DunningPrint.java
rename to org.adempiere.base.process/src/org/compiere/process/DunningPrint.java
diff --git a/base/src/org/compiere/process/DunningRunCreate.java b/org.adempiere.base.process/src/org/compiere/process/DunningRunCreate.java
similarity index 100%
rename from base/src/org/compiere/process/DunningRunCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/DunningRunCreate.java
diff --git a/base/src/org/compiere/process/EMailTest.java b/org.adempiere.base.process/src/org/compiere/process/EMailTest.java
similarity index 100%
rename from base/src/org/compiere/process/EMailTest.java
rename to org.adempiere.base.process/src/org/compiere/process/EMailTest.java
diff --git a/base/src/org/compiere/process/EntityTypeRegister.java b/org.adempiere.base.process/src/org/compiere/process/EntityTypeRegister.java
similarity index 100%
rename from base/src/org/compiere/process/EntityTypeRegister.java
rename to org.adempiere.base.process/src/org/compiere/process/EntityTypeRegister.java
diff --git a/base/src/org/compiere/process/ExpenseAPInvoice.java b/org.adempiere.base.process/src/org/compiere/process/ExpenseAPInvoice.java
similarity index 100%
rename from base/src/org/compiere/process/ExpenseAPInvoice.java
rename to org.adempiere.base.process/src/org/compiere/process/ExpenseAPInvoice.java
diff --git a/base/src/org/compiere/process/ExpenseSOrder.java b/org.adempiere.base.process/src/org/compiere/process/ExpenseSOrder.java
similarity index 100%
rename from base/src/org/compiere/process/ExpenseSOrder.java
rename to org.adempiere.base.process/src/org/compiere/process/ExpenseSOrder.java
diff --git a/base/src/org/compiere/process/FactAcctReset.java b/org.adempiere.base.process/src/org/compiere/process/FactAcctReset.java
similarity index 100%
rename from base/src/org/compiere/process/FactAcctReset.java
rename to org.adempiere.base.process/src/org/compiere/process/FactAcctReset.java
diff --git a/base/src/org/compiere/process/FactAcctSummary.java b/org.adempiere.base.process/src/org/compiere/process/FactAcctSummary.java
similarity index 100%
rename from base/src/org/compiere/process/FactAcctSummary.java
rename to org.adempiere.base.process/src/org/compiere/process/FactAcctSummary.java
diff --git a/base/src/org/compiere/process/ImportAccount.java b/org.adempiere.base.process/src/org/compiere/process/ImportAccount.java
similarity index 100%
rename from base/src/org/compiere/process/ImportAccount.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportAccount.java
diff --git a/base/src/org/compiere/process/ImportBPartner.java b/org.adempiere.base.process/src/org/compiere/process/ImportBPartner.java
similarity index 100%
rename from base/src/org/compiere/process/ImportBPartner.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportBPartner.java
diff --git a/base/src/org/compiere/process/ImportBankStatement.java b/org.adempiere.base.process/src/org/compiere/process/ImportBankStatement.java
similarity index 100%
rename from base/src/org/compiere/process/ImportBankStatement.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportBankStatement.java
diff --git a/base/src/org/compiere/process/ImportConversionRate.java b/org.adempiere.base.process/src/org/compiere/process/ImportConversionRate.java
similarity index 100%
rename from base/src/org/compiere/process/ImportConversionRate.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportConversionRate.java
diff --git a/base/src/org/compiere/process/ImportDelete.java b/org.adempiere.base.process/src/org/compiere/process/ImportDelete.java
similarity index 100%
rename from base/src/org/compiere/process/ImportDelete.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportDelete.java
diff --git a/base/src/org/compiere/process/ImportGLJournal.java b/org.adempiere.base.process/src/org/compiere/process/ImportGLJournal.java
similarity index 100%
rename from base/src/org/compiere/process/ImportGLJournal.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportGLJournal.java
diff --git a/base/src/org/compiere/process/ImportInOutConfirm.java b/org.adempiere.base.process/src/org/compiere/process/ImportInOutConfirm.java
similarity index 100%
rename from base/src/org/compiere/process/ImportInOutConfirm.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportInOutConfirm.java
diff --git a/base/src/org/compiere/process/ImportInventory.java b/org.adempiere.base.process/src/org/compiere/process/ImportInventory.java
similarity index 100%
rename from base/src/org/compiere/process/ImportInventory.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportInventory.java
diff --git a/base/src/org/compiere/process/ImportInvoice.java b/org.adempiere.base.process/src/org/compiere/process/ImportInvoice.java
similarity index 100%
rename from base/src/org/compiere/process/ImportInvoice.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportInvoice.java
diff --git a/base/src/org/compiere/process/ImportOrder.java b/org.adempiere.base.process/src/org/compiere/process/ImportOrder.java
similarity index 100%
rename from base/src/org/compiere/process/ImportOrder.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportOrder.java
diff --git a/base/src/org/compiere/process/ImportPayment.java b/org.adempiere.base.process/src/org/compiere/process/ImportPayment.java
similarity index 100%
rename from base/src/org/compiere/process/ImportPayment.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportPayment.java
diff --git a/base/src/org/compiere/process/ImportProduct.java b/org.adempiere.base.process/src/org/compiere/process/ImportProduct.java
similarity index 100%
rename from base/src/org/compiere/process/ImportProduct.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportProduct.java
diff --git a/base/src/org/compiere/process/ImportReportLine.java b/org.adempiere.base.process/src/org/compiere/process/ImportReportLine.java
similarity index 100%
rename from base/src/org/compiere/process/ImportReportLine.java
rename to org.adempiere.base.process/src/org/compiere/process/ImportReportLine.java
diff --git a/base/src/org/compiere/process/InOutCreateConfirm.java b/org.adempiere.base.process/src/org/compiere/process/InOutCreateConfirm.java
similarity index 100%
rename from base/src/org/compiere/process/InOutCreateConfirm.java
rename to org.adempiere.base.process/src/org/compiere/process/InOutCreateConfirm.java
diff --git a/base/src/org/compiere/process/InOutCreateInvoice.java b/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java
similarity index 100%
rename from base/src/org/compiere/process/InOutCreateInvoice.java
rename to org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java
diff --git a/base/src/org/compiere/process/InOutGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
similarity index 99%
rename from base/src/org/compiere/process/InOutGenerate.java
rename to org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
index 6f94f4344b..b0daf4b5bf 100644
--- a/base/src/org/compiere/process/InOutGenerate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.logging.Level;
-import org.adempiere.process.AllocateSalesOrders;
import org.compiere.model.MClient;
import org.compiere.model.MClientInfo;
import org.compiere.model.MInOut;
diff --git a/base/src/org/compiere/process/InfoWindowValidate.java b/org.adempiere.base.process/src/org/compiere/process/InfoWindowValidate.java
similarity index 100%
rename from base/src/org/compiere/process/InfoWindowValidate.java
rename to org.adempiere.base.process/src/org/compiere/process/InfoWindowValidate.java
diff --git a/base/src/org/compiere/process/InventoryCountCreate.java b/org.adempiere.base.process/src/org/compiere/process/InventoryCountCreate.java
similarity index 100%
rename from base/src/org/compiere/process/InventoryCountCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/InventoryCountCreate.java
diff --git a/base/src/org/compiere/process/InventoryCountUpdate.java b/org.adempiere.base.process/src/org/compiere/process/InventoryCountUpdate.java
similarity index 100%
rename from base/src/org/compiere/process/InventoryCountUpdate.java
rename to org.adempiere.base.process/src/org/compiere/process/InventoryCountUpdate.java
diff --git a/base/src/org/compiere/process/InventoryValue.java b/org.adempiere.base.process/src/org/compiere/process/InventoryValue.java
similarity index 100%
rename from base/src/org/compiere/process/InventoryValue.java
rename to org.adempiere.base.process/src/org/compiere/process/InventoryValue.java
diff --git a/base/src/org/compiere/process/InvoiceBatchProcess.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceBatchProcess.java
similarity index 100%
rename from base/src/org/compiere/process/InvoiceBatchProcess.java
rename to org.adempiere.base.process/src/org/compiere/process/InvoiceBatchProcess.java
diff --git a/base/src/org/compiere/process/InvoiceCreateInOut.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceCreateInOut.java
similarity index 100%
rename from base/src/org/compiere/process/InvoiceCreateInOut.java
rename to org.adempiere.base.process/src/org/compiere/process/InvoiceCreateInOut.java
diff --git a/base/src/org/compiere/process/InvoiceGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
similarity index 100%
rename from base/src/org/compiere/process/InvoiceGenerate.java
rename to org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
diff --git a/base/src/org/compiere/process/InvoiceNGL.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceNGL.java
similarity index 100%
rename from base/src/org/compiere/process/InvoiceNGL.java
rename to org.adempiere.base.process/src/org/compiere/process/InvoiceNGL.java
diff --git a/base/src/org/compiere/process/InvoicePayScheduleValidate.java b/org.adempiere.base.process/src/org/compiere/process/InvoicePayScheduleValidate.java
similarity index 100%
rename from base/src/org/compiere/process/InvoicePayScheduleValidate.java
rename to org.adempiere.base.process/src/org/compiere/process/InvoicePayScheduleValidate.java
diff --git a/base/src/org/compiere/process/InvoicePrint.java b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
similarity index 100%
rename from base/src/org/compiere/process/InvoicePrint.java
rename to org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java
diff --git a/base/src/org/compiere/process/InvoiceWriteOff.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceWriteOff.java
similarity index 100%
rename from base/src/org/compiere/process/InvoiceWriteOff.java
rename to org.adempiere.base.process/src/org/compiere/process/InvoiceWriteOff.java
diff --git a/base/src/org/compiere/process/IssueReport.java b/org.adempiere.base.process/src/org/compiere/process/IssueReport.java
similarity index 100%
rename from base/src/org/compiere/process/IssueReport.java
rename to org.adempiere.base.process/src/org/compiere/process/IssueReport.java
diff --git a/base/src/org/compiere/process/KIndexRerun.java b/org.adempiere.base.process/src/org/compiere/process/KIndexRerun.java
similarity index 100%
rename from base/src/org/compiere/process/KIndexRerun.java
rename to org.adempiere.base.process/src/org/compiere/process/KIndexRerun.java
diff --git a/base/src/org/compiere/process/LandedCostDistribute.java b/org.adempiere.base.process/src/org/compiere/process/LandedCostDistribute.java
similarity index 100%
rename from base/src/org/compiere/process/LandedCostDistribute.java
rename to org.adempiere.base.process/src/org/compiere/process/LandedCostDistribute.java
diff --git a/base/src/org/compiere/process/LoadBankStatement.java b/org.adempiere.base.process/src/org/compiere/process/LoadBankStatement.java
similarity index 100%
rename from base/src/org/compiere/process/LoadBankStatement.java
rename to org.adempiere.base.process/src/org/compiere/process/LoadBankStatement.java
diff --git a/base/src/org/compiere/process/M_PriceList_Create.java b/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java
similarity index 100%
rename from base/src/org/compiere/process/M_PriceList_Create.java
rename to org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java
diff --git a/base/src/org/compiere/process/M_Product_BOM_Check.java b/org.adempiere.base.process/src/org/compiere/process/M_Product_BOM_Check.java
similarity index 100%
rename from base/src/org/compiere/process/M_Product_BOM_Check.java
rename to org.adempiere.base.process/src/org/compiere/process/M_Product_BOM_Check.java
diff --git a/base/src/org/compiere/process/M_Product_CostingUpdate.java b/org.adempiere.base.process/src/org/compiere/process/M_Product_CostingUpdate.java
similarity index 100%
rename from base/src/org/compiere/process/M_Product_CostingUpdate.java
rename to org.adempiere.base.process/src/org/compiere/process/M_Product_CostingUpdate.java
diff --git a/base/src/org/compiere/process/M_Production_Run.java b/org.adempiere.base.process/src/org/compiere/process/M_Production_Run.java
similarity index 100%
rename from base/src/org/compiere/process/M_Production_Run.java
rename to org.adempiere.base.process/src/org/compiere/process/M_Production_Run.java
diff --git a/base/src/org/compiere/process/MatchInvDelete.java b/org.adempiere.base.process/src/org/compiere/process/MatchInvDelete.java
similarity index 100%
rename from base/src/org/compiere/process/MatchInvDelete.java
rename to org.adempiere.base.process/src/org/compiere/process/MatchInvDelete.java
diff --git a/base/src/org/compiere/process/MatchPODelete.java b/org.adempiere.base.process/src/org/compiere/process/MatchPODelete.java
similarity index 100%
rename from base/src/org/compiere/process/MatchPODelete.java
rename to org.adempiere.base.process/src/org/compiere/process/MatchPODelete.java
diff --git a/base/src/org/compiere/process/NoteDelete.java b/org.adempiere.base.process/src/org/compiere/process/NoteDelete.java
similarity index 100%
rename from base/src/org/compiere/process/NoteDelete.java
rename to org.adempiere.base.process/src/org/compiere/process/NoteDelete.java
diff --git a/base/src/org/compiere/process/OrderBatchProcess.java b/org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java
similarity index 100%
rename from base/src/org/compiere/process/OrderBatchProcess.java
rename to org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java
diff --git a/base/src/org/compiere/process/OrderOpen.java b/org.adempiere.base.process/src/org/compiere/process/OrderOpen.java
similarity index 100%
rename from base/src/org/compiere/process/OrderOpen.java
rename to org.adempiere.base.process/src/org/compiere/process/OrderOpen.java
diff --git a/base/src/org/compiere/process/OrderPOCreate.java b/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java
similarity index 100%
rename from base/src/org/compiere/process/OrderPOCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java
diff --git a/base/src/org/compiere/process/OrderRePrice.java b/org.adempiere.base.process/src/org/compiere/process/OrderRePrice.java
similarity index 100%
rename from base/src/org/compiere/process/OrderRePrice.java
rename to org.adempiere.base.process/src/org/compiere/process/OrderRePrice.java
diff --git a/base/src/org/compiere/process/OrgOwnership.java b/org.adempiere.base.process/src/org/compiere/process/OrgOwnership.java
similarity index 100%
rename from base/src/org/compiere/process/OrgOwnership.java
rename to org.adempiere.base.process/src/org/compiere/process/OrgOwnership.java
diff --git a/base/src/org/compiere/process/PackageCreate.java b/org.adempiere.base.process/src/org/compiere/process/PackageCreate.java
similarity index 100%
rename from base/src/org/compiere/process/PackageCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/PackageCreate.java
diff --git a/base/src/org/compiere/process/PaySelectionCreateCheck.java b/org.adempiere.base.process/src/org/compiere/process/PaySelectionCreateCheck.java
similarity index 100%
rename from base/src/org/compiere/process/PaySelectionCreateCheck.java
rename to org.adempiere.base.process/src/org/compiere/process/PaySelectionCreateCheck.java
diff --git a/base/src/org/compiere/process/PaySelectionCreateFrom.java b/org.adempiere.base.process/src/org/compiere/process/PaySelectionCreateFrom.java
similarity index 100%
rename from base/src/org/compiere/process/PaySelectionCreateFrom.java
rename to org.adempiere.base.process/src/org/compiere/process/PaySelectionCreateFrom.java
diff --git a/base/src/org/compiere/process/PaymentOnline.java b/org.adempiere.base.process/src/org/compiere/process/PaymentOnline.java
similarity index 100%
rename from base/src/org/compiere/process/PaymentOnline.java
rename to org.adempiere.base.process/src/org/compiere/process/PaymentOnline.java
diff --git a/base/src/org/compiere/process/PaymentTermValidate.java b/org.adempiere.base.process/src/org/compiere/process/PaymentTermValidate.java
similarity index 100%
rename from base/src/org/compiere/process/PaymentTermValidate.java
rename to org.adempiere.base.process/src/org/compiere/process/PaymentTermValidate.java
diff --git a/base/src/org/compiere/process/PeriodControlStatus.java b/org.adempiere.base.process/src/org/compiere/process/PeriodControlStatus.java
similarity index 100%
rename from base/src/org/compiere/process/PeriodControlStatus.java
rename to org.adempiere.base.process/src/org/compiere/process/PeriodControlStatus.java
diff --git a/base/src/org/compiere/process/PeriodStatus.java b/org.adempiere.base.process/src/org/compiere/process/PeriodStatus.java
similarity index 100%
rename from base/src/org/compiere/process/PeriodStatus.java
rename to org.adempiere.base.process/src/org/compiere/process/PeriodStatus.java
diff --git a/base/src/org/compiere/process/PosKeyGenerate.java b/org.adempiere.base.process/src/org/compiere/process/PosKeyGenerate.java
similarity index 100%
rename from base/src/org/compiere/process/PosKeyGenerate.java
rename to org.adempiere.base.process/src/org/compiere/process/PosKeyGenerate.java
diff --git a/base/src/org/compiere/process/ProductCategoryAcctCopy.java b/org.adempiere.base.process/src/org/compiere/process/ProductCategoryAcctCopy.java
similarity index 100%
rename from base/src/org/compiere/process/ProductCategoryAcctCopy.java
rename to org.adempiere.base.process/src/org/compiere/process/ProductCategoryAcctCopy.java
diff --git a/base/src/org/compiere/process/ProductUOMConvert.java b/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java
similarity index 100%
rename from base/src/org/compiere/process/ProductUOMConvert.java
rename to org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java
diff --git a/base/src/org/compiere/process/ProjectClose.java b/org.adempiere.base.process/src/org/compiere/process/ProjectClose.java
similarity index 100%
rename from base/src/org/compiere/process/ProjectClose.java
rename to org.adempiere.base.process/src/org/compiere/process/ProjectClose.java
diff --git a/base/src/org/compiere/process/ProjectGenOrder.java b/org.adempiere.base.process/src/org/compiere/process/ProjectGenOrder.java
similarity index 100%
rename from base/src/org/compiere/process/ProjectGenOrder.java
rename to org.adempiere.base.process/src/org/compiere/process/ProjectGenOrder.java
diff --git a/base/src/org/compiere/process/ProjectGenPO.java b/org.adempiere.base.process/src/org/compiere/process/ProjectGenPO.java
similarity index 100%
rename from base/src/org/compiere/process/ProjectGenPO.java
rename to org.adempiere.base.process/src/org/compiere/process/ProjectGenPO.java
diff --git a/base/src/org/compiere/process/ProjectIssue.java b/org.adempiere.base.process/src/org/compiere/process/ProjectIssue.java
similarity index 100%
rename from base/src/org/compiere/process/ProjectIssue.java
rename to org.adempiere.base.process/src/org/compiere/process/ProjectIssue.java
diff --git a/base/src/org/compiere/process/ProjectLinePricing.java b/org.adempiere.base.process/src/org/compiere/process/ProjectLinePricing.java
similarity index 100%
rename from base/src/org/compiere/process/ProjectLinePricing.java
rename to org.adempiere.base.process/src/org/compiere/process/ProjectLinePricing.java
diff --git a/base/src/org/compiere/process/ProjectPhaseGenOrder.java b/org.adempiere.base.process/src/org/compiere/process/ProjectPhaseGenOrder.java
similarity index 100%
rename from base/src/org/compiere/process/ProjectPhaseGenOrder.java
rename to org.adempiere.base.process/src/org/compiere/process/ProjectPhaseGenOrder.java
diff --git a/base/src/org/compiere/process/ProjectSetType.java b/org.adempiere.base.process/src/org/compiere/process/ProjectSetType.java
similarity index 100%
rename from base/src/org/compiere/process/ProjectSetType.java
rename to org.adempiere.base.process/src/org/compiere/process/ProjectSetType.java
diff --git a/base/src/org/compiere/process/Recurring.java b/org.adempiere.base.process/src/org/compiere/process/Recurring.java
similarity index 100%
rename from base/src/org/compiere/process/Recurring.java
rename to org.adempiere.base.process/src/org/compiere/process/Recurring.java
diff --git a/base/src/org/compiere/process/RegisterSystem.java b/org.adempiere.base.process/src/org/compiere/process/RegisterSystem.java
similarity index 100%
rename from base/src/org/compiere/process/RegisterSystem.java
rename to org.adempiere.base.process/src/org/compiere/process/RegisterSystem.java
diff --git a/base/src/org/compiere/process/ReplenishReport.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java
similarity index 100%
rename from base/src/org/compiere/process/ReplenishReport.java
rename to org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java
diff --git a/base/src/org/compiere/process/ReplicationLocal.java b/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java
similarity index 100%
rename from base/src/org/compiere/process/ReplicationLocal.java
rename to org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java
diff --git a/base/src/org/compiere/process/ReplicationRemote.java b/org.adempiere.base.process/src/org/compiere/process/ReplicationRemote.java
similarity index 100%
rename from base/src/org/compiere/process/ReplicationRemote.java
rename to org.adempiere.base.process/src/org/compiere/process/ReplicationRemote.java
diff --git a/base/src/org/compiere/process/ReportColumnSet_Copy.java b/org.adempiere.base.process/src/org/compiere/process/ReportColumnSet_Copy.java
similarity index 100%
rename from base/src/org/compiere/process/ReportColumnSet_Copy.java
rename to org.adempiere.base.process/src/org/compiere/process/ReportColumnSet_Copy.java
diff --git a/base/src/org/compiere/process/ReportLineSet_Copy.java b/org.adempiere.base.process/src/org/compiere/process/ReportLineSet_Copy.java
similarity index 100%
rename from base/src/org/compiere/process/ReportLineSet_Copy.java
rename to org.adempiere.base.process/src/org/compiere/process/ReportLineSet_Copy.java
diff --git a/base/src/org/compiere/process/RequestEMailProcessor.java b/org.adempiere.base.process/src/org/compiere/process/RequestEMailProcessor.java
similarity index 100%
rename from base/src/org/compiere/process/RequestEMailProcessor.java
rename to org.adempiere.base.process/src/org/compiere/process/RequestEMailProcessor.java
diff --git a/base/src/org/compiere/process/RequestInvoice.java b/org.adempiere.base.process/src/org/compiere/process/RequestInvoice.java
similarity index 100%
rename from base/src/org/compiere/process/RequestInvoice.java
rename to org.adempiere.base.process/src/org/compiere/process/RequestInvoice.java
diff --git a/base/src/org/compiere/process/RequestReOpen.java b/org.adempiere.base.process/src/org/compiere/process/RequestReOpen.java
similarity index 100%
rename from base/src/org/compiere/process/RequestReOpen.java
rename to org.adempiere.base.process/src/org/compiere/process/RequestReOpen.java
diff --git a/base/src/org/compiere/process/RequisitionPOCreate.java b/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java
similarity index 100%
rename from base/src/org/compiere/process/RequisitionPOCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java
diff --git a/base/src/org/compiere/process/RfQClose.java b/org.adempiere.base.process/src/org/compiere/process/RfQClose.java
similarity index 100%
rename from base/src/org/compiere/process/RfQClose.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQClose.java
diff --git a/base/src/org/compiere/process/RfQCopyLines.java b/org.adempiere.base.process/src/org/compiere/process/RfQCopyLines.java
similarity index 100%
rename from base/src/org/compiere/process/RfQCopyLines.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQCopyLines.java
diff --git a/base/src/org/compiere/process/RfQCreate.java b/org.adempiere.base.process/src/org/compiere/process/RfQCreate.java
similarity index 100%
rename from base/src/org/compiere/process/RfQCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQCreate.java
diff --git a/base/src/org/compiere/process/RfQCreatePO.java b/org.adempiere.base.process/src/org/compiere/process/RfQCreatePO.java
similarity index 100%
rename from base/src/org/compiere/process/RfQCreatePO.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQCreatePO.java
diff --git a/base/src/org/compiere/process/RfQCreateSO.java b/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java
similarity index 100%
rename from base/src/org/compiere/process/RfQCreateSO.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java
diff --git a/base/src/org/compiere/process/RfQResponseCComplete.java b/org.adempiere.base.process/src/org/compiere/process/RfQResponseCComplete.java
similarity index 100%
rename from base/src/org/compiere/process/RfQResponseCComplete.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQResponseCComplete.java
diff --git a/base/src/org/compiere/process/RfQResponseInvite.java b/org.adempiere.base.process/src/org/compiere/process/RfQResponseInvite.java
similarity index 100%
rename from base/src/org/compiere/process/RfQResponseInvite.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQResponseInvite.java
diff --git a/base/src/org/compiere/process/RfQResponseRank.java b/org.adempiere.base.process/src/org/compiere/process/RfQResponseRank.java
similarity index 100%
rename from base/src/org/compiere/process/RfQResponseRank.java
rename to org.adempiere.base.process/src/org/compiere/process/RfQResponseRank.java
diff --git a/base/src/org/compiere/process/RoleAccessUpdate.java b/org.adempiere.base.process/src/org/compiere/process/RoleAccessUpdate.java
similarity index 100%
rename from base/src/org/compiere/process/RoleAccessUpdate.java
rename to org.adempiere.base.process/src/org/compiere/process/RoleAccessUpdate.java
diff --git a/base/src/org/compiere/process/SendMailText.java b/org.adempiere.base.process/src/org/compiere/process/SendMailText.java
similarity index 100%
rename from base/src/org/compiere/process/SendMailText.java
rename to org.adempiere.base.process/src/org/compiere/process/SendMailText.java
diff --git a/base/src/org/compiere/process/SequenceCheck.java b/org.adempiere.base.process/src/org/compiere/process/SequenceCheck.java
similarity index 100%
rename from base/src/org/compiere/process/SequenceCheck.java
rename to org.adempiere.base.process/src/org/compiere/process/SequenceCheck.java
diff --git a/base/src/org/compiere/process/StorageCleanup.java b/org.adempiere.base.process/src/org/compiere/process/StorageCleanup.java
similarity index 100%
rename from base/src/org/compiere/process/StorageCleanup.java
rename to org.adempiere.base.process/src/org/compiere/process/StorageCleanup.java
diff --git a/base/src/org/compiere/process/SynchronizeTerminology.java b/org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java
similarity index 100%
rename from base/src/org/compiere/process/SynchronizeTerminology.java
rename to org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java
diff --git a/base/src/org/compiere/process/SystemValidate.java b/org.adempiere.base.process/src/org/compiere/process/SystemValidate.java
similarity index 100%
rename from base/src/org/compiere/process/SystemValidate.java
rename to org.adempiere.base.process/src/org/compiere/process/SystemValidate.java
diff --git a/base/src/org/compiere/process/T_InventoryValue_Create.java b/org.adempiere.base.process/src/org/compiere/process/T_InventoryValue_Create.java
similarity index 100%
rename from base/src/org/compiere/process/T_InventoryValue_Create.java
rename to org.adempiere.base.process/src/org/compiere/process/T_InventoryValue_Create.java
diff --git a/base/src/org/compiere/process/TabCopy.java b/org.adempiere.base.process/src/org/compiere/process/TabCopy.java
similarity index 100%
rename from base/src/org/compiere/process/TabCopy.java
rename to org.adempiere.base.process/src/org/compiere/process/TabCopy.java
diff --git a/base/src/org/compiere/process/TabCreateFields.java b/org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java
similarity index 100%
rename from base/src/org/compiere/process/TabCreateFields.java
rename to org.adempiere.base.process/src/org/compiere/process/TabCreateFields.java
diff --git a/base/src/org/compiere/process/TableCreateColumns.java b/org.adempiere.base.process/src/org/compiere/process/TableCreateColumns.java
similarity index 100%
rename from base/src/org/compiere/process/TableCreateColumns.java
rename to org.adempiere.base.process/src/org/compiere/process/TableCreateColumns.java
diff --git a/base/src/org/compiere/process/TaxDeclarationCreate.java b/org.adempiere.base.process/src/org/compiere/process/TaxDeclarationCreate.java
similarity index 100%
rename from base/src/org/compiere/process/TaxDeclarationCreate.java
rename to org.adempiere.base.process/src/org/compiere/process/TaxDeclarationCreate.java
diff --git a/base/src/org/compiere/process/TransactionXRef.java b/org.adempiere.base.process/src/org/compiere/process/TransactionXRef.java
similarity index 100%
rename from base/src/org/compiere/process/TransactionXRef.java
rename to org.adempiere.base.process/src/org/compiere/process/TransactionXRef.java
diff --git a/base/src/org/compiere/process/TranslationDocSync.java b/org.adempiere.base.process/src/org/compiere/process/TranslationDocSync.java
similarity index 100%
rename from base/src/org/compiere/process/TranslationDocSync.java
rename to org.adempiere.base.process/src/org/compiere/process/TranslationDocSync.java
diff --git a/base/src/org/compiere/process/TreeMaintenance.java b/org.adempiere.base.process/src/org/compiere/process/TreeMaintenance.java
similarity index 100%
rename from base/src/org/compiere/process/TreeMaintenance.java
rename to org.adempiere.base.process/src/org/compiere/process/TreeMaintenance.java
diff --git a/base/src/org/compiere/process/UserPassword.java b/org.adempiere.base.process/src/org/compiere/process/UserPassword.java
similarity index 100%
rename from base/src/org/compiere/process/UserPassword.java
rename to org.adempiere.base.process/src/org/compiere/process/UserPassword.java
diff --git a/base/src/org/compiere/process/WindowCopy.java b/org.adempiere.base.process/src/org/compiere/process/WindowCopy.java
similarity index 100%
rename from base/src/org/compiere/process/WindowCopy.java
rename to org.adempiere.base.process/src/org/compiere/process/WindowCopy.java
diff --git a/base/src/org/compiere/process/YearCreatePeriods.java b/org.adempiere.base.process/src/org/compiere/process/YearCreatePeriods.java
similarity index 100%
rename from base/src/org/compiere/process/YearCreatePeriods.java
rename to org.adempiere.base.process/src/org/compiere/process/YearCreatePeriods.java
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
new file mode 100644
index 0000000000..ffbad28f00
--- /dev/null
+++ b/org.adempiere.base/.classpath
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/base/.packaging b/org.adempiere.base/.packaging
similarity index 100%
rename from base/.packaging
rename to org.adempiere.base/.packaging
diff --git a/base/.project b/org.adempiere.base/.project
similarity index 97%
rename from base/.project
rename to org.adempiere.base/.project
index 3fe9df8854..cba43891c4 100644
--- a/base/.project
+++ b/org.adempiere.base/.project
@@ -1,6 +1,6 @@
- base
+ org.adempiere.basedbPort
diff --git a/base/.settings/org.eclipse.core.resources.prefs b/org.adempiere.base/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from base/.settings/org.eclipse.core.resources.prefs
rename to org.adempiere.base/.settings/org.eclipse.core.resources.prefs
diff --git a/base/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from base/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
diff --git a/base/.settings/org.eclipse.pde.core.prefs b/org.adempiere.base/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from base/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.base/.settings/org.eclipse.pde.core.prefs
diff --git a/JasperReports/.settings/org.eclipse.wst.common.component b/org.adempiere.base/.settings/org.eclipse.wst.common.component
similarity index 79%
rename from JasperReports/.settings/org.eclipse.wst.common.component
rename to org.adempiere.base/.settings/org.eclipse.wst.common.component
index c2f85e6113..92fd3901c0 100644
--- a/JasperReports/.settings/org.eclipse.wst.common.component
+++ b/org.adempiere.base/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,6 @@
-
+
diff --git a/JasperReports/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.base/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from JasperReports/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to org.adempiere.base/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/base/.xdoclet b/org.adempiere.base/.xdoclet
similarity index 100%
rename from base/.xdoclet
rename to org.adempiere.base/.xdoclet
diff --git a/base/ADempiere.launch b/org.adempiere.base/ADempiere.launch
similarity index 99%
rename from base/ADempiere.launch
rename to org.adempiere.base/ADempiere.launch
index 1ccf05b599..e99d9c454c 100644
--- a/base/ADempiere.launch
+++ b/org.adempiere.base/ADempiere.launch
@@ -1,7 +1,7 @@
-
+
@@ -81,6 +81,6 @@
-
+
-
\ No newline at end of file
+
diff --git a/base/Base.html b/org.adempiere.base/Base.html
similarity index 100%
rename from base/Base.html
rename to org.adempiere.base/Base.html
diff --git a/base/GenerateModel-general.launch b/org.adempiere.base/GenerateModel-general.launch
similarity index 98%
rename from base/GenerateModel-general.launch
rename to org.adempiere.base/GenerateModel-general.launch
index a365ced51c..aed9b899d5 100644
--- a/base/GenerateModel-general.launch
+++ b/org.adempiere.base/GenerateModel-general.launch
@@ -1,55 +1,55 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..79fd8b1704
--- /dev/null
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -0,0 +1,170 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.adempiere.base
+Bundle-SymbolicName: org.adempiere.base;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: base.jar,
+ bsh-2.0b5.jar,
+ bsh-engine.jar,
+ groovy-all-1.5.1.jar,
+ groovy-engine.jar,
+ jython-engine.jar,
+ jython.jar,
+ cron4j-2.2.1.jar,
+ barbecue-1.5-beta1.jar,
+ iText-2.1.7.jar,
+ jcommon-1.0.16.jar,
+ jfreechart-1.0.13.jar,
+ jnlp.jar
+Export-Package: bsh,
+ com.akunagroup.uk.postcode,
+ com.lowagie.text,
+ com.lowagie.text.exceptions,
+ com.lowagie.text.factories,
+ com.lowagie.text.html,
+ com.lowagie.text.html.simpleparser,
+ com.lowagie.text.pdf,
+ com.lowagie.text.pdf.codec,
+ com.lowagie.text.pdf.codec.wmf,
+ com.lowagie.text.pdf.collection,
+ com.lowagie.text.pdf.crypto,
+ com.lowagie.text.pdf.draw,
+ com.lowagie.text.pdf.events,
+ com.lowagie.text.pdf.fonts,
+ com.lowagie.text.pdf.fonts.cmaps,
+ com.lowagie.text.pdf.hyphenation,
+ com.lowagie.text.pdf.interfaces,
+ com.lowagie.text.pdf.internal,
+ com.lowagie.text.pdf.parser,
+ com.lowagie.text.xml,
+ com.lowagie.text.xml.simpleparser,
+ com.lowagie.text.xml.xmp,
+ com.lowagie.tools,
+ groovy.lang,
+ groovy.ui,
+ it.sauronsoftware.cron4j,
+ javax.jnlp,
+ net.sourceforge.barbecue,
+ net.sourceforge.barbecue.env,
+ net.sourceforge.barbecue.formatter,
+ net.sourceforge.barbecue.linear,
+ net.sourceforge.barbecue.linear.codabar,
+ net.sourceforge.barbecue.linear.code128,
+ net.sourceforge.barbecue.linear.code39,
+ net.sourceforge.barbecue.linear.ean,
+ net.sourceforge.barbecue.linear.postnet,
+ net.sourceforge.barbecue.linear.twoOfFive,
+ net.sourceforge.barbecue.linear.upc,
+ net.sourceforge.barbecue.output,
+ net.sourceforge.barbecue.twod.pdf417,
+ org.adempiere.apps.graph,
+ org.adempiere.base,
+ org.adempiere.exceptions,
+ org.adempiere.impexp,
+ org.adempiere.model,
+ org.adempiere.pdf,
+ org.adempiere.print.export,
+ org.adempiere.process,
+ org.adempiere.util,
+ org.compiere,
+ org.compiere.FA,
+ org.compiere.acct,
+ org.compiere.cm,
+ org.compiere.db,
+ org.compiere.dbPort,
+ org.compiere.impexp,
+ org.compiere.interfaces,
+ org.compiere.interfaces.impl,
+ org.compiere.model,
+ org.compiere.print,
+ org.compiere.print.layout,
+ org.compiere.process,
+ org.compiere.report,
+ org.compiere.report.core,
+ org.compiere.sla,
+ org.compiere.tools,
+ org.compiere.util,
+ org.compiere.wf,
+ org.eevolution.model,
+ org.jfree,
+ org.jfree.base,
+ org.jfree.base.config,
+ org.jfree.base.log,
+ org.jfree.base.modules,
+ org.jfree.chart,
+ org.jfree.chart.annotations,
+ org.jfree.chart.axis,
+ org.jfree.chart.block,
+ org.jfree.chart.demo,
+ org.jfree.chart.editor,
+ org.jfree.chart.encoders,
+ org.jfree.chart.entity,
+ org.jfree.chart.event,
+ org.jfree.chart.imagemap,
+ org.jfree.chart.labels,
+ org.jfree.chart.needle,
+ org.jfree.chart.panel,
+ org.jfree.chart.plot,
+ org.jfree.chart.plot.dial,
+ org.jfree.chart.renderer,
+ org.jfree.chart.renderer.category,
+ org.jfree.chart.renderer.xy,
+ org.jfree.chart.resources,
+ org.jfree.chart.servlet,
+ org.jfree.chart.title,
+ org.jfree.chart.urls,
+ org.jfree.chart.util,
+ org.jfree.data,
+ org.jfree.data.category,
+ org.jfree.data.contour,
+ org.jfree.data.function,
+ org.jfree.data.gantt,
+ org.jfree.data.general,
+ org.jfree.data.io,
+ org.jfree.data.jdbc,
+ org.jfree.data.resources,
+ org.jfree.data.statistics,
+ org.jfree.data.time,
+ org.jfree.data.time.ohlc,
+ org.jfree.data.xml,
+ org.jfree.data.xy,
+ org.jfree.date,
+ org.jfree.io,
+ org.jfree.layout,
+ org.jfree.resources,
+ org.jfree.text,
+ org.jfree.threads,
+ org.jfree.ui,
+ org.jfree.ui.about,
+ org.jfree.ui.about.resources,
+ org.jfree.ui.action,
+ org.jfree.ui.tabbedui,
+ org.jfree.util
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: com.sun.mail.smtp;version="1.4.1",
+ javax.jms;version="1.1.0",
+ javax.mail;version="1.4.1",
+ javax.mail.internet;version="1.4.1",
+ javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
+ junit.framework;version="3.8.2",
+ junit.textui;version="3.8.2",
+ net.sf.cglib.proxy,
+ org.apache.activemq;version="5.3.0",
+ org.apache.commons.collections;version="3.2.1",
+ org.apache.commons.collections.keyvalue;version="3.2.1",
+ org.apache.commons.net;version="2.0.0",
+ org.apache.commons.net.ftp,
+ org.apache.ecs,
+ org.apache.ecs.xhtml,
+ org.apache.poi.hssf.usermodel;version="3.0.2.FINAL",
+ org.apache.tools.ant,
+ org.apache.tools.ant.taskdefs,
+ org.eclipse.core.runtime;version="3.4.0",
+ org.osgi.framework,
+ org.restlet,
+ org.restlet.data,
+ org.restlet.representation,
+ org.restlet.util
+Eclipse-BuddyPolicy: registered
+Eclipse-ExtensibleAPI: true
diff --git a/base/ModelClassGenerator.launch b/org.adempiere.base/ModelClassGenerator.launch
similarity index 86%
rename from base/ModelClassGenerator.launch
rename to org.adempiere.base/ModelClassGenerator.launch
index ef4c9d2a48..585906b139 100644
--- a/base/ModelClassGenerator.launch
+++ b/org.adempiere.base/ModelClassGenerator.launch
@@ -1,18 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/base/ModelInterfaceGenerator.launch b/org.adempiere.base/ModelInterfaceGenerator.launch
similarity index 86%
rename from base/ModelInterfaceGenerator.launch
rename to org.adempiere.base/ModelInterfaceGenerator.launch
index b4d78bb338..11f35b7fa9 100644
--- a/base/ModelInterfaceGenerator.launch
+++ b/org.adempiere.base/ModelInterfaceGenerator.launch
@@ -1,18 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/base/RUN_build.bat b/org.adempiere.base/RUN_build.bat
similarity index 100%
rename from base/RUN_build.bat
rename to org.adempiere.base/RUN_build.bat
diff --git a/base/RUN_build.sh b/org.adempiere.base/RUN_build.sh
similarity index 100%
rename from base/RUN_build.sh
rename to org.adempiere.base/RUN_build.sh
diff --git a/base/Remote Debug Adempiere.launch b/org.adempiere.base/Remote Debug Adempiere.launch
similarity index 99%
rename from base/Remote Debug Adempiere.launch
rename to org.adempiere.base/Remote Debug Adempiere.launch
index d0a4f37456..79321f617e 100644
--- a/base/Remote Debug Adempiere.launch
+++ b/org.adempiere.base/Remote Debug Adempiere.launch
@@ -1,22 +1,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
new file mode 100644
index 0000000000..f156f1bc4e
--- /dev/null
+++ b/org.adempiere.base/build.properties
@@ -0,0 +1,17 @@
+source.base.jar = src/
+output.base.jar = build/
+bin.includes = META-INF/,\
+ base.jar,\
+ plugin.xml,\
+ bsh-2.0b5.jar,\
+ bsh-engine.jar,\
+ groovy-all-1.5.1.jar,\
+ groovy-engine.jar,\
+ jython-engine.jar,\
+ jython.jar,\
+ cron4j-2.2.1.jar,\
+ barbecue-1.5-beta1.jar,\
+ iText-2.1.7.jar,\
+ jcommon-1.0.16.jar,\
+ jfreechart-1.0.13.jar,\
+ jnlp.jar
diff --git a/base/documentation.bat b/org.adempiere.base/documentation.bat
similarity index 100%
rename from base/documentation.bat
rename to org.adempiere.base/documentation.bat
diff --git a/base/packages.txt b/org.adempiere.base/packages.txt
similarity index 100%
rename from base/packages.txt
rename to org.adempiere.base/packages.txt
diff --git a/base/packaging-build.xml b/org.adempiere.base/packaging-build.xml
similarity index 100%
rename from base/packaging-build.xml
rename to org.adempiere.base/packaging-build.xml
diff --git a/base/plugin.xml b/org.adempiere.base/plugin.xml
similarity index 100%
rename from base/plugin.xml
rename to org.adempiere.base/plugin.xml
diff --git a/base/schema/ResourceFinder.exsd b/org.adempiere.base/schema/ResourceFinder.exsd
similarity index 100%
rename from base/schema/ResourceFinder.exsd
rename to org.adempiere.base/schema/ResourceFinder.exsd
diff --git a/base/schema/org.adempiere.base.Callout.exsd b/org.adempiere.base/schema/org.adempiere.base.Callout.exsd
similarity index 100%
rename from base/schema/org.adempiere.base.Callout.exsd
rename to org.adempiere.base/schema/org.adempiere.base.Callout.exsd
diff --git a/base/schema/org.adempiere.base.IDictionaryService.exsd b/org.adempiere.base/schema/org.adempiere.base.IDictionaryService.exsd
similarity index 100%
rename from base/schema/org.adempiere.base.IDictionaryService.exsd
rename to org.adempiere.base/schema/org.adempiere.base.IDictionaryService.exsd
diff --git a/base/schema/org.adempiere.base.ModelValidator.exsd b/org.adempiere.base/schema/org.adempiere.base.ModelValidator.exsd
similarity index 100%
rename from base/schema/org.adempiere.base.ModelValidator.exsd
rename to org.adempiere.base/schema/org.adempiere.base.ModelValidator.exsd
diff --git a/base/schema/org.adempiere.base.Process.exsd b/org.adempiere.base/schema/org.adempiere.base.Process.exsd
similarity index 100%
rename from base/schema/org.adempiere.base.Process.exsd
rename to org.adempiere.base/schema/org.adempiere.base.Process.exsd
diff --git a/base/schema/org.compiere.db.AdempiereDatabase.exsd b/org.adempiere.base/schema/org.compiere.db.AdempiereDatabase.exsd
similarity index 100%
rename from base/schema/org.compiere.db.AdempiereDatabase.exsd
rename to org.adempiere.base/schema/org.compiere.db.AdempiereDatabase.exsd
diff --git a/base/schema/org.compiere.interfaces.Server.exsd b/org.adempiere.base/schema/org.compiere.interfaces.Server.exsd
similarity index 100%
rename from base/schema/org.compiere.interfaces.Server.exsd
rename to org.adempiere.base/schema/org.compiere.interfaces.Server.exsd
diff --git a/base/schema/org.compiere.interfaces.Status.exsd b/org.adempiere.base/schema/org.compiere.interfaces.Status.exsd
similarity index 100%
rename from base/schema/org.compiere.interfaces.Status.exsd
rename to org.adempiere.base/schema/org.compiere.interfaces.Status.exsd
diff --git a/base/src/com/akunagroup/uk/postcode/AddressInterface.java b/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressInterface.java
similarity index 100%
rename from base/src/com/akunagroup/uk/postcode/AddressInterface.java
rename to org.adempiere.base/src/com/akunagroup/uk/postcode/AddressInterface.java
diff --git a/base/src/com/akunagroup/uk/postcode/AddressLookup.java b/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java
similarity index 100%
rename from base/src/com/akunagroup/uk/postcode/AddressLookup.java
rename to org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java
diff --git a/base/src/com/akunagroup/uk/postcode/AddressLookupInterface.java b/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookupInterface.java
similarity index 100%
rename from base/src/com/akunagroup/uk/postcode/AddressLookupInterface.java
rename to org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookupInterface.java
diff --git a/base/src/com/akunagroup/uk/postcode/Postcode.java b/org.adempiere.base/src/com/akunagroup/uk/postcode/Postcode.java
similarity index 100%
rename from base/src/com/akunagroup/uk/postcode/Postcode.java
rename to org.adempiere.base/src/com/akunagroup/uk/postcode/Postcode.java
diff --git a/base/src/org/adempiere/apps/graph/GraphBuilder.java b/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java
similarity index 100%
rename from base/src/org/adempiere/apps/graph/GraphBuilder.java
rename to org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java
diff --git a/base/src/org/adempiere/apps/graph/GraphColumn.java b/org.adempiere.base/src/org/adempiere/apps/graph/GraphColumn.java
similarity index 100%
rename from base/src/org/adempiere/apps/graph/GraphColumn.java
rename to org.adempiere.base/src/org/adempiere/apps/graph/GraphColumn.java
diff --git a/base/src/org/adempiere/base/Core.java b/org.adempiere.base/src/org/adempiere/base/Core.java
similarity index 100%
rename from base/src/org/adempiere/base/Core.java
rename to org.adempiere.base/src/org/adempiere/base/Core.java
diff --git a/base/src/org/adempiere/base/IColumnCallout.java b/org.adempiere.base/src/org/adempiere/base/IColumnCallout.java
similarity index 100%
rename from base/src/org/adempiere/base/IColumnCallout.java
rename to org.adempiere.base/src/org/adempiere/base/IColumnCallout.java
diff --git a/base/src/org/adempiere/base/IDictionaryService.java b/org.adempiere.base/src/org/adempiere/base/IDictionaryService.java
similarity index 100%
rename from base/src/org/adempiere/base/IDictionaryService.java
rename to org.adempiere.base/src/org/adempiere/base/IDictionaryService.java
diff --git a/base/src/org/adempiere/base/IResourceFinder.java b/org.adempiere.base/src/org/adempiere/base/IResourceFinder.java
similarity index 100%
rename from base/src/org/adempiere/base/IResourceFinder.java
rename to org.adempiere.base/src/org/adempiere/base/IResourceFinder.java
diff --git a/base/src/org/adempiere/base/IServiceLocator.java b/org.adempiere.base/src/org/adempiere/base/IServiceLocator.java
similarity index 100%
rename from base/src/org/adempiere/base/IServiceLocator.java
rename to org.adempiere.base/src/org/adempiere/base/IServiceLocator.java
diff --git a/base/src/org/adempiere/base/Service.java b/org.adempiere.base/src/org/adempiere/base/Service.java
similarity index 100%
rename from base/src/org/adempiere/base/Service.java
rename to org.adempiere.base/src/org/adempiere/base/Service.java
diff --git a/base/src/org/adempiere/base/ServiceQuery.java b/org.adempiere.base/src/org/adempiere/base/ServiceQuery.java
similarity index 100%
rename from base/src/org/adempiere/base/ServiceQuery.java
rename to org.adempiere.base/src/org/adempiere/base/ServiceQuery.java
diff --git a/base/src/org/adempiere/base/equinox/EquinoxServiceLocator.java b/org.adempiere.base/src/org/adempiere/base/equinox/EquinoxServiceLocator.java
similarity index 100%
rename from base/src/org/adempiere/base/equinox/EquinoxServiceLocator.java
rename to org.adempiere.base/src/org/adempiere/base/equinox/EquinoxServiceLocator.java
diff --git a/base/src/org/adempiere/base/equinox/ExtensionList.java b/org.adempiere.base/src/org/adempiere/base/equinox/ExtensionList.java
similarity index 100%
rename from base/src/org/adempiere/base/equinox/ExtensionList.java
rename to org.adempiere.base/src/org/adempiere/base/equinox/ExtensionList.java
diff --git a/base/src/org/adempiere/exceptions/AdempiereException.java b/org.adempiere.base/src/org/adempiere/exceptions/AdempiereException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/AdempiereException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/AdempiereException.java
diff --git a/base/src/org/adempiere/exceptions/BPartnerException.java b/org.adempiere.base/src/org/adempiere/exceptions/BPartnerException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/BPartnerException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/BPartnerException.java
diff --git a/base/src/org/adempiere/exceptions/BPartnerNoAddressException.java b/org.adempiere.base/src/org/adempiere/exceptions/BPartnerNoAddressException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/BPartnerNoAddressException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/BPartnerNoAddressException.java
diff --git a/base/src/org/adempiere/exceptions/BPartnerNoBillToAddressException.java b/org.adempiere.base/src/org/adempiere/exceptions/BPartnerNoBillToAddressException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/BPartnerNoBillToAddressException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/BPartnerNoBillToAddressException.java
diff --git a/base/src/org/adempiere/exceptions/BPartnerNoShipToAddressException.java b/org.adempiere.base/src/org/adempiere/exceptions/BPartnerNoShipToAddressException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/BPartnerNoShipToAddressException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/BPartnerNoShipToAddressException.java
diff --git a/base/src/org/adempiere/exceptions/DBException.java b/org.adempiere.base/src/org/adempiere/exceptions/DBException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/DBException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/DBException.java
diff --git a/base/src/org/adempiere/exceptions/DocTypeNotFoundException.java b/org.adempiere.base/src/org/adempiere/exceptions/DocTypeNotFoundException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/DocTypeNotFoundException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/DocTypeNotFoundException.java
diff --git a/base/src/org/adempiere/exceptions/FillMandatoryException.java b/org.adempiere.base/src/org/adempiere/exceptions/FillMandatoryException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/FillMandatoryException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/FillMandatoryException.java
diff --git a/base/src/org/adempiere/exceptions/InvoiceFullyMatchedException.java b/org.adempiere.base/src/org/adempiere/exceptions/InvoiceFullyMatchedException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/InvoiceFullyMatchedException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/InvoiceFullyMatchedException.java
diff --git a/base/src/org/adempiere/exceptions/NoUOMConversionException.java b/org.adempiere.base/src/org/adempiere/exceptions/NoUOMConversionException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/NoUOMConversionException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/NoUOMConversionException.java
diff --git a/base/src/org/adempiere/exceptions/NoVendorForProductException.java b/org.adempiere.base/src/org/adempiere/exceptions/NoVendorForProductException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/NoVendorForProductException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/NoVendorForProductException.java
diff --git a/base/src/org/adempiere/exceptions/PORelationException.java b/org.adempiere.base/src/org/adempiere/exceptions/PORelationException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/PORelationException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/PORelationException.java
diff --git a/base/src/org/adempiere/exceptions/PeriodClosedException.java b/org.adempiere.base/src/org/adempiere/exceptions/PeriodClosedException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/PeriodClosedException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/PeriodClosedException.java
diff --git a/base/src/org/adempiere/exceptions/ProductNotOnPriceListException.java b/org.adempiere.base/src/org/adempiere/exceptions/ProductNotOnPriceListException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/ProductNotOnPriceListException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/ProductNotOnPriceListException.java
diff --git a/base/src/org/adempiere/exceptions/TaxCriteriaNotFoundException.java b/org.adempiere.base/src/org/adempiere/exceptions/TaxCriteriaNotFoundException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/TaxCriteriaNotFoundException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/TaxCriteriaNotFoundException.java
diff --git a/base/src/org/adempiere/exceptions/TaxForChangeNotFoundException.java b/org.adempiere.base/src/org/adempiere/exceptions/TaxForChangeNotFoundException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/TaxForChangeNotFoundException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/TaxForChangeNotFoundException.java
diff --git a/base/src/org/adempiere/exceptions/TaxNoExemptFoundException.java b/org.adempiere.base/src/org/adempiere/exceptions/TaxNoExemptFoundException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/TaxNoExemptFoundException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/TaxNoExemptFoundException.java
diff --git a/base/src/org/adempiere/exceptions/TaxNotFoundException.java b/org.adempiere.base/src/org/adempiere/exceptions/TaxNotFoundException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/TaxNotFoundException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/TaxNotFoundException.java
diff --git a/base/src/org/adempiere/exceptions/WarehouseInvalidForOrgException.java b/org.adempiere.base/src/org/adempiere/exceptions/WarehouseInvalidForOrgException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/WarehouseInvalidForOrgException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/WarehouseInvalidForOrgException.java
diff --git a/base/src/org/adempiere/exceptions/WarehouseLocatorConflictException.java b/org.adempiere.base/src/org/adempiere/exceptions/WarehouseLocatorConflictException.java
similarity index 100%
rename from base/src/org/adempiere/exceptions/WarehouseLocatorConflictException.java
rename to org.adempiere.base/src/org/adempiere/exceptions/WarehouseLocatorConflictException.java
diff --git a/base/src/org/adempiere/impexp/AbstractExcelExporter.java b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
similarity index 100%
rename from base/src/org/adempiere/impexp/AbstractExcelExporter.java
rename to org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
diff --git a/base/src/org/adempiere/impexp/ArrayExcelExporter.java b/org.adempiere.base/src/org/adempiere/impexp/ArrayExcelExporter.java
similarity index 100%
rename from base/src/org/adempiere/impexp/ArrayExcelExporter.java
rename to org.adempiere.base/src/org/adempiere/impexp/ArrayExcelExporter.java
diff --git a/base/src/org/adempiere/impexp/GridTabExcelExporter.java b/org.adempiere.base/src/org/adempiere/impexp/GridTabExcelExporter.java
similarity index 100%
rename from base/src/org/adempiere/impexp/GridTabExcelExporter.java
rename to org.adempiere.base/src/org/adempiere/impexp/GridTabExcelExporter.java
diff --git a/base/src/org/adempiere/model/GenericPO.java b/org.adempiere.base/src/org/adempiere/model/GenericPO.java
similarity index 100%
rename from base/src/org/adempiere/model/GenericPO.java
rename to org.adempiere.base/src/org/adempiere/model/GenericPO.java
diff --git a/base/src/org/adempiere/model/GenericZoomProvider.java b/org.adempiere.base/src/org/adempiere/model/GenericZoomProvider.java
similarity index 100%
rename from base/src/org/adempiere/model/GenericZoomProvider.java
rename to org.adempiere.base/src/org/adempiere/model/GenericZoomProvider.java
diff --git a/base/src/org/adempiere/model/GridTabWrapper.java b/org.adempiere.base/src/org/adempiere/model/GridTabWrapper.java
similarity index 100%
rename from base/src/org/adempiere/model/GridTabWrapper.java
rename to org.adempiere.base/src/org/adempiere/model/GridTabWrapper.java
diff --git a/base/src/org/adempiere/model/IZoomProvider.java b/org.adempiere.base/src/org/adempiere/model/IZoomProvider.java
similarity index 100%
rename from base/src/org/adempiere/model/IZoomProvider.java
rename to org.adempiere.base/src/org/adempiere/model/IZoomProvider.java
diff --git a/base/src/org/adempiere/model/ImportValidator.java b/org.adempiere.base/src/org/adempiere/model/ImportValidator.java
similarity index 100%
rename from base/src/org/adempiere/model/ImportValidator.java
rename to org.adempiere.base/src/org/adempiere/model/ImportValidator.java
diff --git a/base/src/org/adempiere/model/MPromotion.java b/org.adempiere.base/src/org/adempiere/model/MPromotion.java
similarity index 100%
rename from base/src/org/adempiere/model/MPromotion.java
rename to org.adempiere.base/src/org/adempiere/model/MPromotion.java
diff --git a/base/src/org/adempiere/model/MPromotionDistribution.java b/org.adempiere.base/src/org/adempiere/model/MPromotionDistribution.java
similarity index 100%
rename from base/src/org/adempiere/model/MPromotionDistribution.java
rename to org.adempiere.base/src/org/adempiere/model/MPromotionDistribution.java
diff --git a/base/src/org/adempiere/model/MPromotionGroup.java b/org.adempiere.base/src/org/adempiere/model/MPromotionGroup.java
similarity index 100%
rename from base/src/org/adempiere/model/MPromotionGroup.java
rename to org.adempiere.base/src/org/adempiere/model/MPromotionGroup.java
diff --git a/base/src/org/adempiere/model/MPromotionGroupLine.java b/org.adempiere.base/src/org/adempiere/model/MPromotionGroupLine.java
similarity index 100%
rename from base/src/org/adempiere/model/MPromotionGroupLine.java
rename to org.adempiere.base/src/org/adempiere/model/MPromotionGroupLine.java
diff --git a/base/src/org/adempiere/model/MPromotionLine.java b/org.adempiere.base/src/org/adempiere/model/MPromotionLine.java
similarity index 100%
rename from base/src/org/adempiere/model/MPromotionLine.java
rename to org.adempiere.base/src/org/adempiere/model/MPromotionLine.java
diff --git a/base/src/org/adempiere/model/MPromotionPreCondition.java b/org.adempiere.base/src/org/adempiere/model/MPromotionPreCondition.java
similarity index 100%
rename from base/src/org/adempiere/model/MPromotionPreCondition.java
rename to org.adempiere.base/src/org/adempiere/model/MPromotionPreCondition.java
diff --git a/base/src/org/adempiere/model/MPromotionReward.java b/org.adempiere.base/src/org/adempiere/model/MPromotionReward.java
similarity index 100%
rename from base/src/org/adempiere/model/MPromotionReward.java
rename to org.adempiere.base/src/org/adempiere/model/MPromotionReward.java
diff --git a/base/src/org/adempiere/model/MRelationType.java b/org.adempiere.base/src/org/adempiere/model/MRelationType.java
similarity index 100%
rename from base/src/org/adempiere/model/MRelationType.java
rename to org.adempiere.base/src/org/adempiere/model/MRelationType.java
diff --git a/base/src/org/adempiere/model/POWrapper.java b/org.adempiere.base/src/org/adempiere/model/POWrapper.java
similarity index 100%
rename from base/src/org/adempiere/model/POWrapper.java
rename to org.adempiere.base/src/org/adempiere/model/POWrapper.java
diff --git a/base/src/org/adempiere/model/PromotionRule.java b/org.adempiere.base/src/org/adempiere/model/PromotionRule.java
similarity index 100%
rename from base/src/org/adempiere/model/PromotionRule.java
rename to org.adempiere.base/src/org/adempiere/model/PromotionRule.java
diff --git a/base/src/org/adempiere/model/PromotionValidator.java b/org.adempiere.base/src/org/adempiere/model/PromotionValidator.java
similarity index 100%
rename from base/src/org/adempiere/model/PromotionValidator.java
rename to org.adempiere.base/src/org/adempiere/model/PromotionValidator.java
diff --git a/base/src/org/adempiere/model/ZoomInfoFactory.java b/org.adempiere.base/src/org/adempiere/model/ZoomInfoFactory.java
similarity index 100%
rename from base/src/org/adempiere/model/ZoomInfoFactory.java
rename to org.adempiere.base/src/org/adempiere/model/ZoomInfoFactory.java
diff --git a/base/src/org/adempiere/pdf/Document.java b/org.adempiere.base/src/org/adempiere/pdf/Document.java
similarity index 97%
rename from base/src/org/adempiere/pdf/Document.java
rename to org.adempiere.base/src/org/adempiere/pdf/Document.java
index d89234d917..c0a78d6d26 100644
--- a/base/src/org/adempiere/pdf/Document.java
+++ b/org.adempiere.base/src/org/adempiere/pdf/Document.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
-import org.adempiere.pdf.viewer.PDFViewerBean;
import org.compiere.model.MSysConfig;
import com.lowagie.text.FontFactory;
@@ -116,10 +115,6 @@ public class Document {
return null;
}
- public static PDFViewerBean getViewer() {
- return new PDFViewerBean();
- }
-
public static boolean isValid(Pageable layout) {
return true;
}
diff --git a/base/src/org/adempiere/print/export/PrintDataExcelExporter.java b/org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java
similarity index 100%
rename from base/src/org/adempiere/print/export/PrintDataExcelExporter.java
rename to org.adempiere.base/src/org/adempiere/print/export/PrintDataExcelExporter.java
diff --git a/base/src/org/adempiere/process/ImportProcess.java b/org.adempiere.base/src/org/adempiere/process/ImportProcess.java
similarity index 100%
rename from base/src/org/adempiere/process/ImportProcess.java
rename to org.adempiere.base/src/org/adempiere/process/ImportProcess.java
diff --git a/base/src/org/adempiere/util/AbstractDocumentSearch.java b/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java
similarity index 100%
rename from base/src/org/adempiere/util/AbstractDocumentSearch.java
rename to org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java
diff --git a/base/src/org/adempiere/util/GenerateModel.java b/org.adempiere.base/src/org/adempiere/util/GenerateModel.java
similarity index 100%
rename from base/src/org/adempiere/util/GenerateModel.java
rename to org.adempiere.base/src/org/adempiere/util/GenerateModel.java
diff --git a/base/src/org/adempiere/util/GenerateModelJPA.java b/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java
similarity index 100%
rename from base/src/org/adempiere/util/GenerateModelJPA.java
rename to org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java
diff --git a/base/src/org/adempiere/util/GridRowCtx.java b/org.adempiere.base/src/org/adempiere/util/GridRowCtx.java
similarity index 100%
rename from base/src/org/adempiere/util/GridRowCtx.java
rename to org.adempiere.base/src/org/adempiere/util/GridRowCtx.java
diff --git a/base/src/org/adempiere/util/MeasureInterface.java b/org.adempiere.base/src/org/adempiere/util/MeasureInterface.java
similarity index 100%
rename from base/src/org/adempiere/util/MeasureInterface.java
rename to org.adempiere.base/src/org/adempiere/util/MeasureInterface.java
diff --git a/base/src/org/adempiere/util/ModelClassGenerator.java b/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java
similarity index 100%
rename from base/src/org/adempiere/util/ModelClassGenerator.java
rename to org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java
diff --git a/base/src/org/adempiere/util/ModelInterfaceGenerator.java b/org.adempiere.base/src/org/adempiere/util/ModelInterfaceGenerator.java
similarity index 100%
rename from base/src/org/adempiere/util/ModelInterfaceGenerator.java
rename to org.adempiere.base/src/org/adempiere/util/ModelInterfaceGenerator.java
diff --git a/base/src/org/adempiere/util/ProcessUtil.java b/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
similarity index 100%
rename from base/src/org/adempiere/util/ProcessUtil.java
rename to org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
diff --git a/base/src/org/adempiere/util/RestletUtil.java b/org.adempiere.base/src/org/adempiere/util/RestletUtil.java
similarity index 100%
rename from base/src/org/adempiere/util/RestletUtil.java
rename to org.adempiere.base/src/org/adempiere/util/RestletUtil.java
diff --git a/base/src/org/adempiere/util/ServerContext.java b/org.adempiere.base/src/org/adempiere/util/ServerContext.java
similarity index 100%
rename from base/src/org/adempiere/util/ServerContext.java
rename to org.adempiere.base/src/org/adempiere/util/ServerContext.java
diff --git a/base/src/org/adempiere/util/ServerContextCallback.java b/org.adempiere.base/src/org/adempiere/util/ServerContextCallback.java
similarity index 100%
rename from base/src/org/adempiere/util/ServerContextCallback.java
rename to org.adempiere.base/src/org/adempiere/util/ServerContextCallback.java
diff --git a/base/src/org/adempiere/util/ServerContextProvider.java b/org.adempiere.base/src/org/adempiere/util/ServerContextProvider.java
similarity index 100%
rename from base/src/org/adempiere/util/ServerContextProvider.java
rename to org.adempiere.base/src/org/adempiere/util/ServerContextProvider.java
diff --git a/base/src/org/adempiere/util/ServerContextURLHandler.java b/org.adempiere.base/src/org/adempiere/util/ServerContextURLHandler.java
similarity index 100%
rename from base/src/org/adempiere/util/ServerContextURLHandler.java
rename to org.adempiere.base/src/org/adempiere/util/ServerContextURLHandler.java
diff --git a/base/src/org/adempiere/validator/MaterialReceiptModelValidator.java b/org.adempiere.base/src/org/adempiere/validator/MaterialReceiptModelValidator.java
similarity index 90%
rename from base/src/org/adempiere/validator/MaterialReceiptModelValidator.java
rename to org.adempiere.base/src/org/adempiere/validator/MaterialReceiptModelValidator.java
index a7846123c2..a9b1208947 100644
--- a/base/src/org/adempiere/validator/MaterialReceiptModelValidator.java
+++ b/org.adempiere.base/src/org/adempiere/validator/MaterialReceiptModelValidator.java
@@ -5,12 +5,11 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
-import org.adempiere.process.AllocateSalesOrders;
import org.compiere.model.MClient;
import org.compiere.model.MInOut;
import org.compiere.model.MInOutLine;
+import org.compiere.model.MOrder;
import org.compiere.model.MOrderLine;
import org.compiere.model.ModelValidationEngine;
import org.compiere.model.ModelValidator;
@@ -89,7 +88,7 @@ public class MaterialReceiptModelValidator implements ModelValidator {
// Make sure we have a positive amount
if (qty.signum()>0) {
- List lines = AllocateSalesOrders.getOrderLinesToAllocate(conn, iol.getProduct().get_ID(), trxName);
+ List lines = MOrder.getOrderLinesToAllocate(conn, iol.getProduct().get_ID(), trxName);
MOrderLine line;
BigDecimal receivedQty = iol.getMovementQty();
@@ -125,7 +124,6 @@ public class MaterialReceiptModelValidator implements ModelValidator {
@Override
public String modelChange(PO po, int type) throws Exception {
- // TODO Auto-generated method stub
return null;
}
diff --git a/base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java
similarity index 100%
rename from base/src/org/compiere/Adempiere.java
rename to org.adempiere.base/src/org/compiere/Adempiere.java
diff --git a/base/src/org/compiere/Adempiere.properties b/org.adempiere.base/src/org/compiere/Adempiere.properties
similarity index 100%
rename from base/src/org/compiere/Adempiere.properties
rename to org.adempiere.base/src/org/compiere/Adempiere.properties
diff --git a/base/src/org/compiere/Base.java b/org.adempiere.base/src/org/compiere/Base.java
similarity index 100%
rename from base/src/org/compiere/Base.java
rename to org.adempiere.base/src/org/compiere/Base.java
diff --git a/base/src/org/compiere/FA/AssetDisposed.java b/org.adempiere.base/src/org/compiere/FA/AssetDisposed.java
similarity index 100%
rename from base/src/org/compiere/FA/AssetDisposed.java
rename to org.adempiere.base/src/org/compiere/FA/AssetDisposed.java
diff --git a/base/src/org/compiere/FA/AssetRevalEntry.java b/org.adempiere.base/src/org/compiere/FA/AssetRevalEntry.java
similarity index 100%
rename from base/src/org/compiere/FA/AssetRevalEntry.java
rename to org.adempiere.base/src/org/compiere/FA/AssetRevalEntry.java
diff --git a/base/src/org/compiere/FA/AssetSplit.java b/org.adempiere.base/src/org/compiere/FA/AssetSplit.java
similarity index 100%
rename from base/src/org/compiere/FA/AssetSplit.java
rename to org.adempiere.base/src/org/compiere/FA/AssetSplit.java
diff --git a/base/src/org/compiere/FA/AssetTransfer.java b/org.adempiere.base/src/org/compiere/FA/AssetTransfer.java
similarity index 100%
rename from base/src/org/compiere/FA/AssetTransfer.java
rename to org.adempiere.base/src/org/compiere/FA/AssetTransfer.java
diff --git a/base/src/org/compiere/FA/BuildDepForecastFile.java b/org.adempiere.base/src/org/compiere/FA/BuildDepForecastFile.java
similarity index 100%
rename from base/src/org/compiere/FA/BuildDepForecastFile.java
rename to org.adempiere.base/src/org/compiere/FA/BuildDepForecastFile.java
diff --git a/base/src/org/compiere/FA/BuildDepWorkFile.java b/org.adempiere.base/src/org/compiere/FA/BuildDepWorkFile.java
similarity index 100%
rename from base/src/org/compiere/FA/BuildDepWorkFile.java
rename to org.adempiere.base/src/org/compiere/FA/BuildDepWorkFile.java
diff --git a/base/src/org/compiere/FA/CalloutFA.java b/org.adempiere.base/src/org/compiere/FA/CalloutFA.java
similarity index 100%
rename from base/src/org/compiere/FA/CalloutFA.java
rename to org.adempiere.base/src/org/compiere/FA/CalloutFA.java
diff --git a/base/src/org/compiere/FA/Conventions.java b/org.adempiere.base/src/org/compiere/FA/Conventions.java
similarity index 100%
rename from base/src/org/compiere/FA/Conventions.java
rename to org.adempiere.base/src/org/compiere/FA/Conventions.java
diff --git a/base/src/org/compiere/FA/CreateGLAsset.java b/org.adempiere.base/src/org/compiere/FA/CreateGLAsset.java
similarity index 100%
rename from base/src/org/compiere/FA/CreateGLAsset.java
rename to org.adempiere.base/src/org/compiere/FA/CreateGLAsset.java
diff --git a/base/src/org/compiere/FA/CreateInvoicedAsset.java b/org.adempiere.base/src/org/compiere/FA/CreateInvoicedAsset.java
similarity index 100%
rename from base/src/org/compiere/FA/CreateInvoicedAsset.java
rename to org.adempiere.base/src/org/compiere/FA/CreateInvoicedAsset.java
diff --git a/base/src/org/compiere/FA/Depreciation.java b/org.adempiere.base/src/org/compiere/FA/Depreciation.java
similarity index 100%
rename from base/src/org/compiere/FA/Depreciation.java
rename to org.adempiere.base/src/org/compiere/FA/Depreciation.java
diff --git a/base/src/org/compiere/FA/DepreciationAdj.java b/org.adempiere.base/src/org/compiere/FA/DepreciationAdj.java
similarity index 100%
rename from base/src/org/compiere/FA/DepreciationAdj.java
rename to org.adempiere.base/src/org/compiere/FA/DepreciationAdj.java
diff --git a/base/src/org/compiere/FA/I_CustomColumn.java b/org.adempiere.base/src/org/compiere/FA/I_CustomColumn.java
similarity index 100%
rename from base/src/org/compiere/FA/I_CustomColumn.java
rename to org.adempiere.base/src/org/compiere/FA/I_CustomColumn.java
diff --git a/base/src/org/compiere/FA/ImportAsset.java b/org.adempiere.base/src/org/compiere/FA/ImportAsset.java
similarity index 100%
rename from base/src/org/compiere/FA/ImportAsset.java
rename to org.adempiere.base/src/org/compiere/FA/ImportAsset.java
diff --git a/base/src/org/compiere/FA/ImportFAJournal2.java b/org.adempiere.base/src/org/compiere/FA/ImportFAJournal2.java
similarity index 100%
rename from base/src/org/compiere/FA/ImportFAJournal2.java
rename to org.adempiere.base/src/org/compiere/FA/ImportFAJournal2.java
diff --git a/base/src/org/compiere/MigrateData.java b/org.adempiere.base/src/org/compiere/MigrateData.java
similarity index 100%
rename from base/src/org/compiere/MigrateData.java
rename to org.adempiere.base/src/org/compiere/MigrateData.java
diff --git a/base/src/org/compiere/acct/Doc.java b/org.adempiere.base/src/org/compiere/acct/Doc.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc.java
rename to org.adempiere.base/src/org/compiere/acct/Doc.java
diff --git a/base/src/org/compiere/acct/DocLine.java b/org.adempiere.base/src/org/compiere/acct/DocLine.java
similarity index 100%
rename from base/src/org/compiere/acct/DocLine.java
rename to org.adempiere.base/src/org/compiere/acct/DocLine.java
diff --git a/base/src/org/compiere/acct/DocLine_Allocation.java b/org.adempiere.base/src/org/compiere/acct/DocLine_Allocation.java
similarity index 100%
rename from base/src/org/compiere/acct/DocLine_Allocation.java
rename to org.adempiere.base/src/org/compiere/acct/DocLine_Allocation.java
diff --git a/base/src/org/compiere/acct/DocLine_Bank.java b/org.adempiere.base/src/org/compiere/acct/DocLine_Bank.java
similarity index 100%
rename from base/src/org/compiere/acct/DocLine_Bank.java
rename to org.adempiere.base/src/org/compiere/acct/DocLine_Bank.java
diff --git a/base/src/org/compiere/acct/DocLine_Cash.java b/org.adempiere.base/src/org/compiere/acct/DocLine_Cash.java
similarity index 100%
rename from base/src/org/compiere/acct/DocLine_Cash.java
rename to org.adempiere.base/src/org/compiere/acct/DocLine_Cash.java
diff --git a/base/src/org/compiere/acct/DocTax.java b/org.adempiere.base/src/org/compiere/acct/DocTax.java
similarity index 100%
rename from base/src/org/compiere/acct/DocTax.java
rename to org.adempiere.base/src/org/compiere/acct/DocTax.java
diff --git a/base/src/org/compiere/acct/Doc_AllocationHdr.java b/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_AllocationHdr.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
diff --git a/base/src/org/compiere/acct/Doc_BankStatement.java b/org.adempiere.base/src/org/compiere/acct/Doc_BankStatement.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_BankStatement.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_BankStatement.java
diff --git a/base/src/org/compiere/acct/Doc_Cash.java b/org.adempiere.base/src/org/compiere/acct/Doc_Cash.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Cash.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Cash.java
diff --git a/base/src/org/compiere/acct/Doc_GLJournal.java b/org.adempiere.base/src/org/compiere/acct/Doc_GLJournal.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_GLJournal.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_GLJournal.java
diff --git a/base/src/org/compiere/acct/Doc_InOut.java b/org.adempiere.base/src/org/compiere/acct/Doc_InOut.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_InOut.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_InOut.java
diff --git a/base/src/org/compiere/acct/Doc_Inventory.java b/org.adempiere.base/src/org/compiere/acct/Doc_Inventory.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Inventory.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Inventory.java
diff --git a/base/src/org/compiere/acct/Doc_Invoice.java b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Invoice.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java
diff --git a/base/src/org/compiere/acct/Doc_MatchInv.java b/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_MatchInv.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java
diff --git a/base/src/org/compiere/acct/Doc_MatchPO.java b/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_MatchPO.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
diff --git a/base/src/org/compiere/acct/Doc_Movement.java b/org.adempiere.base/src/org/compiere/acct/Doc_Movement.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Movement.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Movement.java
diff --git a/base/src/org/compiere/acct/Doc_Order.java b/org.adempiere.base/src/org/compiere/acct/Doc_Order.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Order.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Order.java
diff --git a/base/src/org/compiere/acct/Doc_Payment.java b/org.adempiere.base/src/org/compiere/acct/Doc_Payment.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Payment.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Payment.java
diff --git a/base/src/org/compiere/acct/Doc_Production.java b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Production.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Production.java
diff --git a/base/src/org/compiere/acct/Doc_ProjectIssue.java b/org.adempiere.base/src/org/compiere/acct/Doc_ProjectIssue.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_ProjectIssue.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_ProjectIssue.java
diff --git a/base/src/org/compiere/acct/Doc_Requisition.java b/org.adempiere.base/src/org/compiere/acct/Doc_Requisition.java
similarity index 100%
rename from base/src/org/compiere/acct/Doc_Requisition.java
rename to org.adempiere.base/src/org/compiere/acct/Doc_Requisition.java
diff --git a/base/src/org/compiere/acct/Fact.java b/org.adempiere.base/src/org/compiere/acct/Fact.java
similarity index 100%
rename from base/src/org/compiere/acct/Fact.java
rename to org.adempiere.base/src/org/compiere/acct/Fact.java
diff --git a/base/src/org/compiere/acct/FactLine.java b/org.adempiere.base/src/org/compiere/acct/FactLine.java
similarity index 100%
rename from base/src/org/compiere/acct/FactLine.java
rename to org.adempiere.base/src/org/compiere/acct/FactLine.java
diff --git a/base/src/org/compiere/acct/Matcher.java b/org.adempiere.base/src/org/compiere/acct/Matcher.java
similarity index 100%
rename from base/src/org/compiere/acct/Matcher.java
rename to org.adempiere.base/src/org/compiere/acct/Matcher.java
diff --git a/base/src/org/compiere/acct/ProductInfo.java b/org.adempiere.base/src/org/compiere/acct/ProductInfo.java
similarity index 100%
rename from base/src/org/compiere/acct/ProductInfo.java
rename to org.adempiere.base/src/org/compiere/acct/ProductInfo.java
diff --git a/base/src/org/compiere/cm/CStageValidate.java b/org.adempiere.base/src/org/compiere/cm/CStageValidate.java
similarity index 100%
rename from base/src/org/compiere/cm/CStageValidate.java
rename to org.adempiere.base/src/org/compiere/cm/CStageValidate.java
diff --git a/base/src/org/compiere/cm/CacheHandler.java b/org.adempiere.base/src/org/compiere/cm/CacheHandler.java
similarity index 100%
rename from base/src/org/compiere/cm/CacheHandler.java
rename to org.adempiere.base/src/org/compiere/cm/CacheHandler.java
diff --git a/base/src/org/compiere/cm/CalloutTemplate.java b/org.adempiere.base/src/org/compiere/cm/CalloutTemplate.java
similarity index 100%
rename from base/src/org/compiere/cm/CalloutTemplate.java
rename to org.adempiere.base/src/org/compiere/cm/CalloutTemplate.java
diff --git a/base/src/org/compiere/cm/MediaDirectDeploy.java b/org.adempiere.base/src/org/compiere/cm/MediaDirectDeploy.java
similarity index 100%
rename from base/src/org/compiere/cm/MediaDirectDeploy.java
rename to org.adempiere.base/src/org/compiere/cm/MediaDirectDeploy.java
diff --git a/base/src/org/compiere/cm/StringUtil.java b/org.adempiere.base/src/org/compiere/cm/StringUtil.java
similarity index 100%
rename from base/src/org/compiere/cm/StringUtil.java
rename to org.adempiere.base/src/org/compiere/cm/StringUtil.java
diff --git a/base/src/org/compiere/cm/TemplateValidate.java b/org.adempiere.base/src/org/compiere/cm/TemplateValidate.java
similarity index 100%
rename from base/src/org/compiere/cm/TemplateValidate.java
rename to org.adempiere.base/src/org/compiere/cm/TemplateValidate.java
diff --git a/base/src/org/compiere/cm/WebProjectDeploy.java b/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java
similarity index 100%
rename from base/src/org/compiere/cm/WebProjectDeploy.java
rename to org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java
diff --git a/base/src/org/compiere/db/AdempiereDatabase.java b/org.adempiere.base/src/org/compiere/db/AdempiereDatabase.java
similarity index 100%
rename from base/src/org/compiere/db/AdempiereDatabase.java
rename to org.adempiere.base/src/org/compiere/db/AdempiereDatabase.java
diff --git a/base/src/org/compiere/db/CConnection.java b/org.adempiere.base/src/org/compiere/db/CConnection.java
similarity index 100%
rename from base/src/org/compiere/db/CConnection.java
rename to org.adempiere.base/src/org/compiere/db/CConnection.java
diff --git a/base/src/org/compiere/db/CallableStatementProxy.java b/org.adempiere.base/src/org/compiere/db/CallableStatementProxy.java
similarity index 100%
rename from base/src/org/compiere/db/CallableStatementProxy.java
rename to org.adempiere.base/src/org/compiere/db/CallableStatementProxy.java
diff --git a/base/src/org/compiere/db/CreateAdempiere.java b/org.adempiere.base/src/org/compiere/db/CreateAdempiere.java
similarity index 100%
rename from base/src/org/compiere/db/CreateAdempiere.java
rename to org.adempiere.base/src/org/compiere/db/CreateAdempiere.java
diff --git a/base/src/org/compiere/db/DBRes.java b/org.adempiere.base/src/org/compiere/db/DBRes.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes.java
rename to org.adempiere.base/src/org/compiere/db/DBRes.java
diff --git a/base/src/org/compiere/db/DBRes_ar.java b/org.adempiere.base/src/org/compiere/db/DBRes_ar.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_ar.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_ar.java
diff --git a/base/src/org/compiere/db/DBRes_bg.java b/org.adempiere.base/src/org/compiere/db/DBRes_bg.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_bg.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_bg.java
diff --git a/base/src/org/compiere/db/DBRes_ca.java b/org.adempiere.base/src/org/compiere/db/DBRes_ca.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_ca.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_ca.java
diff --git a/base/src/org/compiere/db/DBRes_da.java b/org.adempiere.base/src/org/compiere/db/DBRes_da.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_da.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_da.java
diff --git a/base/src/org/compiere/db/DBRes_de.java b/org.adempiere.base/src/org/compiere/db/DBRes_de.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_de.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_de.java
diff --git a/base/src/org/compiere/db/DBRes_el.java b/org.adempiere.base/src/org/compiere/db/DBRes_el.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_el.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_el.java
diff --git a/base/src/org/compiere/db/DBRes_es.java b/org.adempiere.base/src/org/compiere/db/DBRes_es.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_es.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_es.java
diff --git a/base/src/org/compiere/db/DBRes_fa.java b/org.adempiere.base/src/org/compiere/db/DBRes_fa.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_fa.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_fa.java
diff --git a/base/src/org/compiere/db/DBRes_fr.java b/org.adempiere.base/src/org/compiere/db/DBRes_fr.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_fr.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_fr.java
diff --git a/base/src/org/compiere/db/DBRes_hr.java b/org.adempiere.base/src/org/compiere/db/DBRes_hr.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_hr.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_hr.java
diff --git a/base/src/org/compiere/db/DBRes_hu.java b/org.adempiere.base/src/org/compiere/db/DBRes_hu.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_hu.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_hu.java
diff --git a/base/src/org/compiere/db/DBRes_in.java b/org.adempiere.base/src/org/compiere/db/DBRes_in.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_in.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_in.java
diff --git a/base/src/org/compiere/db/DBRes_it.java b/org.adempiere.base/src/org/compiere/db/DBRes_it.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_it.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_it.java
diff --git a/base/src/org/compiere/db/DBRes_ja.java b/org.adempiere.base/src/org/compiere/db/DBRes_ja.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_ja.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_ja.java
diff --git a/base/src/org/compiere/db/DBRes_ms.java b/org.adempiere.base/src/org/compiere/db/DBRes_ms.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_ms.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_ms.java
diff --git a/base/src/org/compiere/db/DBRes_nl.java b/org.adempiere.base/src/org/compiere/db/DBRes_nl.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_nl.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_nl.java
diff --git a/base/src/org/compiere/db/DBRes_no.java b/org.adempiere.base/src/org/compiere/db/DBRes_no.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_no.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_no.java
diff --git a/base/src/org/compiere/db/DBRes_pl.java b/org.adempiere.base/src/org/compiere/db/DBRes_pl.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_pl.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_pl.java
diff --git a/base/src/org/compiere/db/DBRes_pt.java b/org.adempiere.base/src/org/compiere/db/DBRes_pt.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_pt.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_pt.java
diff --git a/base/src/org/compiere/db/DBRes_ro.java b/org.adempiere.base/src/org/compiere/db/DBRes_ro.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_ro.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_ro.java
diff --git a/base/src/org/compiere/db/DBRes_ru.java b/org.adempiere.base/src/org/compiere/db/DBRes_ru.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_ru.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_ru.java
diff --git a/base/src/org/compiere/db/DBRes_sl.java b/org.adempiere.base/src/org/compiere/db/DBRes_sl.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_sl.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_sl.java
diff --git a/base/src/org/compiere/db/DBRes_sr.java b/org.adempiere.base/src/org/compiere/db/DBRes_sr.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_sr.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_sr.java
diff --git a/base/src/org/compiere/db/DBRes_sv.java b/org.adempiere.base/src/org/compiere/db/DBRes_sv.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_sv.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_sv.java
diff --git a/base/src/org/compiere/db/DBRes_th.java b/org.adempiere.base/src/org/compiere/db/DBRes_th.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_th.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_th.java
diff --git a/base/src/org/compiere/db/DBRes_vi.java b/org.adempiere.base/src/org/compiere/db/DBRes_vi.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_vi.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_vi.java
diff --git a/base/src/org/compiere/db/DBRes_zh.java b/org.adempiere.base/src/org/compiere/db/DBRes_zh.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_zh.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_zh.java
diff --git a/base/src/org/compiere/db/DBRes_zh_CN.java b/org.adempiere.base/src/org/compiere/db/DBRes_zh_CN.java
similarity index 100%
rename from base/src/org/compiere/db/DBRes_zh_CN.java
rename to org.adempiere.base/src/org/compiere/db/DBRes_zh_CN.java
diff --git a/base/src/org/compiere/db/Database.java b/org.adempiere.base/src/org/compiere/db/Database.java
similarity index 100%
rename from base/src/org/compiere/db/Database.java
rename to org.adempiere.base/src/org/compiere/db/Database.java
diff --git a/base/src/org/compiere/db/Database16.gif b/org.adempiere.base/src/org/compiere/db/Database16.gif
similarity index 100%
rename from base/src/org/compiere/db/Database16.gif
rename to org.adempiere.base/src/org/compiere/db/Database16.gif
diff --git a/base/src/org/compiere/db/JDBCInfo.java b/org.adempiere.base/src/org/compiere/db/JDBCInfo.java
similarity index 100%
rename from base/src/org/compiere/db/JDBCInfo.java
rename to org.adempiere.base/src/org/compiere/db/JDBCInfo.java
diff --git a/base/src/org/compiere/db/LDAP.java b/org.adempiere.base/src/org/compiere/db/LDAP.java
similarity index 100%
rename from base/src/org/compiere/db/LDAP.java
rename to org.adempiere.base/src/org/compiere/db/LDAP.java
diff --git a/base/src/org/compiere/db/PreparedStatementProxy.java b/org.adempiere.base/src/org/compiere/db/PreparedStatementProxy.java
similarity index 100%
rename from base/src/org/compiere/db/PreparedStatementProxy.java
rename to org.adempiere.base/src/org/compiere/db/PreparedStatementProxy.java
diff --git a/base/src/org/compiere/db/ProxyFactory.java b/org.adempiere.base/src/org/compiere/db/ProxyFactory.java
similarity index 100%
rename from base/src/org/compiere/db/ProxyFactory.java
rename to org.adempiere.base/src/org/compiere/db/ProxyFactory.java
diff --git a/base/src/org/compiere/db/SecurityPrincipal.java b/org.adempiere.base/src/org/compiere/db/SecurityPrincipal.java
similarity index 100%
rename from base/src/org/compiere/db/SecurityPrincipal.java
rename to org.adempiere.base/src/org/compiere/db/SecurityPrincipal.java
diff --git a/base/src/org/compiere/db/Server16.gif b/org.adempiere.base/src/org/compiere/db/Server16.gif
similarity index 100%
rename from base/src/org/compiere/db/Server16.gif
rename to org.adempiere.base/src/org/compiere/db/Server16.gif
diff --git a/base/src/org/compiere/db/StatementProxy.java b/org.adempiere.base/src/org/compiere/db/StatementProxy.java
similarity index 100%
rename from base/src/org/compiere/db/StatementProxy.java
rename to org.adempiere.base/src/org/compiere/db/StatementProxy.java
diff --git a/base/src/org/compiere/db/TestConnection.java b/org.adempiere.base/src/org/compiere/db/TestConnection.java
similarity index 100%
rename from base/src/org/compiere/db/TestConnection.java
rename to org.adempiere.base/src/org/compiere/db/TestConnection.java
diff --git a/base/src/org/compiere/db/TestEJB.java b/org.adempiere.base/src/org/compiere/db/TestEJB.java
similarity index 100%
rename from base/src/org/compiere/db/TestEJB.java
rename to org.adempiere.base/src/org/compiere/db/TestEJB.java
diff --git a/base/src/org/compiere/db/package.html b/org.adempiere.base/src/org/compiere/db/package.html
similarity index 100%
rename from base/src/org/compiere/db/package.html
rename to org.adempiere.base/src/org/compiere/db/package.html
diff --git a/base/src/org/compiere/dbPort/Convert.java b/org.adempiere.base/src/org/compiere/dbPort/Convert.java
similarity index 100%
rename from base/src/org/compiere/dbPort/Convert.java
rename to org.adempiere.base/src/org/compiere/dbPort/Convert.java
diff --git a/base/src/org/compiere/dbPort/Convert_SQL92.java b/org.adempiere.base/src/org/compiere/dbPort/Convert_SQL92.java
similarity index 100%
rename from base/src/org/compiere/dbPort/Convert_SQL92.java
rename to org.adempiere.base/src/org/compiere/dbPort/Convert_SQL92.java
diff --git a/base/src/org/compiere/dbPort/Join.java b/org.adempiere.base/src/org/compiere/dbPort/Join.java
similarity index 100%
rename from base/src/org/compiere/dbPort/Join.java
rename to org.adempiere.base/src/org/compiere/dbPort/Join.java
diff --git a/base/src/org/compiere/dbPort/package.html b/org.adempiere.base/src/org/compiere/dbPort/package.html
similarity index 100%
rename from base/src/org/compiere/dbPort/package.html
rename to org.adempiere.base/src/org/compiere/dbPort/package.html
diff --git a/base/src/org/compiere/impexp/BankStatementLoaderInterface.java b/org.adempiere.base/src/org/compiere/impexp/BankStatementLoaderInterface.java
similarity index 100%
rename from base/src/org/compiere/impexp/BankStatementLoaderInterface.java
rename to org.adempiere.base/src/org/compiere/impexp/BankStatementLoaderInterface.java
diff --git a/base/src/org/compiere/impexp/BankStatementMatchInfo.java b/org.adempiere.base/src/org/compiere/impexp/BankStatementMatchInfo.java
similarity index 100%
rename from base/src/org/compiere/impexp/BankStatementMatchInfo.java
rename to org.adempiere.base/src/org/compiere/impexp/BankStatementMatchInfo.java
diff --git a/base/src/org/compiere/impexp/BankStatementMatcherInterface.java b/org.adempiere.base/src/org/compiere/impexp/BankStatementMatcherInterface.java
similarity index 100%
rename from base/src/org/compiere/impexp/BankStatementMatcherInterface.java
rename to org.adempiere.base/src/org/compiere/impexp/BankStatementMatcherInterface.java
diff --git a/base/src/org/compiere/impexp/CopyImportFormat.java b/org.adempiere.base/src/org/compiere/impexp/CopyImportFormat.java
similarity index 100%
rename from base/src/org/compiere/impexp/CopyImportFormat.java
rename to org.adempiere.base/src/org/compiere/impexp/CopyImportFormat.java
diff --git a/base/src/org/compiere/impexp/ImpFormat.java b/org.adempiere.base/src/org/compiere/impexp/ImpFormat.java
similarity index 100%
rename from base/src/org/compiere/impexp/ImpFormat.java
rename to org.adempiere.base/src/org/compiere/impexp/ImpFormat.java
diff --git a/base/src/org/compiere/impexp/ImpFormatRow.java b/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java
similarity index 100%
rename from base/src/org/compiere/impexp/ImpFormatRow.java
rename to org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java
diff --git a/base/src/org/compiere/impexp/MImpFormat.java b/org.adempiere.base/src/org/compiere/impexp/MImpFormat.java
similarity index 100%
rename from base/src/org/compiere/impexp/MImpFormat.java
rename to org.adempiere.base/src/org/compiere/impexp/MImpFormat.java
diff --git a/base/src/org/compiere/impexp/MImpFormatRow.java b/org.adempiere.base/src/org/compiere/impexp/MImpFormatRow.java
similarity index 100%
rename from base/src/org/compiere/impexp/MImpFormatRow.java
rename to org.adempiere.base/src/org/compiere/impexp/MImpFormatRow.java
diff --git a/base/src/org/compiere/impexp/OFX1ToXML.java b/org.adempiere.base/src/org/compiere/impexp/OFX1ToXML.java
similarity index 100%
rename from base/src/org/compiere/impexp/OFX1ToXML.java
rename to org.adempiere.base/src/org/compiere/impexp/OFX1ToXML.java
diff --git a/base/src/org/compiere/impexp/OFXBankStatementHandler.java b/org.adempiere.base/src/org/compiere/impexp/OFXBankStatementHandler.java
similarity index 100%
rename from base/src/org/compiere/impexp/OFXBankStatementHandler.java
rename to org.adempiere.base/src/org/compiere/impexp/OFXBankStatementHandler.java
diff --git a/base/src/org/compiere/impexp/OFXFileBankStatementLoader.java b/org.adempiere.base/src/org/compiere/impexp/OFXFileBankStatementLoader.java
similarity index 100%
rename from base/src/org/compiere/impexp/OFXFileBankStatementLoader.java
rename to org.adempiere.base/src/org/compiere/impexp/OFXFileBankStatementLoader.java
diff --git a/base/src/org/compiere/impexp/package.html b/org.adempiere.base/src/org/compiere/impexp/package.html
similarity index 100%
rename from base/src/org/compiere/impexp/package.html
rename to org.adempiere.base/src/org/compiere/impexp/package.html
diff --git a/base/src/org/compiere/interfaces/Server.java b/org.adempiere.base/src/org/compiere/interfaces/Server.java
similarity index 100%
rename from base/src/org/compiere/interfaces/Server.java
rename to org.adempiere.base/src/org/compiere/interfaces/Server.java
diff --git a/base/src/org/compiere/interfaces/Status.java b/org.adempiere.base/src/org/compiere/interfaces/Status.java
similarity index 100%
rename from base/src/org/compiere/interfaces/Status.java
rename to org.adempiere.base/src/org/compiere/interfaces/Status.java
diff --git a/base/src/org/compiere/interfaces/impl/ServerBean.java b/org.adempiere.base/src/org/compiere/interfaces/impl/ServerBean.java
similarity index 100%
rename from base/src/org/compiere/interfaces/impl/ServerBean.java
rename to org.adempiere.base/src/org/compiere/interfaces/impl/ServerBean.java
diff --git a/base/src/org/compiere/interfaces/impl/StatusBean.java b/org.adempiere.base/src/org/compiere/interfaces/impl/StatusBean.java
similarity index 100%
rename from base/src/org/compiere/interfaces/impl/StatusBean.java
rename to org.adempiere.base/src/org/compiere/interfaces/impl/StatusBean.java
diff --git a/base/src/org/compiere/license.html b/org.adempiere.base/src/org/compiere/license.html
similarity index 100%
rename from base/src/org/compiere/license.html
rename to org.adempiere.base/src/org/compiere/license.html
diff --git a/base/src/org/compiere/model/AccessSqlParser.java b/org.adempiere.base/src/org/compiere/model/AccessSqlParser.java
similarity index 100%
rename from base/src/org/compiere/model/AccessSqlParser.java
rename to org.adempiere.base/src/org/compiere/model/AccessSqlParser.java
diff --git a/base/src/org/compiere/model/AccessSqlParserTest.java b/org.adempiere.base/src/org/compiere/model/AccessSqlParserTest.java
similarity index 97%
rename from base/src/org/compiere/model/AccessSqlParserTest.java
rename to org.adempiere.base/src/org/compiere/model/AccessSqlParserTest.java
index ce2a35c79e..81efc99a9d 100644
--- a/base/src/org/compiere/model/AccessSqlParserTest.java
+++ b/org.adempiere.base/src/org/compiere/model/AccessSqlParserTest.java
@@ -17,6 +17,7 @@
package org.compiere.model;
import junit.framework.TestCase;
+import junit.textui.TestRunner;
/**
* AccessSqlParserTest tests the class
@@ -44,7 +45,7 @@ public class AccessSqlParserTest extends TestCase
*/
public static void main(String[] args)
{
- junit.swingui.TestRunner.run(AccessSqlParserTest.class);
+ TestRunner.run(AccessSqlParserTest.class);
}
/**
diff --git a/base/src/org/compiere/model/AdempiereProcessor.java b/org.adempiere.base/src/org/compiere/model/AdempiereProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/AdempiereProcessor.java
rename to org.adempiere.base/src/org/compiere/model/AdempiereProcessor.java
diff --git a/base/src/org/compiere/model/AdempiereProcessor2.java b/org.adempiere.base/src/org/compiere/model/AdempiereProcessor2.java
similarity index 100%
rename from base/src/org/compiere/model/AdempiereProcessor2.java
rename to org.adempiere.base/src/org/compiere/model/AdempiereProcessor2.java
diff --git a/base/src/org/compiere/model/AdempiereProcessorLog.java b/org.adempiere.base/src/org/compiere/model/AdempiereProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/AdempiereProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/AdempiereProcessorLog.java
diff --git a/base/src/org/compiere/model/Callout.java b/org.adempiere.base/src/org/compiere/model/Callout.java
similarity index 100%
rename from base/src/org/compiere/model/Callout.java
rename to org.adempiere.base/src/org/compiere/model/Callout.java
diff --git a/base/src/org/compiere/model/CalloutEngine.java b/org.adempiere.base/src/org/compiere/model/CalloutEngine.java
similarity index 100%
rename from base/src/org/compiere/model/CalloutEngine.java
rename to org.adempiere.base/src/org/compiere/model/CalloutEngine.java
diff --git a/base/src/org/compiere/model/DataStatusEvent.java b/org.adempiere.base/src/org/compiere/model/DataStatusEvent.java
similarity index 100%
rename from base/src/org/compiere/model/DataStatusEvent.java
rename to org.adempiere.base/src/org/compiere/model/DataStatusEvent.java
diff --git a/base/src/org/compiere/model/DataStatusListener.java b/org.adempiere.base/src/org/compiere/model/DataStatusListener.java
similarity index 100%
rename from base/src/org/compiere/model/DataStatusListener.java
rename to org.adempiere.base/src/org/compiere/model/DataStatusListener.java
diff --git a/base/src/org/compiere/model/DocWorkflowMgr.java b/org.adempiere.base/src/org/compiere/model/DocWorkflowMgr.java
similarity index 100%
rename from base/src/org/compiere/model/DocWorkflowMgr.java
rename to org.adempiere.base/src/org/compiere/model/DocWorkflowMgr.java
diff --git a/base/src/org/compiere/model/FactsValidator.java b/org.adempiere.base/src/org/compiere/model/FactsValidator.java
similarity index 100%
rename from base/src/org/compiere/model/FactsValidator.java
rename to org.adempiere.base/src/org/compiere/model/FactsValidator.java
diff --git a/base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java
similarity index 100%
rename from base/src/org/compiere/model/GridField.java
rename to org.adempiere.base/src/org/compiere/model/GridField.java
diff --git a/base/src/org/compiere/model/GridFieldVO.java b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java
similarity index 100%
rename from base/src/org/compiere/model/GridFieldVO.java
rename to org.adempiere.base/src/org/compiere/model/GridFieldVO.java
diff --git a/base/src/org/compiere/model/GridTab.java b/org.adempiere.base/src/org/compiere/model/GridTab.java
similarity index 100%
rename from base/src/org/compiere/model/GridTab.java
rename to org.adempiere.base/src/org/compiere/model/GridTab.java
diff --git a/base/src/org/compiere/model/GridTabVO.java b/org.adempiere.base/src/org/compiere/model/GridTabVO.java
similarity index 100%
rename from base/src/org/compiere/model/GridTabVO.java
rename to org.adempiere.base/src/org/compiere/model/GridTabVO.java
diff --git a/base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java
similarity index 100%
rename from base/src/org/compiere/model/GridTable.java
rename to org.adempiere.base/src/org/compiere/model/GridTable.java
diff --git a/base/src/org/compiere/model/GridWindow.java b/org.adempiere.base/src/org/compiere/model/GridWindow.java
similarity index 100%
rename from base/src/org/compiere/model/GridWindow.java
rename to org.adempiere.base/src/org/compiere/model/GridWindow.java
diff --git a/base/src/org/compiere/model/GridWindowVO.java b/org.adempiere.base/src/org/compiere/model/GridWindowVO.java
similarity index 100%
rename from base/src/org/compiere/model/GridWindowVO.java
rename to org.adempiere.base/src/org/compiere/model/GridWindowVO.java
diff --git a/base/src/org/compiere/model/GridWorkbench.java b/org.adempiere.base/src/org/compiere/model/GridWorkbench.java
similarity index 100%
rename from base/src/org/compiere/model/GridWorkbench.java
rename to org.adempiere.base/src/org/compiere/model/GridWorkbench.java
diff --git a/base/src/org/compiere/model/I_AD_AccessLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_AccessLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_AccessLog.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_AccessLog.java
diff --git a/base/src/org/compiere/model/I_AD_Alert.java b/org.adempiere.base/src/org/compiere/model/I_AD_Alert.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Alert.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Alert.java
diff --git a/base/src/org/compiere/model/I_AD_AlertProcessor.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_AlertProcessor.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessor.java
diff --git a/base/src/org/compiere/model/I_AD_AlertProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_AlertProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_AlertProcessorLog.java
diff --git a/base/src/org/compiere/model/I_AD_AlertRecipient.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertRecipient.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_AlertRecipient.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_AlertRecipient.java
diff --git a/base/src/org/compiere/model/I_AD_AlertRule.java b/org.adempiere.base/src/org/compiere/model/I_AD_AlertRule.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_AlertRule.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_AlertRule.java
diff --git a/base/src/org/compiere/model/I_AD_Archive.java b/org.adempiere.base/src/org/compiere/model/I_AD_Archive.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Archive.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Archive.java
diff --git a/base/src/org/compiere/model/I_AD_Attachment.java b/org.adempiere.base/src/org/compiere/model/I_AD_Attachment.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Attachment.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Attachment.java
diff --git a/base/src/org/compiere/model/I_AD_AttachmentNote.java b/org.adempiere.base/src/org/compiere/model/I_AD_AttachmentNote.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_AttachmentNote.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_AttachmentNote.java
diff --git a/base/src/org/compiere/model/I_AD_Attribute.java b/org.adempiere.base/src/org/compiere/model/I_AD_Attribute.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Attribute.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Attribute.java
diff --git a/base/src/org/compiere/model/I_AD_Attribute_Value.java b/org.adempiere.base/src/org/compiere/model/I_AD_Attribute_Value.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Attribute_Value.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Attribute_Value.java
diff --git a/base/src/org/compiere/model/I_AD_ChangeLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_ChangeLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ChangeLog.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ChangeLog.java
diff --git a/base/src/org/compiere/model/I_AD_Client.java b/org.adempiere.base/src/org/compiere/model/I_AD_Client.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Client.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Client.java
diff --git a/base/src/org/compiere/model/I_AD_ClientInfo.java b/org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ClientInfo.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java
diff --git a/base/src/org/compiere/model/I_AD_ClientShare.java b/org.adempiere.base/src/org/compiere/model/I_AD_ClientShare.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ClientShare.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ClientShare.java
diff --git a/base/src/org/compiere/model/I_AD_Color.java b/org.adempiere.base/src/org/compiere/model/I_AD_Color.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Color.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Color.java
diff --git a/base/src/org/compiere/model/I_AD_Column.java b/org.adempiere.base/src/org/compiere/model/I_AD_Column.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Column.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Column.java
diff --git a/base/src/org/compiere/model/I_AD_Column_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Column_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Column_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Column_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Desktop.java b/org.adempiere.base/src/org/compiere/model/I_AD_Desktop.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Desktop.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Desktop.java
diff --git a/base/src/org/compiere/model/I_AD_DesktopWorkbench.java b/org.adempiere.base/src/org/compiere/model/I_AD_DesktopWorkbench.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_DesktopWorkbench.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_DesktopWorkbench.java
diff --git a/base/src/org/compiere/model/I_AD_Document_Action_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Document_Action_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Document_Action_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Document_Action_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Element.java b/org.adempiere.base/src/org/compiere/model/I_AD_Element.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Element.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Element.java
diff --git a/base/src/org/compiere/model/I_AD_EntityType.java b/org.adempiere.base/src/org/compiere/model/I_AD_EntityType.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_EntityType.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_EntityType.java
diff --git a/base/src/org/compiere/model/I_AD_Error.java b/org.adempiere.base/src/org/compiere/model/I_AD_Error.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Error.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Error.java
diff --git a/base/src/org/compiere/model/I_AD_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_Field.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Field.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Field.java
diff --git a/base/src/org/compiere/model/I_AD_FieldGroup.java b/org.adempiere.base/src/org/compiere/model/I_AD_FieldGroup.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_FieldGroup.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_FieldGroup.java
diff --git a/base/src/org/compiere/model/I_AD_Find.java b/org.adempiere.base/src/org/compiere/model/I_AD_Find.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Find.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Find.java
diff --git a/base/src/org/compiere/model/I_AD_Form.java b/org.adempiere.base/src/org/compiere/model/I_AD_Form.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Form.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Form.java
diff --git a/base/src/org/compiere/model/I_AD_Form_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Form_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Form_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Form_Access.java
diff --git a/base/src/org/compiere/model/I_AD_HouseKeeping.java b/org.adempiere.base/src/org/compiere/model/I_AD_HouseKeeping.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_HouseKeeping.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_HouseKeeping.java
diff --git a/base/src/org/compiere/model/I_AD_Image.java b/org.adempiere.base/src/org/compiere/model/I_AD_Image.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Image.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Image.java
diff --git a/base/src/org/compiere/model/I_AD_ImpFormat.java b/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ImpFormat.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat.java
diff --git a/base/src/org/compiere/model/I_AD_ImpFormat_Row.java b/org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat_Row.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ImpFormat_Row.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ImpFormat_Row.java
diff --git a/base/src/org/compiere/model/I_AD_InfoColumn.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoColumn.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_InfoColumn.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_InfoColumn.java
diff --git a/base/src/org/compiere/model/I_AD_InfoWindow.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_InfoWindow.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java
diff --git a/base/src/org/compiere/model/I_AD_Issue.java b/org.adempiere.base/src/org/compiere/model/I_AD_Issue.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Issue.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Issue.java
diff --git a/base/src/org/compiere/model/I_AD_LabelPrinter.java b/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinter.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_LabelPrinter.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinter.java
diff --git a/base/src/org/compiere/model/I_AD_LabelPrinterFunction.java b/org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
diff --git a/base/src/org/compiere/model/I_AD_Language.java b/org.adempiere.base/src/org/compiere/model/I_AD_Language.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Language.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Language.java
diff --git a/base/src/org/compiere/model/I_AD_LdapAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_LdapAccess.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_LdapAccess.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_LdapAccess.java
diff --git a/base/src/org/compiere/model/I_AD_LdapProcessor.java b/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_LdapProcessor.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessor.java
diff --git a/base/src/org/compiere/model/I_AD_LdapProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_LdapProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_LdapProcessorLog.java
diff --git a/base/src/org/compiere/model/I_AD_Menu.java b/org.adempiere.base/src/org/compiere/model/I_AD_Menu.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Menu.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Menu.java
diff --git a/base/src/org/compiere/model/I_AD_Message.java b/org.adempiere.base/src/org/compiere/model/I_AD_Message.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Message.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Message.java
diff --git a/base/src/org/compiere/model/I_AD_MigrationScript.java b/org.adempiere.base/src/org/compiere/model/I_AD_MigrationScript.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_MigrationScript.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_MigrationScript.java
diff --git a/base/src/org/compiere/model/I_AD_ModelValidator.java b/org.adempiere.base/src/org/compiere/model/I_AD_ModelValidator.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ModelValidator.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ModelValidator.java
diff --git a/base/src/org/compiere/model/I_AD_Modification.java b/org.adempiere.base/src/org/compiere/model/I_AD_Modification.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Modification.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Modification.java
diff --git a/base/src/org/compiere/model/I_AD_Note.java b/org.adempiere.base/src/org/compiere/model/I_AD_Note.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Note.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Note.java
diff --git a/base/src/org/compiere/model/I_AD_Org.java b/org.adempiere.base/src/org/compiere/model/I_AD_Org.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Org.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Org.java
diff --git a/base/src/org/compiere/model/I_AD_OrgInfo.java b/org.adempiere.base/src/org/compiere/model/I_AD_OrgInfo.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_OrgInfo.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_OrgInfo.java
diff --git a/base/src/org/compiere/model/I_AD_OrgType.java b/org.adempiere.base/src/org/compiere/model/I_AD_OrgType.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_OrgType.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_OrgType.java
diff --git a/base/src/org/compiere/model/I_AD_PInstance.java b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PInstance.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PInstance.java
diff --git a/base/src/org/compiere/model/I_AD_PInstance_Log.java b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Log.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PInstance_Log.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Log.java
diff --git a/base/src/org/compiere/model/I_AD_PInstance_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Para.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PInstance_Para.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PInstance_Para.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Exp.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Exp.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Exp_Common.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Common.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Exp_Common.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Common.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Exp_Detail.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Imp.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Backup.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Detail.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Inst.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Proc.java b/org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
diff --git a/base/src/org/compiere/model/I_AD_Preference.java b/org.adempiere.base/src/org/compiere/model/I_AD_Preference.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Preference.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Preference.java
diff --git a/base/src/org/compiere/model/I_AD_PrintColor.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintColor.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintColor.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintColor.java
diff --git a/base/src/org/compiere/model/I_AD_PrintFont.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFont.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintFont.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintFont.java
diff --git a/base/src/org/compiere/model/I_AD_PrintForm.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintForm.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintForm.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintForm.java
diff --git a/base/src/org/compiere/model/I_AD_PrintFormat.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormat.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintFormat.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintFormat.java
diff --git a/base/src/org/compiere/model/I_AD_PrintFormatItem.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintFormatItem.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintFormatItem.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintFormatItem.java
diff --git a/base/src/org/compiere/model/I_AD_PrintGraph.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintGraph.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintGraph.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintGraph.java
diff --git a/base/src/org/compiere/model/I_AD_PrintLabel.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabel.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintLabel.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintLabel.java
diff --git a/base/src/org/compiere/model/I_AD_PrintLabelLine.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintLabelLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintLabelLine.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintLabelLine.java
diff --git a/base/src/org/compiere/model/I_AD_PrintPaper.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintPaper.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintPaper.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintPaper.java
diff --git a/base/src/org/compiere/model/I_AD_PrintTableFormat.java b/org.adempiere.base/src/org/compiere/model/I_AD_PrintTableFormat.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_PrintTableFormat.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_PrintTableFormat.java
diff --git a/base/src/org/compiere/model/I_AD_Private_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Private_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Private_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Private_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Process.java b/org.adempiere.base/src/org/compiere/model/I_AD_Process.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Process.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Process.java
diff --git a/base/src/org/compiere/model/I_AD_Process_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Process_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Process_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Process_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Process_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_Process_Para.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Process_Para.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Process_Para.java
diff --git a/base/src/org/compiere/model/I_AD_Record_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Record_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Record_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Record_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Ref_List.java b/org.adempiere.base/src/org/compiere/model/I_AD_Ref_List.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Ref_List.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Ref_List.java
diff --git a/base/src/org/compiere/model/I_AD_Ref_Table.java b/org.adempiere.base/src/org/compiere/model/I_AD_Ref_Table.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Ref_Table.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Ref_Table.java
diff --git a/base/src/org/compiere/model/I_AD_Reference.java b/org.adempiere.base/src/org/compiere/model/I_AD_Reference.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Reference.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Reference.java
diff --git a/base/src/org/compiere/model/I_AD_Registration.java b/org.adempiere.base/src/org/compiere/model/I_AD_Registration.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Registration.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Registration.java
diff --git a/base/src/org/compiere/model/I_AD_RelationType.java b/org.adempiere.base/src/org/compiere/model/I_AD_RelationType.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_RelationType.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_RelationType.java
diff --git a/base/src/org/compiere/model/I_AD_Replication.java b/org.adempiere.base/src/org/compiere/model/I_AD_Replication.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Replication.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Replication.java
diff --git a/base/src/org/compiere/model/I_AD_ReplicationDocument.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationDocument.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ReplicationDocument.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ReplicationDocument.java
diff --git a/base/src/org/compiere/model/I_AD_ReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationStrategy.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ReplicationStrategy.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ReplicationStrategy.java
diff --git a/base/src/org/compiere/model/I_AD_ReplicationTable.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReplicationTable.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ReplicationTable.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ReplicationTable.java
diff --git a/base/src/org/compiere/model/I_AD_Replication_Log.java b/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Log.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Replication_Log.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Replication_Log.java
diff --git a/base/src/org/compiere/model/I_AD_Replication_Run.java b/org.adempiere.base/src/org/compiere/model/I_AD_Replication_Run.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Replication_Run.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Replication_Run.java
diff --git a/base/src/org/compiere/model/I_AD_ReportView.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ReportView.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ReportView.java
diff --git a/base/src/org/compiere/model/I_AD_ReportView_Col.java b/org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Col.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_ReportView_Col.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_ReportView_Col.java
diff --git a/base/src/org/compiere/model/I_AD_Role.java b/org.adempiere.base/src/org/compiere/model/I_AD_Role.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Role.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Role.java
diff --git a/base/src/org/compiere/model/I_AD_Role_Included.java b/org.adempiere.base/src/org/compiere/model/I_AD_Role_Included.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Role_Included.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Role_Included.java
diff --git a/base/src/org/compiere/model/I_AD_Role_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_Role_OrgAccess.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Role_OrgAccess.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Role_OrgAccess.java
diff --git a/base/src/org/compiere/model/I_AD_Rule.java b/org.adempiere.base/src/org/compiere/model/I_AD_Rule.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Rule.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Rule.java
diff --git a/base/src/org/compiere/model/I_AD_Scheduler.java b/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Scheduler.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Scheduler.java
diff --git a/base/src/org/compiere/model/I_AD_SchedulerLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_SchedulerLog.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_SchedulerLog.java
diff --git a/base/src/org/compiere/model/I_AD_SchedulerRecipient.java b/org.adempiere.base/src/org/compiere/model/I_AD_SchedulerRecipient.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_SchedulerRecipient.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_SchedulerRecipient.java
diff --git a/base/src/org/compiere/model/I_AD_Scheduler_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_Scheduler_Para.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Scheduler_Para.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Scheduler_Para.java
diff --git a/base/src/org/compiere/model/I_AD_SearchDefinition.java b/org.adempiere.base/src/org/compiere/model/I_AD_SearchDefinition.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_SearchDefinition.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_SearchDefinition.java
diff --git a/base/src/org/compiere/model/I_AD_Sequence.java b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Sequence.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Sequence.java
diff --git a/base/src/org/compiere/model/I_AD_Sequence_Audit.java b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_Audit.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Sequence_Audit.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Sequence_Audit.java
diff --git a/base/src/org/compiere/model/I_AD_Sequence_No.java b/org.adempiere.base/src/org/compiere/model/I_AD_Sequence_No.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Sequence_No.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Sequence_No.java
diff --git a/base/src/org/compiere/model/I_AD_Session.java b/org.adempiere.base/src/org/compiere/model/I_AD_Session.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Session.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Session.java
diff --git a/base/src/org/compiere/model/I_AD_SysConfig.java b/org.adempiere.base/src/org/compiere/model/I_AD_SysConfig.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_SysConfig.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_SysConfig.java
diff --git a/base/src/org/compiere/model/I_AD_System.java b/org.adempiere.base/src/org/compiere/model/I_AD_System.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_System.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_System.java
diff --git a/base/src/org/compiere/model/I_AD_Tab.java b/org.adempiere.base/src/org/compiere/model/I_AD_Tab.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Tab.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Tab.java
diff --git a/base/src/org/compiere/model/I_AD_Table.java b/org.adempiere.base/src/org/compiere/model/I_AD_Table.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Table.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Table.java
diff --git a/base/src/org/compiere/model/I_AD_Table_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Table_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Table_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Table_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Table_ScriptValidator.java b/org.adempiere.base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
diff --git a/base/src/org/compiere/model/I_AD_Task.java b/org.adempiere.base/src/org/compiere/model/I_AD_Task.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Task.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Task.java
diff --git a/base/src/org/compiere/model/I_AD_TaskInstance.java b/org.adempiere.base/src/org/compiere/model/I_AD_TaskInstance.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TaskInstance.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TaskInstance.java
diff --git a/base/src/org/compiere/model/I_AD_Task_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Task_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Task_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Task_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Tree.java b/org.adempiere.base/src/org/compiere/model/I_AD_Tree.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Tree.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Tree.java
diff --git a/base/src/org/compiere/model/I_AD_TreeBar.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeBar.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeBar.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeBar.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNode.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNode.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNode.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNode.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeBP.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeBP.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeBP.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeBP.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMC.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMC.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeCMC.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMC.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMM.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMM.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeCMM.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMM.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMS.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMS.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeCMS.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMS.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMT.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMT.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeCMT.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeCMT.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeMM.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeMM.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeMM.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeMM.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodePR.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodePR.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodePR.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodePR.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU1.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU1.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeU1.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU1.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU2.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU2.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeU2.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU2.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU3.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU3.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeU3.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU3.java
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU4.java b/org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU4.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_TreeNodeU4.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_TreeNodeU4.java
diff --git a/base/src/org/compiere/model/I_AD_User.java b/org.adempiere.base/src/org/compiere/model/I_AD_User.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_User.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_User.java
diff --git a/base/src/org/compiere/model/I_AD_UserBPAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserBPAccess.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_UserBPAccess.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_UserBPAccess.java
diff --git a/base/src/org/compiere/model/I_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_UserDef_Field.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java
diff --git a/base/src/org/compiere/model/I_AD_UserDef_Tab.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Tab.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_UserDef_Tab.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Tab.java
diff --git a/base/src/org/compiere/model/I_AD_UserDef_Win.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Win.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_UserDef_Win.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Win.java
diff --git a/base/src/org/compiere/model/I_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_UserMail.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
diff --git a/base/src/org/compiere/model/I_AD_UserQuery.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserQuery.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_UserQuery.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_UserQuery.java
diff --git a/base/src/org/compiere/model/I_AD_User_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/I_AD_User_OrgAccess.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_User_OrgAccess.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_User_OrgAccess.java
diff --git a/base/src/org/compiere/model/I_AD_User_Roles.java b/org.adempiere.base/src/org/compiere/model/I_AD_User_Roles.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_User_Roles.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_User_Roles.java
diff --git a/base/src/org/compiere/model/I_AD_User_Substitute.java b/org.adempiere.base/src/org/compiere/model/I_AD_User_Substitute.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_User_Substitute.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_User_Substitute.java
diff --git a/base/src/org/compiere/model/I_AD_Val_Rule.java b/org.adempiere.base/src/org/compiere/model/I_AD_Val_Rule.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Val_Rule.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Val_Rule.java
diff --git a/base/src/org/compiere/model/I_AD_WF_Activity.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Activity.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_Activity.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_Activity.java
diff --git a/base/src/org/compiere/model/I_AD_WF_ActivityResult.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityResult.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_ActivityResult.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_ActivityResult.java
diff --git a/base/src/org/compiere/model/I_AD_WF_Block.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Block.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_Block.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_Block.java
diff --git a/base/src/org/compiere/model/I_AD_WF_EventAudit.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_EventAudit.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_EventAudit.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_EventAudit.java
diff --git a/base/src/org/compiere/model/I_AD_WF_NextCondition.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_NextCondition.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_NextCondition.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_NextCondition.java
diff --git a/base/src/org/compiere/model/I_AD_WF_Node.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_Node.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java
diff --git a/base/src/org/compiere/model/I_AD_WF_NodeNext.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_NodeNext.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_NodeNext.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_NodeNext.java
diff --git a/base/src/org/compiere/model/I_AD_WF_Node_Para.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node_Para.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_Node_Para.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_Node_Para.java
diff --git a/base/src/org/compiere/model/I_AD_WF_Process.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Process.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_Process.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_Process.java
diff --git a/base/src/org/compiere/model/I_AD_WF_ProcessData.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_ProcessData.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_ProcessData.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_ProcessData.java
diff --git a/base/src/org/compiere/model/I_AD_WF_Responsible.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Responsible.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WF_Responsible.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WF_Responsible.java
diff --git a/base/src/org/compiere/model/I_AD_Window.java b/org.adempiere.base/src/org/compiere/model/I_AD_Window.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Window.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Window.java
diff --git a/base/src/org/compiere/model/I_AD_Window_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Window_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Window_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Window_Access.java
diff --git a/base/src/org/compiere/model/I_AD_Workbench.java b/org.adempiere.base/src/org/compiere/model/I_AD_Workbench.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Workbench.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Workbench.java
diff --git a/base/src/org/compiere/model/I_AD_WorkbenchWindow.java b/org.adempiere.base/src/org/compiere/model/I_AD_WorkbenchWindow.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WorkbenchWindow.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WorkbenchWindow.java
diff --git a/base/src/org/compiere/model/I_AD_Workflow.java b/org.adempiere.base/src/org/compiere/model/I_AD_Workflow.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Workflow.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Workflow.java
diff --git a/base/src/org/compiere/model/I_AD_WorkflowProcessor.java b/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WorkflowProcessor.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessor.java
diff --git a/base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
diff --git a/base/src/org/compiere/model/I_AD_Workflow_Access.java b/org.adempiere.base/src/org/compiere/model/I_AD_Workflow_Access.java
similarity index 100%
rename from base/src/org/compiere/model/I_AD_Workflow_Access.java
rename to org.adempiere.base/src/org/compiere/model/I_AD_Workflow_Access.java
diff --git a/base/src/org/compiere/model/I_ASP_ClientException.java b/org.adempiere.base/src/org/compiere/model/I_ASP_ClientException.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_ClientException.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_ClientException.java
diff --git a/base/src/org/compiere/model/I_ASP_ClientLevel.java b/org.adempiere.base/src/org/compiere/model/I_ASP_ClientLevel.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_ClientLevel.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_ClientLevel.java
diff --git a/base/src/org/compiere/model/I_ASP_Field.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Field.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Field.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Field.java
diff --git a/base/src/org/compiere/model/I_ASP_Form.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Form.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Form.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Form.java
diff --git a/base/src/org/compiere/model/I_ASP_Level.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Level.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Level.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Level.java
diff --git a/base/src/org/compiere/model/I_ASP_Module.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Module.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Module.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Module.java
diff --git a/base/src/org/compiere/model/I_ASP_Process.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Process.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Process.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Process.java
diff --git a/base/src/org/compiere/model/I_ASP_Process_Para.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Process_Para.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Process_Para.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Process_Para.java
diff --git a/base/src/org/compiere/model/I_ASP_Tab.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Tab.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Tab.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Tab.java
diff --git a/base/src/org/compiere/model/I_ASP_Task.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Task.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Task.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Task.java
diff --git a/base/src/org/compiere/model/I_ASP_Window.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Window.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Window.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Window.java
diff --git a/base/src/org/compiere/model/I_ASP_Workflow.java b/org.adempiere.base/src/org/compiere/model/I_ASP_Workflow.java
similarity index 100%
rename from base/src/org/compiere/model/I_ASP_Workflow.java
rename to org.adempiere.base/src/org/compiere/model/I_ASP_Workflow.java
diff --git a/base/src/org/compiere/model/I_A_Asset.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Acct.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Acct.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Addition.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Addition.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Addition.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Addition.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Change.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Change.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Change.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Change.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Delivery.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Delivery.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Delivery.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Delivery.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Disposed.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Disposed.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Disposed.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Disposed.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Group.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Group.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Group.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Group_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Group_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Group_Acct.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Fin.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Fin.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Info_Fin.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Fin.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Ins.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Ins.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Info_Ins.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Ins.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Lic.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Lic.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Info_Lic.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Lic.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Oth.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Oth.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Info_Oth.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Oth.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Tax.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Tax.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Info_Tax.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Info_Tax.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Retirement.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Retirement.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Retirement.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Retirement.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Reval_Entry.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Reval_Index.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Index.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Reval_Index.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Reval_Index.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Split.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Split.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Split.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Split.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Spread.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Spread.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Spread.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Spread.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Transfer.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Transfer.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Transfer.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Transfer.java
diff --git a/base/src/org/compiere/model/I_A_Asset_Use.java b/org.adempiere.base/src/org/compiere/model/I_A_Asset_Use.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Asset_Use.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Asset_Use.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Build.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Build.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Build.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Build.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Convention.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Convention.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Convention.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Convention.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Entry.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Entry.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Entry.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Entry.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Exp.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Exp.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Exp.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Exp.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Forecast.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Forecast.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Forecast.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Forecast.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Method.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Method.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Method.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Method.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Table_Header.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Workfile.java b/org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Workfile.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Depreciation_Workfile.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Depreciation_Workfile.java
diff --git a/base/src/org/compiere/model/I_A_Registration.java b/org.adempiere.base/src/org/compiere/model/I_A_Registration.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_Registration.java
rename to org.adempiere.base/src/org/compiere/model/I_A_Registration.java
diff --git a/base/src/org/compiere/model/I_A_RegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationAttribute.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_RegistrationAttribute.java
rename to org.adempiere.base/src/org/compiere/model/I_A_RegistrationAttribute.java
diff --git a/base/src/org/compiere/model/I_A_RegistrationProduct.java b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationProduct.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_RegistrationProduct.java
rename to org.adempiere.base/src/org/compiere/model/I_A_RegistrationProduct.java
diff --git a/base/src/org/compiere/model/I_A_RegistrationValue.java b/org.adempiere.base/src/org/compiere/model/I_A_RegistrationValue.java
similarity index 100%
rename from base/src/org/compiere/model/I_A_RegistrationValue.java
rename to org.adempiere.base/src/org/compiere/model/I_A_RegistrationValue.java
diff --git a/base/src/org/compiere/model/I_B_Bid.java b/org.adempiere.base/src/org/compiere/model/I_B_Bid.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_Bid.java
rename to org.adempiere.base/src/org/compiere/model/I_B_Bid.java
diff --git a/base/src/org/compiere/model/I_B_BidComment.java b/org.adempiere.base/src/org/compiere/model/I_B_BidComment.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_BidComment.java
rename to org.adempiere.base/src/org/compiere/model/I_B_BidComment.java
diff --git a/base/src/org/compiere/model/I_B_Buyer.java b/org.adempiere.base/src/org/compiere/model/I_B_Buyer.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_Buyer.java
rename to org.adempiere.base/src/org/compiere/model/I_B_Buyer.java
diff --git a/base/src/org/compiere/model/I_B_BuyerFunds.java b/org.adempiere.base/src/org/compiere/model/I_B_BuyerFunds.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_BuyerFunds.java
rename to org.adempiere.base/src/org/compiere/model/I_B_BuyerFunds.java
diff --git a/base/src/org/compiere/model/I_B_Offer.java b/org.adempiere.base/src/org/compiere/model/I_B_Offer.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_Offer.java
rename to org.adempiere.base/src/org/compiere/model/I_B_Offer.java
diff --git a/base/src/org/compiere/model/I_B_Seller.java b/org.adempiere.base/src/org/compiere/model/I_B_Seller.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_Seller.java
rename to org.adempiere.base/src/org/compiere/model/I_B_Seller.java
diff --git a/base/src/org/compiere/model/I_B_SellerFunds.java b/org.adempiere.base/src/org/compiere/model/I_B_SellerFunds.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_SellerFunds.java
rename to org.adempiere.base/src/org/compiere/model/I_B_SellerFunds.java
diff --git a/base/src/org/compiere/model/I_B_Topic.java b/org.adempiere.base/src/org/compiere/model/I_B_Topic.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_Topic.java
rename to org.adempiere.base/src/org/compiere/model/I_B_Topic.java
diff --git a/base/src/org/compiere/model/I_B_TopicCategory.java b/org.adempiere.base/src/org/compiere/model/I_B_TopicCategory.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_TopicCategory.java
rename to org.adempiere.base/src/org/compiere/model/I_B_TopicCategory.java
diff --git a/base/src/org/compiere/model/I_B_TopicType.java b/org.adempiere.base/src/org/compiere/model/I_B_TopicType.java
similarity index 100%
rename from base/src/org/compiere/model/I_B_TopicType.java
rename to org.adempiere.base/src/org/compiere/model/I_B_TopicType.java
diff --git a/base/src/org/compiere/model/I_CM_AccessContainer.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessContainer.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_AccessContainer.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_AccessContainer.java
diff --git a/base/src/org/compiere/model/I_CM_AccessListBPGroup.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessListBPGroup.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_AccessListBPGroup.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_AccessListBPGroup.java
diff --git a/base/src/org/compiere/model/I_CM_AccessListRole.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessListRole.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_AccessListRole.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_AccessListRole.java
diff --git a/base/src/org/compiere/model/I_CM_AccessMedia.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessMedia.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_AccessMedia.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_AccessMedia.java
diff --git a/base/src/org/compiere/model/I_CM_AccessNewsChannel.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessNewsChannel.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_AccessNewsChannel.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_AccessNewsChannel.java
diff --git a/base/src/org/compiere/model/I_CM_AccessProfile.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessProfile.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_AccessProfile.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_AccessProfile.java
diff --git a/base/src/org/compiere/model/I_CM_AccessStage.java b/org.adempiere.base/src/org/compiere/model/I_CM_AccessStage.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_AccessStage.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_AccessStage.java
diff --git a/base/src/org/compiere/model/I_CM_Ad.java b/org.adempiere.base/src/org/compiere/model/I_CM_Ad.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Ad.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Ad.java
diff --git a/base/src/org/compiere/model/I_CM_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/I_CM_Ad_Cat.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Ad_Cat.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Ad_Cat.java
diff --git a/base/src/org/compiere/model/I_CM_BroadcastServer.java b/org.adempiere.base/src/org/compiere/model/I_CM_BroadcastServer.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_BroadcastServer.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_BroadcastServer.java
diff --git a/base/src/org/compiere/model/I_CM_CStage.java b/org.adempiere.base/src/org/compiere/model/I_CM_CStage.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_CStage.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_CStage.java
diff --git a/base/src/org/compiere/model/I_CM_CStageTTable.java b/org.adempiere.base/src/org/compiere/model/I_CM_CStageTTable.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_CStageTTable.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_CStageTTable.java
diff --git a/base/src/org/compiere/model/I_CM_CStage_Element.java b/org.adempiere.base/src/org/compiere/model/I_CM_CStage_Element.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_CStage_Element.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_CStage_Element.java
diff --git a/base/src/org/compiere/model/I_CM_Chat.java b/org.adempiere.base/src/org/compiere/model/I_CM_Chat.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Chat.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Chat.java
diff --git a/base/src/org/compiere/model/I_CM_ChatEntry.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatEntry.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_ChatEntry.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_ChatEntry.java
diff --git a/base/src/org/compiere/model/I_CM_ChatType.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatType.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_ChatType.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_ChatType.java
diff --git a/base/src/org/compiere/model/I_CM_ChatTypeUpdate.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
diff --git a/base/src/org/compiere/model/I_CM_ChatUpdate.java b/org.adempiere.base/src/org/compiere/model/I_CM_ChatUpdate.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_ChatUpdate.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_ChatUpdate.java
diff --git a/base/src/org/compiere/model/I_CM_Container.java b/org.adempiere.base/src/org/compiere/model/I_CM_Container.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Container.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Container.java
diff --git a/base/src/org/compiere/model/I_CM_ContainerTTable.java b/org.adempiere.base/src/org/compiere/model/I_CM_ContainerTTable.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_ContainerTTable.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_ContainerTTable.java
diff --git a/base/src/org/compiere/model/I_CM_Container_Element.java b/org.adempiere.base/src/org/compiere/model/I_CM_Container_Element.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Container_Element.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Container_Element.java
diff --git a/base/src/org/compiere/model/I_CM_Container_URL.java b/org.adempiere.base/src/org/compiere/model/I_CM_Container_URL.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Container_URL.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Container_URL.java
diff --git a/base/src/org/compiere/model/I_CM_Media.java b/org.adempiere.base/src/org/compiere/model/I_CM_Media.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Media.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Media.java
diff --git a/base/src/org/compiere/model/I_CM_MediaDeploy.java b/org.adempiere.base/src/org/compiere/model/I_CM_MediaDeploy.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_MediaDeploy.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_MediaDeploy.java
diff --git a/base/src/org/compiere/model/I_CM_Media_Server.java b/org.adempiere.base/src/org/compiere/model/I_CM_Media_Server.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Media_Server.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Media_Server.java
diff --git a/base/src/org/compiere/model/I_CM_NewsChannel.java b/org.adempiere.base/src/org/compiere/model/I_CM_NewsChannel.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_NewsChannel.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_NewsChannel.java
diff --git a/base/src/org/compiere/model/I_CM_NewsItem.java b/org.adempiere.base/src/org/compiere/model/I_CM_NewsItem.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_NewsItem.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_NewsItem.java
diff --git a/base/src/org/compiere/model/I_CM_Template.java b/org.adempiere.base/src/org/compiere/model/I_CM_Template.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Template.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Template.java
diff --git a/base/src/org/compiere/model/I_CM_TemplateTable.java b/org.adempiere.base/src/org/compiere/model/I_CM_TemplateTable.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_TemplateTable.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_TemplateTable.java
diff --git a/base/src/org/compiere/model/I_CM_Template_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
diff --git a/base/src/org/compiere/model/I_CM_WebAccessLog.java b/org.adempiere.base/src/org/compiere/model/I_CM_WebAccessLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_WebAccessLog.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_WebAccessLog.java
diff --git a/base/src/org/compiere/model/I_CM_WebProject.java b/org.adempiere.base/src/org/compiere/model/I_CM_WebProject.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_WebProject.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_WebProject.java
diff --git a/base/src/org/compiere/model/I_CM_WebProject_Domain.java b/org.adempiere.base/src/org/compiere/model/I_CM_WebProject_Domain.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_WebProject_Domain.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_WebProject_Domain.java
diff --git a/base/src/org/compiere/model/I_CM_WikiToken.java b/org.adempiere.base/src/org/compiere/model/I_CM_WikiToken.java
similarity index 100%
rename from base/src/org/compiere/model/I_CM_WikiToken.java
rename to org.adempiere.base/src/org/compiere/model/I_CM_WikiToken.java
diff --git a/base/src/org/compiere/model/I_C_AcctProcessor.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AcctProcessor.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AcctProcessor.java
diff --git a/base/src/org/compiere/model/I_C_AcctProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AcctProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AcctProcessorLog.java
diff --git a/base/src/org/compiere/model/I_C_AcctSchema.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AcctSchema.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AcctSchema.java
diff --git a/base/src/org/compiere/model/I_C_AcctSchema_Default.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AcctSchema_Default.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java
diff --git a/base/src/org/compiere/model/I_C_AcctSchema_Element.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Element.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AcctSchema_Element.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Element.java
diff --git a/base/src/org/compiere/model/I_C_AcctSchema_GL.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AcctSchema_GL.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java
diff --git a/base/src/org/compiere/model/I_C_Activity.java b/org.adempiere.base/src/org/compiere/model/I_C_Activity.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Activity.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Activity.java
diff --git a/base/src/org/compiere/model/I_C_AllocationHdr.java b/org.adempiere.base/src/org/compiere/model/I_C_AllocationHdr.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AllocationHdr.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AllocationHdr.java
diff --git a/base/src/org/compiere/model/I_C_AllocationLine.java b/org.adempiere.base/src/org/compiere/model/I_C_AllocationLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_AllocationLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_AllocationLine.java
diff --git a/base/src/org/compiere/model/I_C_BP_BankAccount.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_BankAccount.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_BankAccount.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_BankAccount.java
diff --git a/base/src/org/compiere/model/I_C_BP_Customer_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Customer_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_Customer_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_Customer_Acct.java
diff --git a/base/src/org/compiere/model/I_C_BP_EDI.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_EDI.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_EDI.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_EDI.java
diff --git a/base/src/org/compiere/model/I_C_BP_Employee_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_Employee_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java
diff --git a/base/src/org/compiere/model/I_C_BP_Group.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_Group.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_Group.java
diff --git a/base/src/org/compiere/model/I_C_BP_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_Group_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java
diff --git a/base/src/org/compiere/model/I_C_BP_Relation.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Relation.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_Relation.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_Relation.java
diff --git a/base/src/org/compiere/model/I_C_BP_Vendor_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
diff --git a/base/src/org/compiere/model/I_C_BP_Withholding.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Withholding.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BP_Withholding.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BP_Withholding.java
diff --git a/base/src/org/compiere/model/I_C_BPartner.java b/org.adempiere.base/src/org/compiere/model/I_C_BPartner.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BPartner.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BPartner.java
diff --git a/base/src/org/compiere/model/I_C_BPartner_Location.java b/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Location.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BPartner_Location.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BPartner_Location.java
diff --git a/base/src/org/compiere/model/I_C_BPartner_Product.java b/org.adempiere.base/src/org/compiere/model/I_C_BPartner_Product.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BPartner_Product.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BPartner_Product.java
diff --git a/base/src/org/compiere/model/I_C_Bank.java b/org.adempiere.base/src/org/compiere/model/I_C_Bank.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Bank.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Bank.java
diff --git a/base/src/org/compiere/model/I_C_BankAccount.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BankAccount.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BankAccount.java
diff --git a/base/src/org/compiere/model/I_C_BankAccountDoc.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccountDoc.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BankAccountDoc.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BankAccountDoc.java
diff --git a/base/src/org/compiere/model/I_C_BankAccount_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BankAccount_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java
diff --git a/base/src/org/compiere/model/I_C_BankStatement.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatement.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BankStatement.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BankStatement.java
diff --git a/base/src/org/compiere/model/I_C_BankStatementLine.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BankStatementLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BankStatementLine.java
diff --git a/base/src/org/compiere/model/I_C_BankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementLoader.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BankStatementLoader.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BankStatementLoader.java
diff --git a/base/src/org/compiere/model/I_C_BankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/I_C_BankStatementMatcher.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_BankStatementMatcher.java
rename to org.adempiere.base/src/org/compiere/model/I_C_BankStatementMatcher.java
diff --git a/base/src/org/compiere/model/I_C_Calendar.java b/org.adempiere.base/src/org/compiere/model/I_C_Calendar.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Calendar.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Calendar.java
diff --git a/base/src/org/compiere/model/I_C_Campaign.java b/org.adempiere.base/src/org/compiere/model/I_C_Campaign.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Campaign.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Campaign.java
diff --git a/base/src/org/compiere/model/I_C_Cash.java b/org.adempiere.base/src/org/compiere/model/I_C_Cash.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Cash.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Cash.java
diff --git a/base/src/org/compiere/model/I_C_CashBook.java b/org.adempiere.base/src/org/compiere/model/I_C_CashBook.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CashBook.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CashBook.java
diff --git a/base/src/org/compiere/model/I_C_CashBook_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_CashBook_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CashBook_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CashBook_Acct.java
diff --git a/base/src/org/compiere/model/I_C_CashLine.java b/org.adempiere.base/src/org/compiere/model/I_C_CashLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CashLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CashLine.java
diff --git a/base/src/org/compiere/model/I_C_Channel.java b/org.adempiere.base/src/org/compiere/model/I_C_Channel.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Channel.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Channel.java
diff --git a/base/src/org/compiere/model/I_C_Charge.java b/org.adempiere.base/src/org/compiere/model/I_C_Charge.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Charge.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Charge.java
diff --git a/base/src/org/compiere/model/I_C_ChargeType.java b/org.adempiere.base/src/org/compiere/model/I_C_ChargeType.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ChargeType.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ChargeType.java
diff --git a/base/src/org/compiere/model/I_C_ChargeType_DocType.java b/org.adempiere.base/src/org/compiere/model/I_C_ChargeType_DocType.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ChargeType_DocType.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ChargeType_DocType.java
diff --git a/base/src/org/compiere/model/I_C_Charge_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Charge_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Charge_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Charge_Acct.java
diff --git a/base/src/org/compiere/model/I_C_City.java b/org.adempiere.base/src/org/compiere/model/I_C_City.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_City.java
rename to org.adempiere.base/src/org/compiere/model/I_C_City.java
diff --git a/base/src/org/compiere/model/I_C_Commission.java b/org.adempiere.base/src/org/compiere/model/I_C_Commission.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Commission.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Commission.java
diff --git a/base/src/org/compiere/model/I_C_CommissionAmt.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionAmt.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CommissionAmt.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CommissionAmt.java
diff --git a/base/src/org/compiere/model/I_C_CommissionDetail.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionDetail.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CommissionDetail.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CommissionDetail.java
diff --git a/base/src/org/compiere/model/I_C_CommissionLine.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CommissionLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CommissionLine.java
diff --git a/base/src/org/compiere/model/I_C_CommissionRun.java b/org.adempiere.base/src/org/compiere/model/I_C_CommissionRun.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CommissionRun.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CommissionRun.java
diff --git a/base/src/org/compiere/model/I_C_ConversionType.java b/org.adempiere.base/src/org/compiere/model/I_C_ConversionType.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ConversionType.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ConversionType.java
diff --git a/base/src/org/compiere/model/I_C_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/I_C_Conversion_Rate.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Conversion_Rate.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Conversion_Rate.java
diff --git a/base/src/org/compiere/model/I_C_Country.java b/org.adempiere.base/src/org/compiere/model/I_C_Country.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Country.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Country.java
diff --git a/base/src/org/compiere/model/I_C_Currency.java b/org.adempiere.base/src/org/compiere/model/I_C_Currency.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Currency.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Currency.java
diff --git a/base/src/org/compiere/model/I_C_Currency_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Currency_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java
diff --git a/base/src/org/compiere/model/I_C_Cycle.java b/org.adempiere.base/src/org/compiere/model/I_C_Cycle.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Cycle.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Cycle.java
diff --git a/base/src/org/compiere/model/I_C_CyclePhase.java b/org.adempiere.base/src/org/compiere/model/I_C_CyclePhase.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CyclePhase.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CyclePhase.java
diff --git a/base/src/org/compiere/model/I_C_CycleStep.java b/org.adempiere.base/src/org/compiere/model/I_C_CycleStep.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_CycleStep.java
rename to org.adempiere.base/src/org/compiere/model/I_C_CycleStep.java
diff --git a/base/src/org/compiere/model/I_C_DocType.java b/org.adempiere.base/src/org/compiere/model/I_C_DocType.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_DocType.java
rename to org.adempiere.base/src/org/compiere/model/I_C_DocType.java
diff --git a/base/src/org/compiere/model/I_C_DocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/I_C_DocTypeCounter.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_DocTypeCounter.java
rename to org.adempiere.base/src/org/compiere/model/I_C_DocTypeCounter.java
diff --git a/base/src/org/compiere/model/I_C_Dunning.java b/org.adempiere.base/src/org/compiere/model/I_C_Dunning.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Dunning.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Dunning.java
diff --git a/base/src/org/compiere/model/I_C_DunningLevel.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningLevel.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_DunningLevel.java
rename to org.adempiere.base/src/org/compiere/model/I_C_DunningLevel.java
diff --git a/base/src/org/compiere/model/I_C_DunningRun.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningRun.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_DunningRun.java
rename to org.adempiere.base/src/org/compiere/model/I_C_DunningRun.java
diff --git a/base/src/org/compiere/model/I_C_DunningRunEntry.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningRunEntry.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_DunningRunEntry.java
rename to org.adempiere.base/src/org/compiere/model/I_C_DunningRunEntry.java
diff --git a/base/src/org/compiere/model/I_C_DunningRunLine.java b/org.adempiere.base/src/org/compiere/model/I_C_DunningRunLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_DunningRunLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_DunningRunLine.java
diff --git a/base/src/org/compiere/model/I_C_Element.java b/org.adempiere.base/src/org/compiere/model/I_C_Element.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Element.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Element.java
diff --git a/base/src/org/compiere/model/I_C_ElementValue.java b/org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ElementValue.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ElementValue.java
diff --git a/base/src/org/compiere/model/I_C_Greeting.java b/org.adempiere.base/src/org/compiere/model/I_C_Greeting.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Greeting.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Greeting.java
diff --git a/base/src/org/compiere/model/I_C_InterOrg_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_InterOrg_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_InterOrg_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_InterOrg_Acct.java
diff --git a/base/src/org/compiere/model/I_C_Invoice.java b/org.adempiere.base/src/org/compiere/model/I_C_Invoice.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Invoice.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Invoice.java
diff --git a/base/src/org/compiere/model/I_C_InvoiceBatch.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatch.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_InvoiceBatch.java
rename to org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatch.java
diff --git a/base/src/org/compiere/model/I_C_InvoiceBatchLine.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatchLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_InvoiceBatchLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_InvoiceBatchLine.java
diff --git a/base/src/org/compiere/model/I_C_InvoiceLine.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_InvoiceLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_InvoiceLine.java
diff --git a/base/src/org/compiere/model/I_C_InvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoicePaySchedule.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_InvoicePaySchedule.java
rename to org.adempiere.base/src/org/compiere/model/I_C_InvoicePaySchedule.java
diff --git a/base/src/org/compiere/model/I_C_InvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceSchedule.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_InvoiceSchedule.java
rename to org.adempiere.base/src/org/compiere/model/I_C_InvoiceSchedule.java
diff --git a/base/src/org/compiere/model/I_C_InvoiceTax.java b/org.adempiere.base/src/org/compiere/model/I_C_InvoiceTax.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_InvoiceTax.java
rename to org.adempiere.base/src/org/compiere/model/I_C_InvoiceTax.java
diff --git a/base/src/org/compiere/model/I_C_Job.java b/org.adempiere.base/src/org/compiere/model/I_C_Job.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Job.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Job.java
diff --git a/base/src/org/compiere/model/I_C_JobAssignment.java b/org.adempiere.base/src/org/compiere/model/I_C_JobAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_JobAssignment.java
rename to org.adempiere.base/src/org/compiere/model/I_C_JobAssignment.java
diff --git a/base/src/org/compiere/model/I_C_JobCategory.java b/org.adempiere.base/src/org/compiere/model/I_C_JobCategory.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_JobCategory.java
rename to org.adempiere.base/src/org/compiere/model/I_C_JobCategory.java
diff --git a/base/src/org/compiere/model/I_C_JobRemuneration.java b/org.adempiere.base/src/org/compiere/model/I_C_JobRemuneration.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_JobRemuneration.java
rename to org.adempiere.base/src/org/compiere/model/I_C_JobRemuneration.java
diff --git a/base/src/org/compiere/model/I_C_LandedCost.java b/org.adempiere.base/src/org/compiere/model/I_C_LandedCost.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_LandedCost.java
rename to org.adempiere.base/src/org/compiere/model/I_C_LandedCost.java
diff --git a/base/src/org/compiere/model/I_C_LandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/I_C_LandedCostAllocation.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_LandedCostAllocation.java
rename to org.adempiere.base/src/org/compiere/model/I_C_LandedCostAllocation.java
diff --git a/base/src/org/compiere/model/I_C_Location.java b/org.adempiere.base/src/org/compiere/model/I_C_Location.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Location.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Location.java
diff --git a/base/src/org/compiere/model/I_C_NonBusinessDay.java b/org.adempiere.base/src/org/compiere/model/I_C_NonBusinessDay.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_NonBusinessDay.java
rename to org.adempiere.base/src/org/compiere/model/I_C_NonBusinessDay.java
diff --git a/base/src/org/compiere/model/I_C_Order.java b/org.adempiere.base/src/org/compiere/model/I_C_Order.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Order.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Order.java
diff --git a/base/src/org/compiere/model/I_C_OrderLine.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_OrderLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_OrderLine.java
diff --git a/base/src/org/compiere/model/I_C_OrderSource.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderSource.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_OrderSource.java
rename to org.adempiere.base/src/org/compiere/model/I_C_OrderSource.java
diff --git a/base/src/org/compiere/model/I_C_OrderTax.java b/org.adempiere.base/src/org/compiere/model/I_C_OrderTax.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_OrderTax.java
rename to org.adempiere.base/src/org/compiere/model/I_C_OrderTax.java
diff --git a/base/src/org/compiere/model/I_C_OrgAssignment.java b/org.adempiere.base/src/org/compiere/model/I_C_OrgAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_OrgAssignment.java
rename to org.adempiere.base/src/org/compiere/model/I_C_OrgAssignment.java
diff --git a/base/src/org/compiere/model/I_C_POS.java b/org.adempiere.base/src/org/compiere/model/I_C_POS.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_POS.java
rename to org.adempiere.base/src/org/compiere/model/I_C_POS.java
diff --git a/base/src/org/compiere/model/I_C_POSKey.java b/org.adempiere.base/src/org/compiere/model/I_C_POSKey.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_POSKey.java
rename to org.adempiere.base/src/org/compiere/model/I_C_POSKey.java
diff --git a/base/src/org/compiere/model/I_C_POSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/I_C_POSKeyLayout.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_POSKeyLayout.java
rename to org.adempiere.base/src/org/compiere/model/I_C_POSKeyLayout.java
diff --git a/base/src/org/compiere/model/I_C_PaySchedule.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySchedule.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaySchedule.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaySchedule.java
diff --git a/base/src/org/compiere/model/I_C_PaySelection.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySelection.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaySelection.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaySelection.java
diff --git a/base/src/org/compiere/model/I_C_PaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionCheck.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaySelectionCheck.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaySelectionCheck.java
diff --git a/base/src/org/compiere/model/I_C_PaySelectionLine.java b/org.adempiere.base/src/org/compiere/model/I_C_PaySelectionLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaySelectionLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaySelectionLine.java
diff --git a/base/src/org/compiere/model/I_C_Payment.java b/org.adempiere.base/src/org/compiere/model/I_C_Payment.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Payment.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Payment.java
diff --git a/base/src/org/compiere/model/I_C_PaymentAllocate.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentAllocate.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaymentAllocate.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaymentAllocate.java
diff --git a/base/src/org/compiere/model/I_C_PaymentBatch.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentBatch.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaymentBatch.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaymentBatch.java
diff --git a/base/src/org/compiere/model/I_C_PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaymentProcessor.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaymentProcessor.java
diff --git a/base/src/org/compiere/model/I_C_PaymentTerm.java b/org.adempiere.base/src/org/compiere/model/I_C_PaymentTerm.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PaymentTerm.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PaymentTerm.java
diff --git a/base/src/org/compiere/model/I_C_Period.java b/org.adempiere.base/src/org/compiere/model/I_C_Period.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Period.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Period.java
diff --git a/base/src/org/compiere/model/I_C_PeriodControl.java b/org.adempiere.base/src/org/compiere/model/I_C_PeriodControl.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_PeriodControl.java
rename to org.adempiere.base/src/org/compiere/model/I_C_PeriodControl.java
diff --git a/base/src/org/compiere/model/I_C_Phase.java b/org.adempiere.base/src/org/compiere/model/I_C_Phase.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Phase.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Phase.java
diff --git a/base/src/org/compiere/model/I_C_Project.java b/org.adempiere.base/src/org/compiere/model/I_C_Project.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Project.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Project.java
diff --git a/base/src/org/compiere/model/I_C_ProjectIssue.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssue.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ProjectIssue.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ProjectIssue.java
diff --git a/base/src/org/compiere/model/I_C_ProjectIssueMA.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectIssueMA.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ProjectIssueMA.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ProjectIssueMA.java
diff --git a/base/src/org/compiere/model/I_C_ProjectLine.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ProjectLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ProjectLine.java
diff --git a/base/src/org/compiere/model/I_C_ProjectPhase.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectPhase.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ProjectPhase.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ProjectPhase.java
diff --git a/base/src/org/compiere/model/I_C_ProjectTask.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectTask.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ProjectTask.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ProjectTask.java
diff --git a/base/src/org/compiere/model/I_C_ProjectType.java b/org.adempiere.base/src/org/compiere/model/I_C_ProjectType.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ProjectType.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ProjectType.java
diff --git a/base/src/org/compiere/model/I_C_Project_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Project_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Project_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Project_Acct.java
diff --git a/base/src/org/compiere/model/I_C_Recurring.java b/org.adempiere.base/src/org/compiere/model/I_C_Recurring.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Recurring.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Recurring.java
diff --git a/base/src/org/compiere/model/I_C_Recurring_Run.java b/org.adempiere.base/src/org/compiere/model/I_C_Recurring_Run.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Recurring_Run.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Recurring_Run.java
diff --git a/base/src/org/compiere/model/I_C_Region.java b/org.adempiere.base/src/org/compiere/model/I_C_Region.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Region.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Region.java
diff --git a/base/src/org/compiere/model/I_C_Remuneration.java b/org.adempiere.base/src/org/compiere/model/I_C_Remuneration.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Remuneration.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Remuneration.java
diff --git a/base/src/org/compiere/model/I_C_RevenueRecognition.java b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RevenueRecognition.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition.java
diff --git a/base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
diff --git a/base/src/org/compiere/model/I_C_RevenueRecognition_Run.java b/org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
diff --git a/base/src/org/compiere/model/I_C_RfQ.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQ.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQ.java
diff --git a/base/src/org/compiere/model/I_C_RfQLine.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQLine.java
diff --git a/base/src/org/compiere/model/I_C_RfQLineQty.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQLineQty.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQLineQty.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQLineQty.java
diff --git a/base/src/org/compiere/model/I_C_RfQResponse.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponse.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQResponse.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQResponse.java
diff --git a/base/src/org/compiere/model/I_C_RfQResponseLine.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQResponseLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLine.java
diff --git a/base/src/org/compiere/model/I_C_RfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLineQty.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQResponseLineQty.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQResponseLineQty.java
diff --git a/base/src/org/compiere/model/I_C_RfQ_Topic.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_Topic.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQ_Topic.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQ_Topic.java
diff --git a/base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
diff --git a/base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java b/org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
rename to org.adempiere.base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
diff --git a/base/src/org/compiere/model/I_C_SalesRegion.java b/org.adempiere.base/src/org/compiere/model/I_C_SalesRegion.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_SalesRegion.java
rename to org.adempiere.base/src/org/compiere/model/I_C_SalesRegion.java
diff --git a/base/src/org/compiere/model/I_C_ServiceLevel.java b/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevel.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ServiceLevel.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ServiceLevel.java
diff --git a/base/src/org/compiere/model/I_C_ServiceLevelLine.java b/org.adempiere.base/src/org/compiere/model/I_C_ServiceLevelLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ServiceLevelLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ServiceLevelLine.java
diff --git a/base/src/org/compiere/model/I_C_SubAcct.java b/org.adempiere.base/src/org/compiere/model/I_C_SubAcct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_SubAcct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_SubAcct.java
diff --git a/base/src/org/compiere/model/I_C_Subscription.java b/org.adempiere.base/src/org/compiere/model/I_C_Subscription.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Subscription.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Subscription.java
diff --git a/base/src/org/compiere/model/I_C_SubscriptionType.java b/org.adempiere.base/src/org/compiere/model/I_C_SubscriptionType.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_SubscriptionType.java
rename to org.adempiere.base/src/org/compiere/model/I_C_SubscriptionType.java
diff --git a/base/src/org/compiere/model/I_C_Subscription_Delivery.java b/org.adempiere.base/src/org/compiere/model/I_C_Subscription_Delivery.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Subscription_Delivery.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Subscription_Delivery.java
diff --git a/base/src/org/compiere/model/I_C_Task.java b/org.adempiere.base/src/org/compiere/model/I_C_Task.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Task.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Task.java
diff --git a/base/src/org/compiere/model/I_C_Tax.java b/org.adempiere.base/src/org/compiere/model/I_C_Tax.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Tax.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Tax.java
diff --git a/base/src/org/compiere/model/I_C_TaxCategory.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxCategory.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_TaxCategory.java
rename to org.adempiere.base/src/org/compiere/model/I_C_TaxCategory.java
diff --git a/base/src/org/compiere/model/I_C_TaxDeclaration.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclaration.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_TaxDeclaration.java
rename to org.adempiere.base/src/org/compiere/model/I_C_TaxDeclaration.java
diff --git a/base/src/org/compiere/model/I_C_TaxDeclarationAcct.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
diff --git a/base/src/org/compiere/model/I_C_TaxDeclarationLine.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_TaxDeclarationLine.java
rename to org.adempiere.base/src/org/compiere/model/I_C_TaxDeclarationLine.java
diff --git a/base/src/org/compiere/model/I_C_TaxPostal.java b/org.adempiere.base/src/org/compiere/model/I_C_TaxPostal.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_TaxPostal.java
rename to org.adempiere.base/src/org/compiere/model/I_C_TaxPostal.java
diff --git a/base/src/org/compiere/model/I_C_Tax_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Tax_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java
diff --git a/base/src/org/compiere/model/I_C_UOM.java b/org.adempiere.base/src/org/compiere/model/I_C_UOM.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_UOM.java
rename to org.adempiere.base/src/org/compiere/model/I_C_UOM.java
diff --git a/base/src/org/compiere/model/I_C_UOM_Conversion.java b/org.adempiere.base/src/org/compiere/model/I_C_UOM_Conversion.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_UOM_Conversion.java
rename to org.adempiere.base/src/org/compiere/model/I_C_UOM_Conversion.java
diff --git a/base/src/org/compiere/model/I_C_UserRemuneration.java b/org.adempiere.base/src/org/compiere/model/I_C_UserRemuneration.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_UserRemuneration.java
rename to org.adempiere.base/src/org/compiere/model/I_C_UserRemuneration.java
diff --git a/base/src/org/compiere/model/I_C_ValidCombination.java b/org.adempiere.base/src/org/compiere/model/I_C_ValidCombination.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_ValidCombination.java
rename to org.adempiere.base/src/org/compiere/model/I_C_ValidCombination.java
diff --git a/base/src/org/compiere/model/I_C_Withholding.java b/org.adempiere.base/src/org/compiere/model/I_C_Withholding.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Withholding.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Withholding.java
diff --git a/base/src/org/compiere/model/I_C_Withholding_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Withholding_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Withholding_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Withholding_Acct.java
diff --git a/base/src/org/compiere/model/I_C_Year.java b/org.adempiere.base/src/org/compiere/model/I_C_Year.java
similarity index 100%
rename from base/src/org/compiere/model/I_C_Year.java
rename to org.adempiere.base/src/org/compiere/model/I_C_Year.java
diff --git a/base/src/org/compiere/model/I_EXP_Format.java b/org.adempiere.base/src/org/compiere/model/I_EXP_Format.java
similarity index 100%
rename from base/src/org/compiere/model/I_EXP_Format.java
rename to org.adempiere.base/src/org/compiere/model/I_EXP_Format.java
diff --git a/base/src/org/compiere/model/I_EXP_FormatLine.java b/org.adempiere.base/src/org/compiere/model/I_EXP_FormatLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_EXP_FormatLine.java
rename to org.adempiere.base/src/org/compiere/model/I_EXP_FormatLine.java
diff --git a/base/src/org/compiere/model/I_EXP_Processor.java b/org.adempiere.base/src/org/compiere/model/I_EXP_Processor.java
similarity index 100%
rename from base/src/org/compiere/model/I_EXP_Processor.java
rename to org.adempiere.base/src/org/compiere/model/I_EXP_Processor.java
diff --git a/base/src/org/compiere/model/I_EXP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/I_EXP_ProcessorParameter.java
similarity index 100%
rename from base/src/org/compiere/model/I_EXP_ProcessorParameter.java
rename to org.adempiere.base/src/org/compiere/model/I_EXP_ProcessorParameter.java
diff --git a/base/src/org/compiere/model/I_EXP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/I_EXP_Processor_Type.java
similarity index 100%
rename from base/src/org/compiere/model/I_EXP_Processor_Type.java
rename to org.adempiere.base/src/org/compiere/model/I_EXP_Processor_Type.java
diff --git a/base/src/org/compiere/model/I_Fact_Acct.java b/org.adempiere.base/src/org/compiere/model/I_Fact_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_Fact_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_Fact_Acct.java
diff --git a/base/src/org/compiere/model/I_Fact_Acct_Summary.java b/org.adempiere.base/src/org/compiere/model/I_Fact_Acct_Summary.java
similarity index 100%
rename from base/src/org/compiere/model/I_Fact_Acct_Summary.java
rename to org.adempiere.base/src/org/compiere/model/I_Fact_Acct_Summary.java
diff --git a/base/src/org/compiere/model/I_GL_Budget.java b/org.adempiere.base/src/org/compiere/model/I_GL_Budget.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_Budget.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_Budget.java
diff --git a/base/src/org/compiere/model/I_GL_BudgetControl.java b/org.adempiere.base/src/org/compiere/model/I_GL_BudgetControl.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_BudgetControl.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_BudgetControl.java
diff --git a/base/src/org/compiere/model/I_GL_Category.java b/org.adempiere.base/src/org/compiere/model/I_GL_Category.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_Category.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_Category.java
diff --git a/base/src/org/compiere/model/I_GL_Distribution.java b/org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_Distribution.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_Distribution.java
diff --git a/base/src/org/compiere/model/I_GL_DistributionLine.java b/org.adempiere.base/src/org/compiere/model/I_GL_DistributionLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_DistributionLine.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_DistributionLine.java
diff --git a/base/src/org/compiere/model/I_GL_Fund.java b/org.adempiere.base/src/org/compiere/model/I_GL_Fund.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_Fund.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_Fund.java
diff --git a/base/src/org/compiere/model/I_GL_FundRestriction.java b/org.adempiere.base/src/org/compiere/model/I_GL_FundRestriction.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_FundRestriction.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_FundRestriction.java
diff --git a/base/src/org/compiere/model/I_GL_Journal.java b/org.adempiere.base/src/org/compiere/model/I_GL_Journal.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_Journal.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_Journal.java
diff --git a/base/src/org/compiere/model/I_GL_JournalBatch.java b/org.adempiere.base/src/org/compiere/model/I_GL_JournalBatch.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_JournalBatch.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_JournalBatch.java
diff --git a/base/src/org/compiere/model/I_GL_JournalLine.java b/org.adempiere.base/src/org/compiere/model/I_GL_JournalLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_GL_JournalLine.java
rename to org.adempiere.base/src/org/compiere/model/I_GL_JournalLine.java
diff --git a/base/src/org/compiere/model/I_IMP_Processor.java b/org.adempiere.base/src/org/compiere/model/I_IMP_Processor.java
similarity index 100%
rename from base/src/org/compiere/model/I_IMP_Processor.java
rename to org.adempiere.base/src/org/compiere/model/I_IMP_Processor.java
diff --git a/base/src/org/compiere/model/I_IMP_ProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_IMP_ProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorLog.java
diff --git a/base/src/org/compiere/model/I_IMP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorParameter.java
similarity index 100%
rename from base/src/org/compiere/model/I_IMP_ProcessorParameter.java
rename to org.adempiere.base/src/org/compiere/model/I_IMP_ProcessorParameter.java
diff --git a/base/src/org/compiere/model/I_IMP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/I_IMP_Processor_Type.java
similarity index 100%
rename from base/src/org/compiere/model/I_IMP_Processor_Type.java
rename to org.adempiere.base/src/org/compiere/model/I_IMP_Processor_Type.java
diff --git a/base/src/org/compiere/model/I_I_Asset.java b/org.adempiere.base/src/org/compiere/model/I_I_Asset.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_Asset.java
rename to org.adempiere.base/src/org/compiere/model/I_I_Asset.java
diff --git a/base/src/org/compiere/model/I_I_BPartner.java b/org.adempiere.base/src/org/compiere/model/I_I_BPartner.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_BPartner.java
rename to org.adempiere.base/src/org/compiere/model/I_I_BPartner.java
diff --git a/base/src/org/compiere/model/I_I_BankStatement.java b/org.adempiere.base/src/org/compiere/model/I_I_BankStatement.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_BankStatement.java
rename to org.adempiere.base/src/org/compiere/model/I_I_BankStatement.java
diff --git a/base/src/org/compiere/model/I_I_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/I_I_Conversion_Rate.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_Conversion_Rate.java
rename to org.adempiere.base/src/org/compiere/model/I_I_Conversion_Rate.java
diff --git a/base/src/org/compiere/model/I_I_ElementValue.java b/org.adempiere.base/src/org/compiere/model/I_I_ElementValue.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_ElementValue.java
rename to org.adempiere.base/src/org/compiere/model/I_I_ElementValue.java
diff --git a/base/src/org/compiere/model/I_I_FAJournal.java b/org.adempiere.base/src/org/compiere/model/I_I_FAJournal.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_FAJournal.java
rename to org.adempiere.base/src/org/compiere/model/I_I_FAJournal.java
diff --git a/base/src/org/compiere/model/I_I_GLJournal.java b/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_GLJournal.java
rename to org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
diff --git a/base/src/org/compiere/model/I_I_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/I_I_InOutLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_InOutLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/I_I_InOutLineConfirm.java
diff --git a/base/src/org/compiere/model/I_I_Inventory.java b/org.adempiere.base/src/org/compiere/model/I_I_Inventory.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_Inventory.java
rename to org.adempiere.base/src/org/compiere/model/I_I_Inventory.java
diff --git a/base/src/org/compiere/model/I_I_Invoice.java b/org.adempiere.base/src/org/compiere/model/I_I_Invoice.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_Invoice.java
rename to org.adempiere.base/src/org/compiere/model/I_I_Invoice.java
diff --git a/base/src/org/compiere/model/I_I_Order.java b/org.adempiere.base/src/org/compiere/model/I_I_Order.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_Order.java
rename to org.adempiere.base/src/org/compiere/model/I_I_Order.java
diff --git a/base/src/org/compiere/model/I_I_Payment.java b/org.adempiere.base/src/org/compiere/model/I_I_Payment.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_Payment.java
rename to org.adempiere.base/src/org/compiere/model/I_I_Payment.java
diff --git a/base/src/org/compiere/model/I_I_PriceList.java b/org.adempiere.base/src/org/compiere/model/I_I_PriceList.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_PriceList.java
rename to org.adempiere.base/src/org/compiere/model/I_I_PriceList.java
diff --git a/base/src/org/compiere/model/I_I_Product.java b/org.adempiere.base/src/org/compiere/model/I_I_Product.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_Product.java
rename to org.adempiere.base/src/org/compiere/model/I_I_Product.java
diff --git a/base/src/org/compiere/model/I_I_ReportLine.java b/org.adempiere.base/src/org/compiere/model/I_I_ReportLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_I_ReportLine.java
rename to org.adempiere.base/src/org/compiere/model/I_I_ReportLine.java
diff --git a/base/src/org/compiere/model/I_K_Category.java b/org.adempiere.base/src/org/compiere/model/I_K_Category.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Category.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Category.java
diff --git a/base/src/org/compiere/model/I_K_CategoryValue.java b/org.adempiere.base/src/org/compiere/model/I_K_CategoryValue.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_CategoryValue.java
rename to org.adempiere.base/src/org/compiere/model/I_K_CategoryValue.java
diff --git a/base/src/org/compiere/model/I_K_Comment.java b/org.adempiere.base/src/org/compiere/model/I_K_Comment.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Comment.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Comment.java
diff --git a/base/src/org/compiere/model/I_K_Entry.java b/org.adempiere.base/src/org/compiere/model/I_K_Entry.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Entry.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Entry.java
diff --git a/base/src/org/compiere/model/I_K_EntryCategory.java b/org.adempiere.base/src/org/compiere/model/I_K_EntryCategory.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_EntryCategory.java
rename to org.adempiere.base/src/org/compiere/model/I_K_EntryCategory.java
diff --git a/base/src/org/compiere/model/I_K_EntryRelated.java b/org.adempiere.base/src/org/compiere/model/I_K_EntryRelated.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_EntryRelated.java
rename to org.adempiere.base/src/org/compiere/model/I_K_EntryRelated.java
diff --git a/base/src/org/compiere/model/I_K_Index.java b/org.adempiere.base/src/org/compiere/model/I_K_Index.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Index.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Index.java
diff --git a/base/src/org/compiere/model/I_K_IndexLog.java b/org.adempiere.base/src/org/compiere/model/I_K_IndexLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_IndexLog.java
rename to org.adempiere.base/src/org/compiere/model/I_K_IndexLog.java
diff --git a/base/src/org/compiere/model/I_K_IndexStop.java b/org.adempiere.base/src/org/compiere/model/I_K_IndexStop.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_IndexStop.java
rename to org.adempiere.base/src/org/compiere/model/I_K_IndexStop.java
diff --git a/base/src/org/compiere/model/I_K_Source.java b/org.adempiere.base/src/org/compiere/model/I_K_Source.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Source.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Source.java
diff --git a/base/src/org/compiere/model/I_K_Synonym.java b/org.adempiere.base/src/org/compiere/model/I_K_Synonym.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Synonym.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Synonym.java
diff --git a/base/src/org/compiere/model/I_K_Topic.java b/org.adempiere.base/src/org/compiere/model/I_K_Topic.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Topic.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Topic.java
diff --git a/base/src/org/compiere/model/I_K_Type.java b/org.adempiere.base/src/org/compiere/model/I_K_Type.java
similarity index 100%
rename from base/src/org/compiere/model/I_K_Type.java
rename to org.adempiere.base/src/org/compiere/model/I_K_Type.java
diff --git a/base/src/org/compiere/model/I_M_Attribute.java b/org.adempiere.base/src/org/compiere/model/I_M_Attribute.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Attribute.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Attribute.java
diff --git a/base/src/org/compiere/model/I_M_AttributeInstance.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeInstance.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_AttributeInstance.java
rename to org.adempiere.base/src/org/compiere/model/I_M_AttributeInstance.java
diff --git a/base/src/org/compiere/model/I_M_AttributeSearch.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSearch.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_AttributeSearch.java
rename to org.adempiere.base/src/org/compiere/model/I_M_AttributeSearch.java
diff --git a/base/src/org/compiere/model/I_M_AttributeSet.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSet.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_AttributeSet.java
rename to org.adempiere.base/src/org/compiere/model/I_M_AttributeSet.java
diff --git a/base/src/org/compiere/model/I_M_AttributeSetExclude.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetExclude.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_AttributeSetExclude.java
rename to org.adempiere.base/src/org/compiere/model/I_M_AttributeSetExclude.java
diff --git a/base/src/org/compiere/model/I_M_AttributeSetInstance.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeSetInstance.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_AttributeSetInstance.java
rename to org.adempiere.base/src/org/compiere/model/I_M_AttributeSetInstance.java
diff --git a/base/src/org/compiere/model/I_M_AttributeUse.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeUse.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_AttributeUse.java
rename to org.adempiere.base/src/org/compiere/model/I_M_AttributeUse.java
diff --git a/base/src/org/compiere/model/I_M_AttributeValue.java b/org.adempiere.base/src/org/compiere/model/I_M_AttributeValue.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_AttributeValue.java
rename to org.adempiere.base/src/org/compiere/model/I_M_AttributeValue.java
diff --git a/base/src/org/compiere/model/I_M_BOM.java b/org.adempiere.base/src/org/compiere/model/I_M_BOM.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_BOM.java
rename to org.adempiere.base/src/org/compiere/model/I_M_BOM.java
diff --git a/base/src/org/compiere/model/I_M_BOMAlternative.java b/org.adempiere.base/src/org/compiere/model/I_M_BOMAlternative.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_BOMAlternative.java
rename to org.adempiere.base/src/org/compiere/model/I_M_BOMAlternative.java
diff --git a/base/src/org/compiere/model/I_M_BOMProduct.java b/org.adempiere.base/src/org/compiere/model/I_M_BOMProduct.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_BOMProduct.java
rename to org.adempiere.base/src/org/compiere/model/I_M_BOMProduct.java
diff --git a/base/src/org/compiere/model/I_M_ChangeNotice.java b/org.adempiere.base/src/org/compiere/model/I_M_ChangeNotice.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ChangeNotice.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ChangeNotice.java
diff --git a/base/src/org/compiere/model/I_M_ChangeRequest.java b/org.adempiere.base/src/org/compiere/model/I_M_ChangeRequest.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ChangeRequest.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ChangeRequest.java
diff --git a/base/src/org/compiere/model/I_M_Cost.java b/org.adempiere.base/src/org/compiere/model/I_M_Cost.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Cost.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Cost.java
diff --git a/base/src/org/compiere/model/I_M_CostDetail.java b/org.adempiere.base/src/org/compiere/model/I_M_CostDetail.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_CostDetail.java
rename to org.adempiere.base/src/org/compiere/model/I_M_CostDetail.java
diff --git a/base/src/org/compiere/model/I_M_CostElement.java b/org.adempiere.base/src/org/compiere/model/I_M_CostElement.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_CostElement.java
rename to org.adempiere.base/src/org/compiere/model/I_M_CostElement.java
diff --git a/base/src/org/compiere/model/I_M_CostQueue.java b/org.adempiere.base/src/org/compiere/model/I_M_CostQueue.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_CostQueue.java
rename to org.adempiere.base/src/org/compiere/model/I_M_CostQueue.java
diff --git a/base/src/org/compiere/model/I_M_CostType.java b/org.adempiere.base/src/org/compiere/model/I_M_CostType.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_CostType.java
rename to org.adempiere.base/src/org/compiere/model/I_M_CostType.java
diff --git a/base/src/org/compiere/model/I_M_Demand.java b/org.adempiere.base/src/org/compiere/model/I_M_Demand.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Demand.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Demand.java
diff --git a/base/src/org/compiere/model/I_M_DemandDetail.java b/org.adempiere.base/src/org/compiere/model/I_M_DemandDetail.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DemandDetail.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DemandDetail.java
diff --git a/base/src/org/compiere/model/I_M_DemandLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DemandLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DemandLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DemandLine.java
diff --git a/base/src/org/compiere/model/I_M_DiscountSchema.java b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchema.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DiscountSchema.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DiscountSchema.java
diff --git a/base/src/org/compiere/model/I_M_DiscountSchemaBreak.java b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
diff --git a/base/src/org/compiere/model/I_M_DiscountSchemaLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DiscountSchemaLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaLine.java
diff --git a/base/src/org/compiere/model/I_M_DistributionList.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionList.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DistributionList.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DistributionList.java
diff --git a/base/src/org/compiere/model/I_M_DistributionListLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionListLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DistributionListLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DistributionListLine.java
diff --git a/base/src/org/compiere/model/I_M_DistributionRun.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionRun.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DistributionRun.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DistributionRun.java
diff --git a/base/src/org/compiere/model/I_M_DistributionRunLine.java b/org.adempiere.base/src/org/compiere/model/I_M_DistributionRunLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_DistributionRunLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_DistributionRunLine.java
diff --git a/base/src/org/compiere/model/I_M_Forecast.java b/org.adempiere.base/src/org/compiere/model/I_M_Forecast.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Forecast.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Forecast.java
diff --git a/base/src/org/compiere/model/I_M_ForecastLine.java b/org.adempiere.base/src/org/compiere/model/I_M_ForecastLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ForecastLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ForecastLine.java
diff --git a/base/src/org/compiere/model/I_M_Freight.java b/org.adempiere.base/src/org/compiere/model/I_M_Freight.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Freight.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Freight.java
diff --git a/base/src/org/compiere/model/I_M_FreightCategory.java b/org.adempiere.base/src/org/compiere/model/I_M_FreightCategory.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_FreightCategory.java
rename to org.adempiere.base/src/org/compiere/model/I_M_FreightCategory.java
diff --git a/base/src/org/compiere/model/I_M_InOut.java b/org.adempiere.base/src/org/compiere/model/I_M_InOut.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_InOut.java
rename to org.adempiere.base/src/org/compiere/model/I_M_InOut.java
diff --git a/base/src/org/compiere/model/I_M_InOutConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_InOutConfirm.java
rename to org.adempiere.base/src/org/compiere/model/I_M_InOutConfirm.java
diff --git a/base/src/org/compiere/model/I_M_InOutLine.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_InOutLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_InOutLine.java
diff --git a/base/src/org/compiere/model/I_M_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_InOutLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/I_M_InOutLineConfirm.java
diff --git a/base/src/org/compiere/model/I_M_InOutLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_InOutLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_InOutLineMA.java
rename to org.adempiere.base/src/org/compiere/model/I_M_InOutLineMA.java
diff --git a/base/src/org/compiere/model/I_M_Inventory.java b/org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Inventory.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Inventory.java
diff --git a/base/src/org/compiere/model/I_M_InventoryLine.java b/org.adempiere.base/src/org/compiere/model/I_M_InventoryLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_InventoryLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_InventoryLine.java
diff --git a/base/src/org/compiere/model/I_M_InventoryLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_InventoryLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_InventoryLineMA.java
rename to org.adempiere.base/src/org/compiere/model/I_M_InventoryLineMA.java
diff --git a/base/src/org/compiere/model/I_M_Locator.java b/org.adempiere.base/src/org/compiere/model/I_M_Locator.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Locator.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Locator.java
diff --git a/base/src/org/compiere/model/I_M_Lot.java b/org.adempiere.base/src/org/compiere/model/I_M_Lot.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Lot.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Lot.java
diff --git a/base/src/org/compiere/model/I_M_LotCtl.java b/org.adempiere.base/src/org/compiere/model/I_M_LotCtl.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_LotCtl.java
rename to org.adempiere.base/src/org/compiere/model/I_M_LotCtl.java
diff --git a/base/src/org/compiere/model/I_M_LotCtlExclude.java b/org.adempiere.base/src/org/compiere/model/I_M_LotCtlExclude.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_LotCtlExclude.java
rename to org.adempiere.base/src/org/compiere/model/I_M_LotCtlExclude.java
diff --git a/base/src/org/compiere/model/I_M_MatchInv.java b/org.adempiere.base/src/org/compiere/model/I_M_MatchInv.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_MatchInv.java
rename to org.adempiere.base/src/org/compiere/model/I_M_MatchInv.java
diff --git a/base/src/org/compiere/model/I_M_MatchPO.java b/org.adempiere.base/src/org/compiere/model/I_M_MatchPO.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_MatchPO.java
rename to org.adempiere.base/src/org/compiere/model/I_M_MatchPO.java
diff --git a/base/src/org/compiere/model/I_M_Movement.java b/org.adempiere.base/src/org/compiere/model/I_M_Movement.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Movement.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Movement.java
diff --git a/base/src/org/compiere/model/I_M_MovementConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_MovementConfirm.java
rename to org.adempiere.base/src/org/compiere/model/I_M_MovementConfirm.java
diff --git a/base/src/org/compiere/model/I_M_MovementLine.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_MovementLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_MovementLine.java
diff --git a/base/src/org/compiere/model/I_M_MovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_MovementLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/I_M_MovementLineConfirm.java
diff --git a/base/src/org/compiere/model/I_M_MovementLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_MovementLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_MovementLineMA.java
rename to org.adempiere.base/src/org/compiere/model/I_M_MovementLineMA.java
diff --git a/base/src/org/compiere/model/I_M_OperationResource.java b/org.adempiere.base/src/org/compiere/model/I_M_OperationResource.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_OperationResource.java
rename to org.adempiere.base/src/org/compiere/model/I_M_OperationResource.java
diff --git a/base/src/org/compiere/model/I_M_Package.java b/org.adempiere.base/src/org/compiere/model/I_M_Package.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Package.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Package.java
diff --git a/base/src/org/compiere/model/I_M_PackageLine.java b/org.adempiere.base/src/org/compiere/model/I_M_PackageLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PackageLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PackageLine.java
diff --git a/base/src/org/compiere/model/I_M_PerpetualInv.java b/org.adempiere.base/src/org/compiere/model/I_M_PerpetualInv.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PerpetualInv.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PerpetualInv.java
diff --git a/base/src/org/compiere/model/I_M_PriceList.java b/org.adempiere.base/src/org/compiere/model/I_M_PriceList.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PriceList.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PriceList.java
diff --git a/base/src/org/compiere/model/I_M_PriceList_Version.java b/org.adempiere.base/src/org/compiere/model/I_M_PriceList_Version.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PriceList_Version.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PriceList_Version.java
diff --git a/base/src/org/compiere/model/I_M_Product.java b/org.adempiere.base/src/org/compiere/model/I_M_Product.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Product.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Product.java
diff --git a/base/src/org/compiere/model/I_M_ProductDownload.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductDownload.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ProductDownload.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ProductDownload.java
diff --git a/base/src/org/compiere/model/I_M_ProductOperation.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductOperation.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ProductOperation.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ProductOperation.java
diff --git a/base/src/org/compiere/model/I_M_ProductPrice.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductPrice.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ProductPrice.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ProductPrice.java
diff --git a/base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
diff --git a/base/src/org/compiere/model/I_M_Product_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Product_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java
diff --git a/base/src/org/compiere/model/I_M_Product_BOM.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_BOM.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Product_BOM.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Product_BOM.java
diff --git a/base/src/org/compiere/model/I_M_Product_Category.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Product_Category.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Product_Category.java
diff --git a/base/src/org/compiere/model/I_M_Product_Category_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Product_Category_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java
diff --git a/base/src/org/compiere/model/I_M_Product_Costing.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Costing.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Product_Costing.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Product_Costing.java
diff --git a/base/src/org/compiere/model/I_M_Product_PO.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_PO.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Product_PO.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Product_PO.java
diff --git a/base/src/org/compiere/model/I_M_Production.java b/org.adempiere.base/src/org/compiere/model/I_M_Production.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Production.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Production.java
diff --git a/base/src/org/compiere/model/I_M_ProductionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ProductionLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ProductionLine.java
diff --git a/base/src/org/compiere/model/I_M_ProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ProductionLineMA.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ProductionLineMA.java
diff --git a/base/src/org/compiere/model/I_M_ProductionPlan.java b/org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_ProductionPlan.java
rename to org.adempiere.base/src/org/compiere/model/I_M_ProductionPlan.java
diff --git a/base/src/org/compiere/model/I_M_Promotion.java b/org.adempiere.base/src/org/compiere/model/I_M_Promotion.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Promotion.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Promotion.java
diff --git a/base/src/org/compiere/model/I_M_PromotionDistribution.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionDistribution.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PromotionDistribution.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PromotionDistribution.java
diff --git a/base/src/org/compiere/model/I_M_PromotionGroup.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroup.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PromotionGroup.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PromotionGroup.java
diff --git a/base/src/org/compiere/model/I_M_PromotionGroupLine.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionGroupLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PromotionGroupLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PromotionGroupLine.java
diff --git a/base/src/org/compiere/model/I_M_PromotionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PromotionLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PromotionLine.java
diff --git a/base/src/org/compiere/model/I_M_PromotionPreCondition.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionPreCondition.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PromotionPreCondition.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PromotionPreCondition.java
diff --git a/base/src/org/compiere/model/I_M_PromotionReward.java b/org.adempiere.base/src/org/compiere/model/I_M_PromotionReward.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_PromotionReward.java
rename to org.adempiere.base/src/org/compiere/model/I_M_PromotionReward.java
diff --git a/base/src/org/compiere/model/I_M_RMA.java b/org.adempiere.base/src/org/compiere/model/I_M_RMA.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_RMA.java
rename to org.adempiere.base/src/org/compiere/model/I_M_RMA.java
diff --git a/base/src/org/compiere/model/I_M_RMALine.java b/org.adempiere.base/src/org/compiere/model/I_M_RMALine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_RMALine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_RMALine.java
diff --git a/base/src/org/compiere/model/I_M_RMAType.java b/org.adempiere.base/src/org/compiere/model/I_M_RMAType.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_RMAType.java
rename to org.adempiere.base/src/org/compiere/model/I_M_RMAType.java
diff --git a/base/src/org/compiere/model/I_M_RelatedProduct.java b/org.adempiere.base/src/org/compiere/model/I_M_RelatedProduct.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_RelatedProduct.java
rename to org.adempiere.base/src/org/compiere/model/I_M_RelatedProduct.java
diff --git a/base/src/org/compiere/model/I_M_Replenish.java b/org.adempiere.base/src/org/compiere/model/I_M_Replenish.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Replenish.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Replenish.java
diff --git a/base/src/org/compiere/model/I_M_Requisition.java b/org.adempiere.base/src/org/compiere/model/I_M_Requisition.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Requisition.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Requisition.java
diff --git a/base/src/org/compiere/model/I_M_RequisitionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_RequisitionLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_RequisitionLine.java
rename to org.adempiere.base/src/org/compiere/model/I_M_RequisitionLine.java
diff --git a/base/src/org/compiere/model/I_M_SerNoCtl.java b/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtl.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_SerNoCtl.java
rename to org.adempiere.base/src/org/compiere/model/I_M_SerNoCtl.java
diff --git a/base/src/org/compiere/model/I_M_SerNoCtlExclude.java b/org.adempiere.base/src/org/compiere/model/I_M_SerNoCtlExclude.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_SerNoCtlExclude.java
rename to org.adempiere.base/src/org/compiere/model/I_M_SerNoCtlExclude.java
diff --git a/base/src/org/compiere/model/I_M_Shipper.java b/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Shipper.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
diff --git a/base/src/org/compiere/model/I_M_Storage.java b/org.adempiere.base/src/org/compiere/model/I_M_Storage.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Storage.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Storage.java
diff --git a/base/src/org/compiere/model/I_M_Substitute.java b/org.adempiere.base/src/org/compiere/model/I_M_Substitute.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Substitute.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Substitute.java
diff --git a/base/src/org/compiere/model/I_M_Transaction.java b/org.adempiere.base/src/org/compiere/model/I_M_Transaction.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Transaction.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Transaction.java
diff --git a/base/src/org/compiere/model/I_M_TransactionAllocation.java b/org.adempiere.base/src/org/compiere/model/I_M_TransactionAllocation.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_TransactionAllocation.java
rename to org.adempiere.base/src/org/compiere/model/I_M_TransactionAllocation.java
diff --git a/base/src/org/compiere/model/I_M_Warehouse.java b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Warehouse.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Warehouse.java
diff --git a/base/src/org/compiere/model/I_M_Warehouse_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/I_M_Warehouse_Acct.java
rename to org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java
diff --git a/base/src/org/compiere/model/I_PA_Achievement.java b/org.adempiere.base/src/org/compiere/model/I_PA_Achievement.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_Achievement.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_Achievement.java
diff --git a/base/src/org/compiere/model/I_PA_Benchmark.java b/org.adempiere.base/src/org/compiere/model/I_PA_Benchmark.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_Benchmark.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_Benchmark.java
diff --git a/base/src/org/compiere/model/I_PA_BenchmarkData.java b/org.adempiere.base/src/org/compiere/model/I_PA_BenchmarkData.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_BenchmarkData.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_BenchmarkData.java
diff --git a/base/src/org/compiere/model/I_PA_ColorSchema.java b/org.adempiere.base/src/org/compiere/model/I_PA_ColorSchema.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_ColorSchema.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_ColorSchema.java
diff --git a/base/src/org/compiere/model/I_PA_DashboardContent.java b/org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_DashboardContent.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_DashboardContent.java
diff --git a/base/src/org/compiere/model/I_PA_Goal.java b/org.adempiere.base/src/org/compiere/model/I_PA_Goal.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_Goal.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_Goal.java
diff --git a/base/src/org/compiere/model/I_PA_GoalRestriction.java b/org.adempiere.base/src/org/compiere/model/I_PA_GoalRestriction.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_GoalRestriction.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_GoalRestriction.java
diff --git a/base/src/org/compiere/model/I_PA_Hierarchy.java b/org.adempiere.base/src/org/compiere/model/I_PA_Hierarchy.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_Hierarchy.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_Hierarchy.java
diff --git a/base/src/org/compiere/model/I_PA_Measure.java b/org.adempiere.base/src/org/compiere/model/I_PA_Measure.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_Measure.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_Measure.java
diff --git a/base/src/org/compiere/model/I_PA_MeasureCalc.java b/org.adempiere.base/src/org/compiere/model/I_PA_MeasureCalc.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_MeasureCalc.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_MeasureCalc.java
diff --git a/base/src/org/compiere/model/I_PA_Ratio.java b/org.adempiere.base/src/org/compiere/model/I_PA_Ratio.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_Ratio.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_Ratio.java
diff --git a/base/src/org/compiere/model/I_PA_RatioElement.java b/org.adempiere.base/src/org/compiere/model/I_PA_RatioElement.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_RatioElement.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_RatioElement.java
diff --git a/base/src/org/compiere/model/I_PA_Report.java b/org.adempiere.base/src/org/compiere/model/I_PA_Report.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_Report.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_Report.java
diff --git a/base/src/org/compiere/model/I_PA_ReportColumn.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumn.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_ReportColumn.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_ReportColumn.java
diff --git a/base/src/org/compiere/model/I_PA_ReportColumnSet.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportColumnSet.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_ReportColumnSet.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_ReportColumnSet.java
diff --git a/base/src/org/compiere/model/I_PA_ReportCube.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportCube.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_ReportCube.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_ReportCube.java
diff --git a/base/src/org/compiere/model/I_PA_ReportLine.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_ReportLine.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_ReportLine.java
diff --git a/base/src/org/compiere/model/I_PA_ReportLineSet.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportLineSet.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_ReportLineSet.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_ReportLineSet.java
diff --git a/base/src/org/compiere/model/I_PA_ReportSource.java b/org.adempiere.base/src/org/compiere/model/I_PA_ReportSource.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_ReportSource.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_ReportSource.java
diff --git a/base/src/org/compiere/model/I_PA_SLA_Criteria.java b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Criteria.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_SLA_Criteria.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_SLA_Criteria.java
diff --git a/base/src/org/compiere/model/I_PA_SLA_Goal.java b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Goal.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_SLA_Goal.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_SLA_Goal.java
diff --git a/base/src/org/compiere/model/I_PA_SLA_Measure.java b/org.adempiere.base/src/org/compiere/model/I_PA_SLA_Measure.java
similarity index 100%
rename from base/src/org/compiere/model/I_PA_SLA_Measure.java
rename to org.adempiere.base/src/org/compiere/model/I_PA_SLA_Measure.java
diff --git a/base/src/org/compiere/model/I_Persistent.java b/org.adempiere.base/src/org/compiere/model/I_Persistent.java
similarity index 100%
rename from base/src/org/compiere/model/I_Persistent.java
rename to org.adempiere.base/src/org/compiere/model/I_Persistent.java
diff --git a/base/src/org/compiere/model/I_RV_BPartner.java b/org.adempiere.base/src/org/compiere/model/I_RV_BPartner.java
similarity index 100%
rename from base/src/org/compiere/model/I_RV_BPartner.java
rename to org.adempiere.base/src/org/compiere/model/I_RV_BPartner.java
diff --git a/base/src/org/compiere/model/I_RV_WarehousePrice.java b/org.adempiere.base/src/org/compiere/model/I_RV_WarehousePrice.java
similarity index 100%
rename from base/src/org/compiere/model/I_RV_WarehousePrice.java
rename to org.adempiere.base/src/org/compiere/model/I_RV_WarehousePrice.java
diff --git a/base/src/org/compiere/model/I_R_Category.java b/org.adempiere.base/src/org/compiere/model/I_R_Category.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_Category.java
rename to org.adempiere.base/src/org/compiere/model/I_R_Category.java
diff --git a/base/src/org/compiere/model/I_R_CategoryUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_CategoryUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_CategoryUpdates.java
rename to org.adempiere.base/src/org/compiere/model/I_R_CategoryUpdates.java
diff --git a/base/src/org/compiere/model/I_R_ContactInterest.java b/org.adempiere.base/src/org/compiere/model/I_R_ContactInterest.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_ContactInterest.java
rename to org.adempiere.base/src/org/compiere/model/I_R_ContactInterest.java
diff --git a/base/src/org/compiere/model/I_R_Group.java b/org.adempiere.base/src/org/compiere/model/I_R_Group.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_Group.java
rename to org.adempiere.base/src/org/compiere/model/I_R_Group.java
diff --git a/base/src/org/compiere/model/I_R_GroupUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_GroupUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_GroupUpdates.java
rename to org.adempiere.base/src/org/compiere/model/I_R_GroupUpdates.java
diff --git a/base/src/org/compiere/model/I_R_InterestArea.java b/org.adempiere.base/src/org/compiere/model/I_R_InterestArea.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_InterestArea.java
rename to org.adempiere.base/src/org/compiere/model/I_R_InterestArea.java
diff --git a/base/src/org/compiere/model/I_R_IssueKnown.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueKnown.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_IssueKnown.java
rename to org.adempiere.base/src/org/compiere/model/I_R_IssueKnown.java
diff --git a/base/src/org/compiere/model/I_R_IssueProject.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueProject.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_IssueProject.java
rename to org.adempiere.base/src/org/compiere/model/I_R_IssueProject.java
diff --git a/base/src/org/compiere/model/I_R_IssueRecommendation.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueRecommendation.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_IssueRecommendation.java
rename to org.adempiere.base/src/org/compiere/model/I_R_IssueRecommendation.java
diff --git a/base/src/org/compiere/model/I_R_IssueStatus.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueStatus.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_IssueStatus.java
rename to org.adempiere.base/src/org/compiere/model/I_R_IssueStatus.java
diff --git a/base/src/org/compiere/model/I_R_IssueSystem.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueSystem.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_IssueSystem.java
rename to org.adempiere.base/src/org/compiere/model/I_R_IssueSystem.java
diff --git a/base/src/org/compiere/model/I_R_IssueUser.java b/org.adempiere.base/src/org/compiere/model/I_R_IssueUser.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_IssueUser.java
rename to org.adempiere.base/src/org/compiere/model/I_R_IssueUser.java
diff --git a/base/src/org/compiere/model/I_R_MailText.java b/org.adempiere.base/src/org/compiere/model/I_R_MailText.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_MailText.java
rename to org.adempiere.base/src/org/compiere/model/I_R_MailText.java
diff --git a/base/src/org/compiere/model/I_R_Request.java b/org.adempiere.base/src/org/compiere/model/I_R_Request.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_Request.java
rename to org.adempiere.base/src/org/compiere/model/I_R_Request.java
diff --git a/base/src/org/compiere/model/I_R_RequestAction.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestAction.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestAction.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestAction.java
diff --git a/base/src/org/compiere/model/I_R_RequestProcessor.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestProcessor.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor.java
diff --git a/base/src/org/compiere/model/I_R_RequestProcessorLog.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestProcessorLog.java
diff --git a/base/src/org/compiere/model/I_R_RequestProcessor_Route.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor_Route.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestProcessor_Route.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestProcessor_Route.java
diff --git a/base/src/org/compiere/model/I_R_RequestType.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestType.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestType.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestType.java
diff --git a/base/src/org/compiere/model/I_R_RequestTypeUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestTypeUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestTypeUpdates.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestTypeUpdates.java
diff --git a/base/src/org/compiere/model/I_R_RequestUpdate.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdate.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestUpdate.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestUpdate.java
diff --git a/base/src/org/compiere/model/I_R_RequestUpdates.java b/org.adempiere.base/src/org/compiere/model/I_R_RequestUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_RequestUpdates.java
rename to org.adempiere.base/src/org/compiere/model/I_R_RequestUpdates.java
diff --git a/base/src/org/compiere/model/I_R_Resolution.java b/org.adempiere.base/src/org/compiere/model/I_R_Resolution.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_Resolution.java
rename to org.adempiere.base/src/org/compiere/model/I_R_Resolution.java
diff --git a/base/src/org/compiere/model/I_R_StandardResponse.java b/org.adempiere.base/src/org/compiere/model/I_R_StandardResponse.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_StandardResponse.java
rename to org.adempiere.base/src/org/compiere/model/I_R_StandardResponse.java
diff --git a/base/src/org/compiere/model/I_R_Status.java b/org.adempiere.base/src/org/compiere/model/I_R_Status.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_Status.java
rename to org.adempiere.base/src/org/compiere/model/I_R_Status.java
diff --git a/base/src/org/compiere/model/I_R_StatusCategory.java b/org.adempiere.base/src/org/compiere/model/I_R_StatusCategory.java
similarity index 100%
rename from base/src/org/compiere/model/I_R_StatusCategory.java
rename to org.adempiere.base/src/org/compiere/model/I_R_StatusCategory.java
diff --git a/base/src/org/compiere/model/I_S_ExpenseType.java b/org.adempiere.base/src/org/compiere/model/I_S_ExpenseType.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_ExpenseType.java
rename to org.adempiere.base/src/org/compiere/model/I_S_ExpenseType.java
diff --git a/base/src/org/compiere/model/I_S_Resource.java b/org.adempiere.base/src/org/compiere/model/I_S_Resource.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_Resource.java
rename to org.adempiere.base/src/org/compiere/model/I_S_Resource.java
diff --git a/base/src/org/compiere/model/I_S_ResourceAssignment.java b/org.adempiere.base/src/org/compiere/model/I_S_ResourceAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_ResourceAssignment.java
rename to org.adempiere.base/src/org/compiere/model/I_S_ResourceAssignment.java
diff --git a/base/src/org/compiere/model/I_S_ResourceType.java b/org.adempiere.base/src/org/compiere/model/I_S_ResourceType.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_ResourceType.java
rename to org.adempiere.base/src/org/compiere/model/I_S_ResourceType.java
diff --git a/base/src/org/compiere/model/I_S_ResourceUnAvailable.java b/org.adempiere.base/src/org/compiere/model/I_S_ResourceUnAvailable.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_ResourceUnAvailable.java
rename to org.adempiere.base/src/org/compiere/model/I_S_ResourceUnAvailable.java
diff --git a/base/src/org/compiere/model/I_S_TimeExpense.java b/org.adempiere.base/src/org/compiere/model/I_S_TimeExpense.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_TimeExpense.java
rename to org.adempiere.base/src/org/compiere/model/I_S_TimeExpense.java
diff --git a/base/src/org/compiere/model/I_S_TimeExpenseLine.java b/org.adempiere.base/src/org/compiere/model/I_S_TimeExpenseLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_TimeExpenseLine.java
rename to org.adempiere.base/src/org/compiere/model/I_S_TimeExpenseLine.java
diff --git a/base/src/org/compiere/model/I_S_TimeType.java b/org.adempiere.base/src/org/compiere/model/I_S_TimeType.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_TimeType.java
rename to org.adempiere.base/src/org/compiere/model/I_S_TimeType.java
diff --git a/base/src/org/compiere/model/I_S_Training.java b/org.adempiere.base/src/org/compiere/model/I_S_Training.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_Training.java
rename to org.adempiere.base/src/org/compiere/model/I_S_Training.java
diff --git a/base/src/org/compiere/model/I_S_Training_Class.java b/org.adempiere.base/src/org/compiere/model/I_S_Training_Class.java
similarity index 100%
rename from base/src/org/compiere/model/I_S_Training_Class.java
rename to org.adempiere.base/src/org/compiere/model/I_S_Training_Class.java
diff --git a/base/src/org/compiere/model/I_T_Aging.java b/org.adempiere.base/src/org/compiere/model/I_T_Aging.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_Aging.java
rename to org.adempiere.base/src/org/compiere/model/I_T_Aging.java
diff --git a/base/src/org/compiere/model/I_T_DistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/I_T_DistributionRunDetail.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_DistributionRunDetail.java
rename to org.adempiere.base/src/org/compiere/model/I_T_DistributionRunDetail.java
diff --git a/base/src/org/compiere/model/I_T_InventoryValue.java b/org.adempiere.base/src/org/compiere/model/I_T_InventoryValue.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_InventoryValue.java
rename to org.adempiere.base/src/org/compiere/model/I_T_InventoryValue.java
diff --git a/base/src/org/compiere/model/I_T_InvoiceGL.java b/org.adempiere.base/src/org/compiere/model/I_T_InvoiceGL.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_InvoiceGL.java
rename to org.adempiere.base/src/org/compiere/model/I_T_InvoiceGL.java
diff --git a/base/src/org/compiere/model/I_T_Replenish.java b/org.adempiere.base/src/org/compiere/model/I_T_Replenish.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_Replenish.java
rename to org.adempiere.base/src/org/compiere/model/I_T_Replenish.java
diff --git a/base/src/org/compiere/model/I_T_Report.java b/org.adempiere.base/src/org/compiere/model/I_T_Report.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_Report.java
rename to org.adempiere.base/src/org/compiere/model/I_T_Report.java
diff --git a/base/src/org/compiere/model/I_T_ReportStatement.java b/org.adempiere.base/src/org/compiere/model/I_T_ReportStatement.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_ReportStatement.java
rename to org.adempiere.base/src/org/compiere/model/I_T_ReportStatement.java
diff --git a/base/src/org/compiere/model/I_T_Transaction.java b/org.adempiere.base/src/org/compiere/model/I_T_Transaction.java
similarity index 100%
rename from base/src/org/compiere/model/I_T_Transaction.java
rename to org.adempiere.base/src/org/compiere/model/I_T_Transaction.java
diff --git a/base/src/org/compiere/model/I_Test.java b/org.adempiere.base/src/org/compiere/model/I_Test.java
similarity index 100%
rename from base/src/org/compiere/model/I_Test.java
rename to org.adempiere.base/src/org/compiere/model/I_Test.java
diff --git a/base/src/org/compiere/model/I_U_BlackListCheque.java b/org.adempiere.base/src/org/compiere/model/I_U_BlackListCheque.java
similarity index 100%
rename from base/src/org/compiere/model/I_U_BlackListCheque.java
rename to org.adempiere.base/src/org/compiere/model/I_U_BlackListCheque.java
diff --git a/base/src/org/compiere/model/I_U_POSTerminal.java b/org.adempiere.base/src/org/compiere/model/I_U_POSTerminal.java
similarity index 100%
rename from base/src/org/compiere/model/I_U_POSTerminal.java
rename to org.adempiere.base/src/org/compiere/model/I_U_POSTerminal.java
diff --git a/base/src/org/compiere/model/I_U_RoleMenu.java b/org.adempiere.base/src/org/compiere/model/I_U_RoleMenu.java
similarity index 100%
rename from base/src/org/compiere/model/I_U_RoleMenu.java
rename to org.adempiere.base/src/org/compiere/model/I_U_RoleMenu.java
diff --git a/base/src/org/compiere/model/I_U_WebMenu.java b/org.adempiere.base/src/org/compiere/model/I_U_WebMenu.java
similarity index 100%
rename from base/src/org/compiere/model/I_U_WebMenu.java
rename to org.adempiere.base/src/org/compiere/model/I_U_WebMenu.java
diff --git a/base/src/org/compiere/model/I_U_Web_Properties.java b/org.adempiere.base/src/org/compiere/model/I_U_Web_Properties.java
similarity index 100%
rename from base/src/org/compiere/model/I_U_Web_Properties.java
rename to org.adempiere.base/src/org/compiere/model/I_U_Web_Properties.java
diff --git a/base/src/org/compiere/model/I_W_Advertisement.java b/org.adempiere.base/src/org/compiere/model/I_W_Advertisement.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_Advertisement.java
rename to org.adempiere.base/src/org/compiere/model/I_W_Advertisement.java
diff --git a/base/src/org/compiere/model/I_W_Basket.java b/org.adempiere.base/src/org/compiere/model/I_W_Basket.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_Basket.java
rename to org.adempiere.base/src/org/compiere/model/I_W_Basket.java
diff --git a/base/src/org/compiere/model/I_W_BasketLine.java b/org.adempiere.base/src/org/compiere/model/I_W_BasketLine.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_BasketLine.java
rename to org.adempiere.base/src/org/compiere/model/I_W_BasketLine.java
diff --git a/base/src/org/compiere/model/I_W_Click.java b/org.adempiere.base/src/org/compiere/model/I_W_Click.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_Click.java
rename to org.adempiere.base/src/org/compiere/model/I_W_Click.java
diff --git a/base/src/org/compiere/model/I_W_ClickCount.java b/org.adempiere.base/src/org/compiere/model/I_W_ClickCount.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_ClickCount.java
rename to org.adempiere.base/src/org/compiere/model/I_W_ClickCount.java
diff --git a/base/src/org/compiere/model/I_W_Counter.java b/org.adempiere.base/src/org/compiere/model/I_W_Counter.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_Counter.java
rename to org.adempiere.base/src/org/compiere/model/I_W_Counter.java
diff --git a/base/src/org/compiere/model/I_W_CounterCount.java b/org.adempiere.base/src/org/compiere/model/I_W_CounterCount.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_CounterCount.java
rename to org.adempiere.base/src/org/compiere/model/I_W_CounterCount.java
diff --git a/base/src/org/compiere/model/I_W_MailMsg.java b/org.adempiere.base/src/org/compiere/model/I_W_MailMsg.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_MailMsg.java
rename to org.adempiere.base/src/org/compiere/model/I_W_MailMsg.java
diff --git a/base/src/org/compiere/model/I_W_Store.java b/org.adempiere.base/src/org/compiere/model/I_W_Store.java
similarity index 100%
rename from base/src/org/compiere/model/I_W_Store.java
rename to org.adempiere.base/src/org/compiere/model/I_W_Store.java
diff --git a/base/src/org/compiere/model/Lookup.java b/org.adempiere.base/src/org/compiere/model/Lookup.java
similarity index 100%
rename from base/src/org/compiere/model/Lookup.java
rename to org.adempiere.base/src/org/compiere/model/Lookup.java
diff --git a/base/src/org/compiere/model/LookupDisplayColumn.java b/org.adempiere.base/src/org/compiere/model/LookupDisplayColumn.java
similarity index 100%
rename from base/src/org/compiere/model/LookupDisplayColumn.java
rename to org.adempiere.base/src/org/compiere/model/LookupDisplayColumn.java
diff --git a/base/src/org/compiere/model/MAccessLog.java b/org.adempiere.base/src/org/compiere/model/MAccessLog.java
similarity index 100%
rename from base/src/org/compiere/model/MAccessLog.java
rename to org.adempiere.base/src/org/compiere/model/MAccessLog.java
diff --git a/base/src/org/compiere/model/MAccessProfile.java b/org.adempiere.base/src/org/compiere/model/MAccessProfile.java
similarity index 100%
rename from base/src/org/compiere/model/MAccessProfile.java
rename to org.adempiere.base/src/org/compiere/model/MAccessProfile.java
diff --git a/base/src/org/compiere/model/MAccount.java b/org.adempiere.base/src/org/compiere/model/MAccount.java
similarity index 100%
rename from base/src/org/compiere/model/MAccount.java
rename to org.adempiere.base/src/org/compiere/model/MAccount.java
diff --git a/base/src/org/compiere/model/MAccountLookup.java b/org.adempiere.base/src/org/compiere/model/MAccountLookup.java
similarity index 100%
rename from base/src/org/compiere/model/MAccountLookup.java
rename to org.adempiere.base/src/org/compiere/model/MAccountLookup.java
diff --git a/base/src/org/compiere/model/MAcctProcessor.java b/org.adempiere.base/src/org/compiere/model/MAcctProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/MAcctProcessor.java
rename to org.adempiere.base/src/org/compiere/model/MAcctProcessor.java
diff --git a/base/src/org/compiere/model/MAcctProcessorLog.java b/org.adempiere.base/src/org/compiere/model/MAcctProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/MAcctProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/MAcctProcessorLog.java
diff --git a/base/src/org/compiere/model/MAcctSchema.java b/org.adempiere.base/src/org/compiere/model/MAcctSchema.java
similarity index 100%
rename from base/src/org/compiere/model/MAcctSchema.java
rename to org.adempiere.base/src/org/compiere/model/MAcctSchema.java
diff --git a/base/src/org/compiere/model/MAcctSchemaDefault.java b/org.adempiere.base/src/org/compiere/model/MAcctSchemaDefault.java
similarity index 100%
rename from base/src/org/compiere/model/MAcctSchemaDefault.java
rename to org.adempiere.base/src/org/compiere/model/MAcctSchemaDefault.java
diff --git a/base/src/org/compiere/model/MAcctSchemaElement.java b/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
similarity index 100%
rename from base/src/org/compiere/model/MAcctSchemaElement.java
rename to org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java
diff --git a/base/src/org/compiere/model/MAcctSchemaGL.java b/org.adempiere.base/src/org/compiere/model/MAcctSchemaGL.java
similarity index 100%
rename from base/src/org/compiere/model/MAcctSchemaGL.java
rename to org.adempiere.base/src/org/compiere/model/MAcctSchemaGL.java
diff --git a/base/src/org/compiere/model/MAchievement.java b/org.adempiere.base/src/org/compiere/model/MAchievement.java
similarity index 100%
rename from base/src/org/compiere/model/MAchievement.java
rename to org.adempiere.base/src/org/compiere/model/MAchievement.java
diff --git a/base/src/org/compiere/model/MActivity.java b/org.adempiere.base/src/org/compiere/model/MActivity.java
similarity index 100%
rename from base/src/org/compiere/model/MActivity.java
rename to org.adempiere.base/src/org/compiere/model/MActivity.java
diff --git a/base/src/org/compiere/model/MAd.java b/org.adempiere.base/src/org/compiere/model/MAd.java
similarity index 100%
rename from base/src/org/compiere/model/MAd.java
rename to org.adempiere.base/src/org/compiere/model/MAd.java
diff --git a/base/src/org/compiere/model/MAdvertisement.java b/org.adempiere.base/src/org/compiere/model/MAdvertisement.java
similarity index 100%
rename from base/src/org/compiere/model/MAdvertisement.java
rename to org.adempiere.base/src/org/compiere/model/MAdvertisement.java
diff --git a/base/src/org/compiere/model/MAging.java b/org.adempiere.base/src/org/compiere/model/MAging.java
similarity index 100%
rename from base/src/org/compiere/model/MAging.java
rename to org.adempiere.base/src/org/compiere/model/MAging.java
diff --git a/base/src/org/compiere/model/MAlert.java b/org.adempiere.base/src/org/compiere/model/MAlert.java
similarity index 100%
rename from base/src/org/compiere/model/MAlert.java
rename to org.adempiere.base/src/org/compiere/model/MAlert.java
diff --git a/base/src/org/compiere/model/MAlertProcessor.java b/org.adempiere.base/src/org/compiere/model/MAlertProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/MAlertProcessor.java
rename to org.adempiere.base/src/org/compiere/model/MAlertProcessor.java
diff --git a/base/src/org/compiere/model/MAlertProcessorLog.java b/org.adempiere.base/src/org/compiere/model/MAlertProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/MAlertProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/MAlertProcessorLog.java
diff --git a/base/src/org/compiere/model/MAlertRecipient.java b/org.adempiere.base/src/org/compiere/model/MAlertRecipient.java
similarity index 100%
rename from base/src/org/compiere/model/MAlertRecipient.java
rename to org.adempiere.base/src/org/compiere/model/MAlertRecipient.java
diff --git a/base/src/org/compiere/model/MAlertRule.java b/org.adempiere.base/src/org/compiere/model/MAlertRule.java
similarity index 100%
rename from base/src/org/compiere/model/MAlertRule.java
rename to org.adempiere.base/src/org/compiere/model/MAlertRule.java
diff --git a/base/src/org/compiere/model/MAllocationHdr.java b/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java
similarity index 100%
rename from base/src/org/compiere/model/MAllocationHdr.java
rename to org.adempiere.base/src/org/compiere/model/MAllocationHdr.java
diff --git a/base/src/org/compiere/model/MAllocationLine.java b/org.adempiere.base/src/org/compiere/model/MAllocationLine.java
similarity index 100%
rename from base/src/org/compiere/model/MAllocationLine.java
rename to org.adempiere.base/src/org/compiere/model/MAllocationLine.java
diff --git a/base/src/org/compiere/model/MArchive.java b/org.adempiere.base/src/org/compiere/model/MArchive.java
similarity index 100%
rename from base/src/org/compiere/model/MArchive.java
rename to org.adempiere.base/src/org/compiere/model/MArchive.java
diff --git a/base/src/org/compiere/model/MAsset.java b/org.adempiere.base/src/org/compiere/model/MAsset.java
similarity index 100%
rename from base/src/org/compiere/model/MAsset.java
rename to org.adempiere.base/src/org/compiere/model/MAsset.java
diff --git a/base/src/org/compiere/model/MAssetAcct.java b/org.adempiere.base/src/org/compiere/model/MAssetAcct.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetAcct.java
rename to org.adempiere.base/src/org/compiere/model/MAssetAcct.java
diff --git a/base/src/org/compiere/model/MAssetAddition.java b/org.adempiere.base/src/org/compiere/model/MAssetAddition.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetAddition.java
rename to org.adempiere.base/src/org/compiere/model/MAssetAddition.java
diff --git a/base/src/org/compiere/model/MAssetChange.java b/org.adempiere.base/src/org/compiere/model/MAssetChange.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetChange.java
rename to org.adempiere.base/src/org/compiere/model/MAssetChange.java
diff --git a/base/src/org/compiere/model/MAssetDelivery.java b/org.adempiere.base/src/org/compiere/model/MAssetDelivery.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetDelivery.java
rename to org.adempiere.base/src/org/compiere/model/MAssetDelivery.java
diff --git a/base/src/org/compiere/model/MAssetGroup.java b/org.adempiere.base/src/org/compiere/model/MAssetGroup.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetGroup.java
rename to org.adempiere.base/src/org/compiere/model/MAssetGroup.java
diff --git a/base/src/org/compiere/model/MAssetGroupAcct.java b/org.adempiere.base/src/org/compiere/model/MAssetGroupAcct.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetGroupAcct.java
rename to org.adempiere.base/src/org/compiere/model/MAssetGroupAcct.java
diff --git a/base/src/org/compiere/model/MAssetTransfer.java b/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetTransfer.java
rename to org.adempiere.base/src/org/compiere/model/MAssetTransfer.java
diff --git a/base/src/org/compiere/model/MAssetUse.java b/org.adempiere.base/src/org/compiere/model/MAssetUse.java
similarity index 100%
rename from base/src/org/compiere/model/MAssetUse.java
rename to org.adempiere.base/src/org/compiere/model/MAssetUse.java
diff --git a/base/src/org/compiere/model/MAssignmentSlot.java b/org.adempiere.base/src/org/compiere/model/MAssignmentSlot.java
similarity index 100%
rename from base/src/org/compiere/model/MAssignmentSlot.java
rename to org.adempiere.base/src/org/compiere/model/MAssignmentSlot.java
diff --git a/base/src/org/compiere/model/MAttachment.java b/org.adempiere.base/src/org/compiere/model/MAttachment.java
similarity index 100%
rename from base/src/org/compiere/model/MAttachment.java
rename to org.adempiere.base/src/org/compiere/model/MAttachment.java
diff --git a/base/src/org/compiere/model/MAttachmentEntry.java b/org.adempiere.base/src/org/compiere/model/MAttachmentEntry.java
similarity index 100%
rename from base/src/org/compiere/model/MAttachmentEntry.java
rename to org.adempiere.base/src/org/compiere/model/MAttachmentEntry.java
diff --git a/base/src/org/compiere/model/MAttachmentNote.java b/org.adempiere.base/src/org/compiere/model/MAttachmentNote.java
similarity index 100%
rename from base/src/org/compiere/model/MAttachmentNote.java
rename to org.adempiere.base/src/org/compiere/model/MAttachmentNote.java
diff --git a/base/src/org/compiere/model/MAttribute.java b/org.adempiere.base/src/org/compiere/model/MAttribute.java
similarity index 100%
rename from base/src/org/compiere/model/MAttribute.java
rename to org.adempiere.base/src/org/compiere/model/MAttribute.java
diff --git a/base/src/org/compiere/model/MAttributeInstance.java b/org.adempiere.base/src/org/compiere/model/MAttributeInstance.java
similarity index 100%
rename from base/src/org/compiere/model/MAttributeInstance.java
rename to org.adempiere.base/src/org/compiere/model/MAttributeInstance.java
diff --git a/base/src/org/compiere/model/MAttributeSet.java b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java
similarity index 100%
rename from base/src/org/compiere/model/MAttributeSet.java
rename to org.adempiere.base/src/org/compiere/model/MAttributeSet.java
diff --git a/base/src/org/compiere/model/MAttributeSetInstance.java b/org.adempiere.base/src/org/compiere/model/MAttributeSetInstance.java
similarity index 100%
rename from base/src/org/compiere/model/MAttributeSetInstance.java
rename to org.adempiere.base/src/org/compiere/model/MAttributeSetInstance.java
diff --git a/base/src/org/compiere/model/MAttributeUse.java b/org.adempiere.base/src/org/compiere/model/MAttributeUse.java
similarity index 100%
rename from base/src/org/compiere/model/MAttributeUse.java
rename to org.adempiere.base/src/org/compiere/model/MAttributeUse.java
diff --git a/base/src/org/compiere/model/MAttributeValue.java b/org.adempiere.base/src/org/compiere/model/MAttributeValue.java
similarity index 100%
rename from base/src/org/compiere/model/MAttributeValue.java
rename to org.adempiere.base/src/org/compiere/model/MAttributeValue.java
diff --git a/base/src/org/compiere/model/MBOM.java b/org.adempiere.base/src/org/compiere/model/MBOM.java
similarity index 100%
rename from base/src/org/compiere/model/MBOM.java
rename to org.adempiere.base/src/org/compiere/model/MBOM.java
diff --git a/base/src/org/compiere/model/MBOMProduct.java b/org.adempiere.base/src/org/compiere/model/MBOMProduct.java
similarity index 100%
rename from base/src/org/compiere/model/MBOMProduct.java
rename to org.adempiere.base/src/org/compiere/model/MBOMProduct.java
diff --git a/base/src/org/compiere/model/MBPBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBPBankAccount.java
similarity index 100%
rename from base/src/org/compiere/model/MBPBankAccount.java
rename to org.adempiere.base/src/org/compiere/model/MBPBankAccount.java
diff --git a/base/src/org/compiere/model/MBPGroup.java b/org.adempiere.base/src/org/compiere/model/MBPGroup.java
similarity index 100%
rename from base/src/org/compiere/model/MBPGroup.java
rename to org.adempiere.base/src/org/compiere/model/MBPGroup.java
diff --git a/base/src/org/compiere/model/MBPartner.java b/org.adempiere.base/src/org/compiere/model/MBPartner.java
similarity index 100%
rename from base/src/org/compiere/model/MBPartner.java
rename to org.adempiere.base/src/org/compiere/model/MBPartner.java
diff --git a/base/src/org/compiere/model/MBPartnerInfo.java b/org.adempiere.base/src/org/compiere/model/MBPartnerInfo.java
similarity index 100%
rename from base/src/org/compiere/model/MBPartnerInfo.java
rename to org.adempiere.base/src/org/compiere/model/MBPartnerInfo.java
diff --git a/base/src/org/compiere/model/MBPartnerLocation.java b/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java
similarity index 100%
rename from base/src/org/compiere/model/MBPartnerLocation.java
rename to org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java
diff --git a/base/src/org/compiere/model/MBPartnerProduct.java b/org.adempiere.base/src/org/compiere/model/MBPartnerProduct.java
similarity index 100%
rename from base/src/org/compiere/model/MBPartnerProduct.java
rename to org.adempiere.base/src/org/compiere/model/MBPartnerProduct.java
diff --git a/base/src/org/compiere/model/MBank.java b/org.adempiere.base/src/org/compiere/model/MBank.java
similarity index 100%
rename from base/src/org/compiere/model/MBank.java
rename to org.adempiere.base/src/org/compiere/model/MBank.java
diff --git a/base/src/org/compiere/model/MBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBankAccount.java
similarity index 100%
rename from base/src/org/compiere/model/MBankAccount.java
rename to org.adempiere.base/src/org/compiere/model/MBankAccount.java
diff --git a/base/src/org/compiere/model/MBankStatement.java b/org.adempiere.base/src/org/compiere/model/MBankStatement.java
similarity index 100%
rename from base/src/org/compiere/model/MBankStatement.java
rename to org.adempiere.base/src/org/compiere/model/MBankStatement.java
diff --git a/base/src/org/compiere/model/MBankStatementLine.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
similarity index 100%
rename from base/src/org/compiere/model/MBankStatementLine.java
rename to org.adempiere.base/src/org/compiere/model/MBankStatementLine.java
diff --git a/base/src/org/compiere/model/MBankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java
similarity index 100%
rename from base/src/org/compiere/model/MBankStatementLoader.java
rename to org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java
diff --git a/base/src/org/compiere/model/MBankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java
similarity index 100%
rename from base/src/org/compiere/model/MBankStatementMatcher.java
rename to org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java
diff --git a/base/src/org/compiere/model/MBlackListCheque.java b/org.adempiere.base/src/org/compiere/model/MBlackListCheque.java
similarity index 100%
rename from base/src/org/compiere/model/MBlackListCheque.java
rename to org.adempiere.base/src/org/compiere/model/MBlackListCheque.java
diff --git a/base/src/org/compiere/model/MCStage.java b/org.adempiere.base/src/org/compiere/model/MCStage.java
similarity index 100%
rename from base/src/org/compiere/model/MCStage.java
rename to org.adempiere.base/src/org/compiere/model/MCStage.java
diff --git a/base/src/org/compiere/model/MCStageElement.java b/org.adempiere.base/src/org/compiere/model/MCStageElement.java
similarity index 100%
rename from base/src/org/compiere/model/MCStageElement.java
rename to org.adempiere.base/src/org/compiere/model/MCStageElement.java
diff --git a/base/src/org/compiere/model/MCalendar.java b/org.adempiere.base/src/org/compiere/model/MCalendar.java
similarity index 100%
rename from base/src/org/compiere/model/MCalendar.java
rename to org.adempiere.base/src/org/compiere/model/MCalendar.java
diff --git a/base/src/org/compiere/model/MCampaign.java b/org.adempiere.base/src/org/compiere/model/MCampaign.java
similarity index 100%
rename from base/src/org/compiere/model/MCampaign.java
rename to org.adempiere.base/src/org/compiere/model/MCampaign.java
diff --git a/base/src/org/compiere/model/MCash.java b/org.adempiere.base/src/org/compiere/model/MCash.java
similarity index 100%
rename from base/src/org/compiere/model/MCash.java
rename to org.adempiere.base/src/org/compiere/model/MCash.java
diff --git a/base/src/org/compiere/model/MCashBook.java b/org.adempiere.base/src/org/compiere/model/MCashBook.java
similarity index 100%
rename from base/src/org/compiere/model/MCashBook.java
rename to org.adempiere.base/src/org/compiere/model/MCashBook.java
diff --git a/base/src/org/compiere/model/MCashLine.java b/org.adempiere.base/src/org/compiere/model/MCashLine.java
similarity index 100%
rename from base/src/org/compiere/model/MCashLine.java
rename to org.adempiere.base/src/org/compiere/model/MCashLine.java
diff --git a/base/src/org/compiere/model/MChangeLog.java b/org.adempiere.base/src/org/compiere/model/MChangeLog.java
similarity index 100%
rename from base/src/org/compiere/model/MChangeLog.java
rename to org.adempiere.base/src/org/compiere/model/MChangeLog.java
diff --git a/base/src/org/compiere/model/MChangeNotice.java b/org.adempiere.base/src/org/compiere/model/MChangeNotice.java
similarity index 100%
rename from base/src/org/compiere/model/MChangeNotice.java
rename to org.adempiere.base/src/org/compiere/model/MChangeNotice.java
diff --git a/base/src/org/compiere/model/MChangeRequest.java b/org.adempiere.base/src/org/compiere/model/MChangeRequest.java
similarity index 100%
rename from base/src/org/compiere/model/MChangeRequest.java
rename to org.adempiere.base/src/org/compiere/model/MChangeRequest.java
diff --git a/base/src/org/compiere/model/MCharge.java b/org.adempiere.base/src/org/compiere/model/MCharge.java
similarity index 100%
rename from base/src/org/compiere/model/MCharge.java
rename to org.adempiere.base/src/org/compiere/model/MCharge.java
diff --git a/base/src/org/compiere/model/MChat.java b/org.adempiere.base/src/org/compiere/model/MChat.java
similarity index 100%
rename from base/src/org/compiere/model/MChat.java
rename to org.adempiere.base/src/org/compiere/model/MChat.java
diff --git a/base/src/org/compiere/model/MChatEntry.java b/org.adempiere.base/src/org/compiere/model/MChatEntry.java
similarity index 100%
rename from base/src/org/compiere/model/MChatEntry.java
rename to org.adempiere.base/src/org/compiere/model/MChatEntry.java
diff --git a/base/src/org/compiere/model/MChatType.java b/org.adempiere.base/src/org/compiere/model/MChatType.java
similarity index 100%
rename from base/src/org/compiere/model/MChatType.java
rename to org.adempiere.base/src/org/compiere/model/MChatType.java
diff --git a/base/src/org/compiere/model/MCity.java b/org.adempiere.base/src/org/compiere/model/MCity.java
similarity index 100%
rename from base/src/org/compiere/model/MCity.java
rename to org.adempiere.base/src/org/compiere/model/MCity.java
diff --git a/base/src/org/compiere/model/MClick.java b/org.adempiere.base/src/org/compiere/model/MClick.java
similarity index 100%
rename from base/src/org/compiere/model/MClick.java
rename to org.adempiere.base/src/org/compiere/model/MClick.java
diff --git a/base/src/org/compiere/model/MClickCount.java b/org.adempiere.base/src/org/compiere/model/MClickCount.java
similarity index 100%
rename from base/src/org/compiere/model/MClickCount.java
rename to org.adempiere.base/src/org/compiere/model/MClickCount.java
diff --git a/base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java
similarity index 100%
rename from base/src/org/compiere/model/MClient.java
rename to org.adempiere.base/src/org/compiere/model/MClient.java
diff --git a/base/src/org/compiere/model/MClientInfo.java b/org.adempiere.base/src/org/compiere/model/MClientInfo.java
similarity index 100%
rename from base/src/org/compiere/model/MClientInfo.java
rename to org.adempiere.base/src/org/compiere/model/MClientInfo.java
diff --git a/base/src/org/compiere/model/MClientShare.java b/org.adempiere.base/src/org/compiere/model/MClientShare.java
similarity index 100%
rename from base/src/org/compiere/model/MClientShare.java
rename to org.adempiere.base/src/org/compiere/model/MClientShare.java
diff --git a/base/src/org/compiere/model/MColor.java b/org.adempiere.base/src/org/compiere/model/MColor.java
similarity index 100%
rename from base/src/org/compiere/model/MColor.java
rename to org.adempiere.base/src/org/compiere/model/MColor.java
diff --git a/base/src/org/compiere/model/MColorSchema.java b/org.adempiere.base/src/org/compiere/model/MColorSchema.java
similarity index 100%
rename from base/src/org/compiere/model/MColorSchema.java
rename to org.adempiere.base/src/org/compiere/model/MColorSchema.java
diff --git a/base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java
similarity index 100%
rename from base/src/org/compiere/model/MColumn.java
rename to org.adempiere.base/src/org/compiere/model/MColumn.java
diff --git a/base/src/org/compiere/model/MColumnAccess.java b/org.adempiere.base/src/org/compiere/model/MColumnAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MColumnAccess.java
rename to org.adempiere.base/src/org/compiere/model/MColumnAccess.java
diff --git a/base/src/org/compiere/model/MCommission.java b/org.adempiere.base/src/org/compiere/model/MCommission.java
similarity index 100%
rename from base/src/org/compiere/model/MCommission.java
rename to org.adempiere.base/src/org/compiere/model/MCommission.java
diff --git a/base/src/org/compiere/model/MCommissionAmt.java b/org.adempiere.base/src/org/compiere/model/MCommissionAmt.java
similarity index 100%
rename from base/src/org/compiere/model/MCommissionAmt.java
rename to org.adempiere.base/src/org/compiere/model/MCommissionAmt.java
diff --git a/base/src/org/compiere/model/MCommissionDetail.java b/org.adempiere.base/src/org/compiere/model/MCommissionDetail.java
similarity index 100%
rename from base/src/org/compiere/model/MCommissionDetail.java
rename to org.adempiere.base/src/org/compiere/model/MCommissionDetail.java
diff --git a/base/src/org/compiere/model/MCommissionLine.java b/org.adempiere.base/src/org/compiere/model/MCommissionLine.java
similarity index 100%
rename from base/src/org/compiere/model/MCommissionLine.java
rename to org.adempiere.base/src/org/compiere/model/MCommissionLine.java
diff --git a/base/src/org/compiere/model/MCommissionRun.java b/org.adempiere.base/src/org/compiere/model/MCommissionRun.java
similarity index 100%
rename from base/src/org/compiere/model/MCommissionRun.java
rename to org.adempiere.base/src/org/compiere/model/MCommissionRun.java
diff --git a/base/src/org/compiere/model/MContactInterest.java b/org.adempiere.base/src/org/compiere/model/MContactInterest.java
similarity index 100%
rename from base/src/org/compiere/model/MContactInterest.java
rename to org.adempiere.base/src/org/compiere/model/MContactInterest.java
diff --git a/base/src/org/compiere/model/MContainer.java b/org.adempiere.base/src/org/compiere/model/MContainer.java
similarity index 100%
rename from base/src/org/compiere/model/MContainer.java
rename to org.adempiere.base/src/org/compiere/model/MContainer.java
diff --git a/base/src/org/compiere/model/MContainerElement.java b/org.adempiere.base/src/org/compiere/model/MContainerElement.java
similarity index 100%
rename from base/src/org/compiere/model/MContainerElement.java
rename to org.adempiere.base/src/org/compiere/model/MContainerElement.java
diff --git a/base/src/org/compiere/model/MConversionRate.java b/org.adempiere.base/src/org/compiere/model/MConversionRate.java
similarity index 100%
rename from base/src/org/compiere/model/MConversionRate.java
rename to org.adempiere.base/src/org/compiere/model/MConversionRate.java
diff --git a/base/src/org/compiere/model/MConversionType.java b/org.adempiere.base/src/org/compiere/model/MConversionType.java
similarity index 100%
rename from base/src/org/compiere/model/MConversionType.java
rename to org.adempiere.base/src/org/compiere/model/MConversionType.java
diff --git a/base/src/org/compiere/model/MCost.java b/org.adempiere.base/src/org/compiere/model/MCost.java
similarity index 100%
rename from base/src/org/compiere/model/MCost.java
rename to org.adempiere.base/src/org/compiere/model/MCost.java
diff --git a/base/src/org/compiere/model/MCostDetail.java b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
similarity index 100%
rename from base/src/org/compiere/model/MCostDetail.java
rename to org.adempiere.base/src/org/compiere/model/MCostDetail.java
diff --git a/base/src/org/compiere/model/MCostElement.java b/org.adempiere.base/src/org/compiere/model/MCostElement.java
similarity index 100%
rename from base/src/org/compiere/model/MCostElement.java
rename to org.adempiere.base/src/org/compiere/model/MCostElement.java
diff --git a/base/src/org/compiere/model/MCostQueue.java b/org.adempiere.base/src/org/compiere/model/MCostQueue.java
similarity index 100%
rename from base/src/org/compiere/model/MCostQueue.java
rename to org.adempiere.base/src/org/compiere/model/MCostQueue.java
diff --git a/base/src/org/compiere/model/MCostType.java b/org.adempiere.base/src/org/compiere/model/MCostType.java
similarity index 100%
rename from base/src/org/compiere/model/MCostType.java
rename to org.adempiere.base/src/org/compiere/model/MCostType.java
diff --git a/base/src/org/compiere/model/MCounterCount.java b/org.adempiere.base/src/org/compiere/model/MCounterCount.java
similarity index 100%
rename from base/src/org/compiere/model/MCounterCount.java
rename to org.adempiere.base/src/org/compiere/model/MCounterCount.java
diff --git a/base/src/org/compiere/model/MCountry.java b/org.adempiere.base/src/org/compiere/model/MCountry.java
similarity index 100%
rename from base/src/org/compiere/model/MCountry.java
rename to org.adempiere.base/src/org/compiere/model/MCountry.java
diff --git a/base/src/org/compiere/model/MCurrency.java b/org.adempiere.base/src/org/compiere/model/MCurrency.java
similarity index 100%
rename from base/src/org/compiere/model/MCurrency.java
rename to org.adempiere.base/src/org/compiere/model/MCurrency.java
diff --git a/base/src/org/compiere/model/MCurrencyAcct.java b/org.adempiere.base/src/org/compiere/model/MCurrencyAcct.java
similarity index 100%
rename from base/src/org/compiere/model/MCurrencyAcct.java
rename to org.adempiere.base/src/org/compiere/model/MCurrencyAcct.java
diff --git a/base/src/org/compiere/model/MDashboardContent.java b/org.adempiere.base/src/org/compiere/model/MDashboardContent.java
similarity index 100%
rename from base/src/org/compiere/model/MDashboardContent.java
rename to org.adempiere.base/src/org/compiere/model/MDashboardContent.java
diff --git a/base/src/org/compiere/model/MDepreciationWorkfile.java b/org.adempiere.base/src/org/compiere/model/MDepreciationWorkfile.java
similarity index 100%
rename from base/src/org/compiere/model/MDepreciationWorkfile.java
rename to org.adempiere.base/src/org/compiere/model/MDepreciationWorkfile.java
diff --git a/base/src/org/compiere/model/MDesktop.java b/org.adempiere.base/src/org/compiere/model/MDesktop.java
similarity index 100%
rename from base/src/org/compiere/model/MDesktop.java
rename to org.adempiere.base/src/org/compiere/model/MDesktop.java
diff --git a/base/src/org/compiere/model/MDiscountSchema.java b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
similarity index 100%
rename from base/src/org/compiere/model/MDiscountSchema.java
rename to org.adempiere.base/src/org/compiere/model/MDiscountSchema.java
diff --git a/base/src/org/compiere/model/MDiscountSchemaBreak.java b/org.adempiere.base/src/org/compiere/model/MDiscountSchemaBreak.java
similarity index 100%
rename from base/src/org/compiere/model/MDiscountSchemaBreak.java
rename to org.adempiere.base/src/org/compiere/model/MDiscountSchemaBreak.java
diff --git a/base/src/org/compiere/model/MDiscountSchemaLine.java b/org.adempiere.base/src/org/compiere/model/MDiscountSchemaLine.java
similarity index 100%
rename from base/src/org/compiere/model/MDiscountSchemaLine.java
rename to org.adempiere.base/src/org/compiere/model/MDiscountSchemaLine.java
diff --git a/base/src/org/compiere/model/MDistribution.java b/org.adempiere.base/src/org/compiere/model/MDistribution.java
similarity index 100%
rename from base/src/org/compiere/model/MDistribution.java
rename to org.adempiere.base/src/org/compiere/model/MDistribution.java
diff --git a/base/src/org/compiere/model/MDistributionLine.java b/org.adempiere.base/src/org/compiere/model/MDistributionLine.java
similarity index 100%
rename from base/src/org/compiere/model/MDistributionLine.java
rename to org.adempiere.base/src/org/compiere/model/MDistributionLine.java
diff --git a/base/src/org/compiere/model/MDistributionList.java b/org.adempiere.base/src/org/compiere/model/MDistributionList.java
similarity index 100%
rename from base/src/org/compiere/model/MDistributionList.java
rename to org.adempiere.base/src/org/compiere/model/MDistributionList.java
diff --git a/base/src/org/compiere/model/MDistributionListLine.java b/org.adempiere.base/src/org/compiere/model/MDistributionListLine.java
similarity index 100%
rename from base/src/org/compiere/model/MDistributionListLine.java
rename to org.adempiere.base/src/org/compiere/model/MDistributionListLine.java
diff --git a/base/src/org/compiere/model/MDistributionRun.java b/org.adempiere.base/src/org/compiere/model/MDistributionRun.java
similarity index 100%
rename from base/src/org/compiere/model/MDistributionRun.java
rename to org.adempiere.base/src/org/compiere/model/MDistributionRun.java
diff --git a/base/src/org/compiere/model/MDistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java
similarity index 100%
rename from base/src/org/compiere/model/MDistributionRunDetail.java
rename to org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java
diff --git a/base/src/org/compiere/model/MDistributionRunLine.java b/org.adempiere.base/src/org/compiere/model/MDistributionRunLine.java
similarity index 100%
rename from base/src/org/compiere/model/MDistributionRunLine.java
rename to org.adempiere.base/src/org/compiere/model/MDistributionRunLine.java
diff --git a/base/src/org/compiere/model/MDocType.java b/org.adempiere.base/src/org/compiere/model/MDocType.java
similarity index 100%
rename from base/src/org/compiere/model/MDocType.java
rename to org.adempiere.base/src/org/compiere/model/MDocType.java
diff --git a/base/src/org/compiere/model/MDocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
similarity index 100%
rename from base/src/org/compiere/model/MDocTypeCounter.java
rename to org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java
diff --git a/base/src/org/compiere/model/MDunning.java b/org.adempiere.base/src/org/compiere/model/MDunning.java
similarity index 100%
rename from base/src/org/compiere/model/MDunning.java
rename to org.adempiere.base/src/org/compiere/model/MDunning.java
diff --git a/base/src/org/compiere/model/MDunningLevel.java b/org.adempiere.base/src/org/compiere/model/MDunningLevel.java
similarity index 100%
rename from base/src/org/compiere/model/MDunningLevel.java
rename to org.adempiere.base/src/org/compiere/model/MDunningLevel.java
diff --git a/base/src/org/compiere/model/MDunningRun.java b/org.adempiere.base/src/org/compiere/model/MDunningRun.java
similarity index 100%
rename from base/src/org/compiere/model/MDunningRun.java
rename to org.adempiere.base/src/org/compiere/model/MDunningRun.java
diff --git a/base/src/org/compiere/model/MDunningRunEntry.java b/org.adempiere.base/src/org/compiere/model/MDunningRunEntry.java
similarity index 100%
rename from base/src/org/compiere/model/MDunningRunEntry.java
rename to org.adempiere.base/src/org/compiere/model/MDunningRunEntry.java
diff --git a/base/src/org/compiere/model/MDunningRunLine.java b/org.adempiere.base/src/org/compiere/model/MDunningRunLine.java
similarity index 100%
rename from base/src/org/compiere/model/MDunningRunLine.java
rename to org.adempiere.base/src/org/compiere/model/MDunningRunLine.java
diff --git a/base/src/org/compiere/model/MEXPFormat.java b/org.adempiere.base/src/org/compiere/model/MEXPFormat.java
similarity index 100%
rename from base/src/org/compiere/model/MEXPFormat.java
rename to org.adempiere.base/src/org/compiere/model/MEXPFormat.java
diff --git a/base/src/org/compiere/model/MEXPFormatLine.java b/org.adempiere.base/src/org/compiere/model/MEXPFormatLine.java
similarity index 100%
rename from base/src/org/compiere/model/MEXPFormatLine.java
rename to org.adempiere.base/src/org/compiere/model/MEXPFormatLine.java
diff --git a/base/src/org/compiere/model/MEXPProcessor.java b/org.adempiere.base/src/org/compiere/model/MEXPProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/MEXPProcessor.java
rename to org.adempiere.base/src/org/compiere/model/MEXPProcessor.java
diff --git a/base/src/org/compiere/model/MEXPProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/MEXPProcessorParameter.java
similarity index 100%
rename from base/src/org/compiere/model/MEXPProcessorParameter.java
rename to org.adempiere.base/src/org/compiere/model/MEXPProcessorParameter.java
diff --git a/base/src/org/compiere/model/MEXPProcessorType.java b/org.adempiere.base/src/org/compiere/model/MEXPProcessorType.java
similarity index 100%
rename from base/src/org/compiere/model/MEXPProcessorType.java
rename to org.adempiere.base/src/org/compiere/model/MEXPProcessorType.java
diff --git a/base/src/org/compiere/model/MElement.java b/org.adempiere.base/src/org/compiere/model/MElement.java
similarity index 100%
rename from base/src/org/compiere/model/MElement.java
rename to org.adempiere.base/src/org/compiere/model/MElement.java
diff --git a/base/src/org/compiere/model/MElementValue.java b/org.adempiere.base/src/org/compiere/model/MElementValue.java
similarity index 100%
rename from base/src/org/compiere/model/MElementValue.java
rename to org.adempiere.base/src/org/compiere/model/MElementValue.java
diff --git a/base/src/org/compiere/model/MEntityType.java b/org.adempiere.base/src/org/compiere/model/MEntityType.java
similarity index 100%
rename from base/src/org/compiere/model/MEntityType.java
rename to org.adempiere.base/src/org/compiere/model/MEntityType.java
diff --git a/base/src/org/compiere/model/MExpenseType.java b/org.adempiere.base/src/org/compiere/model/MExpenseType.java
similarity index 100%
rename from base/src/org/compiere/model/MExpenseType.java
rename to org.adempiere.base/src/org/compiere/model/MExpenseType.java
diff --git a/base/src/org/compiere/model/MFactAcct.java b/org.adempiere.base/src/org/compiere/model/MFactAcct.java
similarity index 100%
rename from base/src/org/compiere/model/MFactAcct.java
rename to org.adempiere.base/src/org/compiere/model/MFactAcct.java
diff --git a/base/src/org/compiere/model/MField.java b/org.adempiere.base/src/org/compiere/model/MField.java
similarity index 100%
rename from base/src/org/compiere/model/MField.java
rename to org.adempiere.base/src/org/compiere/model/MField.java
diff --git a/base/src/org/compiere/model/MForecast.java b/org.adempiere.base/src/org/compiere/model/MForecast.java
similarity index 100%
rename from base/src/org/compiere/model/MForecast.java
rename to org.adempiere.base/src/org/compiere/model/MForecast.java
diff --git a/base/src/org/compiere/model/MForecastLine.java b/org.adempiere.base/src/org/compiere/model/MForecastLine.java
similarity index 100%
rename from base/src/org/compiere/model/MForecastLine.java
rename to org.adempiere.base/src/org/compiere/model/MForecastLine.java
diff --git a/base/src/org/compiere/model/MForm.java b/org.adempiere.base/src/org/compiere/model/MForm.java
similarity index 100%
rename from base/src/org/compiere/model/MForm.java
rename to org.adempiere.base/src/org/compiere/model/MForm.java
diff --git a/base/src/org/compiere/model/MFormAccess.java b/org.adempiere.base/src/org/compiere/model/MFormAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MFormAccess.java
rename to org.adempiere.base/src/org/compiere/model/MFormAccess.java
diff --git a/base/src/org/compiere/model/MFreightCategory.java b/org.adempiere.base/src/org/compiere/model/MFreightCategory.java
similarity index 100%
rename from base/src/org/compiere/model/MFreightCategory.java
rename to org.adempiere.base/src/org/compiere/model/MFreightCategory.java
diff --git a/base/src/org/compiere/model/MGLCategory.java b/org.adempiere.base/src/org/compiere/model/MGLCategory.java
similarity index 100%
rename from base/src/org/compiere/model/MGLCategory.java
rename to org.adempiere.base/src/org/compiere/model/MGLCategory.java
diff --git a/base/src/org/compiere/model/MGoal.java b/org.adempiere.base/src/org/compiere/model/MGoal.java
similarity index 100%
rename from base/src/org/compiere/model/MGoal.java
rename to org.adempiere.base/src/org/compiere/model/MGoal.java
diff --git a/base/src/org/compiere/model/MGoalRestriction.java b/org.adempiere.base/src/org/compiere/model/MGoalRestriction.java
similarity index 100%
rename from base/src/org/compiere/model/MGoalRestriction.java
rename to org.adempiere.base/src/org/compiere/model/MGoalRestriction.java
diff --git a/base/src/org/compiere/model/MGroup.java b/org.adempiere.base/src/org/compiere/model/MGroup.java
similarity index 100%
rename from base/src/org/compiere/model/MGroup.java
rename to org.adempiere.base/src/org/compiere/model/MGroup.java
diff --git a/base/src/org/compiere/model/MHierarchy.java b/org.adempiere.base/src/org/compiere/model/MHierarchy.java
similarity index 100%
rename from base/src/org/compiere/model/MHierarchy.java
rename to org.adempiere.base/src/org/compiere/model/MHierarchy.java
diff --git a/base/src/org/compiere/model/MIMPProcessor.java b/org.adempiere.base/src/org/compiere/model/MIMPProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/MIMPProcessor.java
rename to org.adempiere.base/src/org/compiere/model/MIMPProcessor.java
diff --git a/base/src/org/compiere/model/MIMPProcessorLog.java b/org.adempiere.base/src/org/compiere/model/MIMPProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/MIMPProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/MIMPProcessorLog.java
diff --git a/base/src/org/compiere/model/MImage.java b/org.adempiere.base/src/org/compiere/model/MImage.java
similarity index 100%
rename from base/src/org/compiere/model/MImage.java
rename to org.adempiere.base/src/org/compiere/model/MImage.java
diff --git a/base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java
similarity index 99%
rename from base/src/org/compiere/model/MInOut.java
rename to org.adempiere.base/src/org/compiere/model/MInOut.java
index aba57689d2..8892f67b99 100644
--- a/base/src/org/compiere/model/MInOut.java
+++ b/org.adempiere.base/src/org/compiere/model/MInOut.java
@@ -26,7 +26,6 @@ import java.util.Properties;
import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
-import org.adempiere.process.AllocateSalesOrders;
import org.compiere.print.ReportEngine;
import org.compiere.process.DocAction;
import org.compiere.process.DocumentEngine;
diff --git a/base/src/org/compiere/model/MInOutConfirm.java b/org.adempiere.base/src/org/compiere/model/MInOutConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/MInOutConfirm.java
rename to org.adempiere.base/src/org/compiere/model/MInOutConfirm.java
diff --git a/base/src/org/compiere/model/MInOutLine.java b/org.adempiere.base/src/org/compiere/model/MInOutLine.java
similarity index 100%
rename from base/src/org/compiere/model/MInOutLine.java
rename to org.adempiere.base/src/org/compiere/model/MInOutLine.java
diff --git a/base/src/org/compiere/model/MInOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/MInOutLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/MInOutLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/MInOutLineConfirm.java
diff --git a/base/src/org/compiere/model/MInOutLineMA.java b/org.adempiere.base/src/org/compiere/model/MInOutLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/MInOutLineMA.java
rename to org.adempiere.base/src/org/compiere/model/MInOutLineMA.java
diff --git a/base/src/org/compiere/model/MIndex.java b/org.adempiere.base/src/org/compiere/model/MIndex.java
similarity index 100%
rename from base/src/org/compiere/model/MIndex.java
rename to org.adempiere.base/src/org/compiere/model/MIndex.java
diff --git a/base/src/org/compiere/model/MIndexStop.java b/org.adempiere.base/src/org/compiere/model/MIndexStop.java
similarity index 100%
rename from base/src/org/compiere/model/MIndexStop.java
rename to org.adempiere.base/src/org/compiere/model/MIndexStop.java
diff --git a/base/src/org/compiere/model/MInfoColumn.java b/org.adempiere.base/src/org/compiere/model/MInfoColumn.java
similarity index 100%
rename from base/src/org/compiere/model/MInfoColumn.java
rename to org.adempiere.base/src/org/compiere/model/MInfoColumn.java
diff --git a/base/src/org/compiere/model/MInfoWindow.java b/org.adempiere.base/src/org/compiere/model/MInfoWindow.java
similarity index 100%
rename from base/src/org/compiere/model/MInfoWindow.java
rename to org.adempiere.base/src/org/compiere/model/MInfoWindow.java
diff --git a/base/src/org/compiere/model/MInterestArea.java b/org.adempiere.base/src/org/compiere/model/MInterestArea.java
similarity index 100%
rename from base/src/org/compiere/model/MInterestArea.java
rename to org.adempiere.base/src/org/compiere/model/MInterestArea.java
diff --git a/base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java
similarity index 100%
rename from base/src/org/compiere/model/MInventory.java
rename to org.adempiere.base/src/org/compiere/model/MInventory.java
diff --git a/base/src/org/compiere/model/MInventoryLine.java b/org.adempiere.base/src/org/compiere/model/MInventoryLine.java
similarity index 100%
rename from base/src/org/compiere/model/MInventoryLine.java
rename to org.adempiere.base/src/org/compiere/model/MInventoryLine.java
diff --git a/base/src/org/compiere/model/MInventoryLineMA.java b/org.adempiere.base/src/org/compiere/model/MInventoryLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/MInventoryLineMA.java
rename to org.adempiere.base/src/org/compiere/model/MInventoryLineMA.java
diff --git a/base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java
similarity index 100%
rename from base/src/org/compiere/model/MInvoice.java
rename to org.adempiere.base/src/org/compiere/model/MInvoice.java
diff --git a/base/src/org/compiere/model/MInvoiceBatch.java b/org.adempiere.base/src/org/compiere/model/MInvoiceBatch.java
similarity index 100%
rename from base/src/org/compiere/model/MInvoiceBatch.java
rename to org.adempiere.base/src/org/compiere/model/MInvoiceBatch.java
diff --git a/base/src/org/compiere/model/MInvoiceBatchLine.java b/org.adempiere.base/src/org/compiere/model/MInvoiceBatchLine.java
similarity index 100%
rename from base/src/org/compiere/model/MInvoiceBatchLine.java
rename to org.adempiere.base/src/org/compiere/model/MInvoiceBatchLine.java
diff --git a/base/src/org/compiere/model/MInvoiceLine.java b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
similarity index 100%
rename from base/src/org/compiere/model/MInvoiceLine.java
rename to org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
diff --git a/base/src/org/compiere/model/MInvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
similarity index 100%
rename from base/src/org/compiere/model/MInvoicePaySchedule.java
rename to org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java
diff --git a/base/src/org/compiere/model/MInvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
similarity index 100%
rename from base/src/org/compiere/model/MInvoiceSchedule.java
rename to org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java
diff --git a/base/src/org/compiere/model/MInvoiceTax.java b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
similarity index 100%
rename from base/src/org/compiere/model/MInvoiceTax.java
rename to org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
diff --git a/base/src/org/compiere/model/MIssue.java b/org.adempiere.base/src/org/compiere/model/MIssue.java
similarity index 100%
rename from base/src/org/compiere/model/MIssue.java
rename to org.adempiere.base/src/org/compiere/model/MIssue.java
diff --git a/base/src/org/compiere/model/MIssueProject.java b/org.adempiere.base/src/org/compiere/model/MIssueProject.java
similarity index 100%
rename from base/src/org/compiere/model/MIssueProject.java
rename to org.adempiere.base/src/org/compiere/model/MIssueProject.java
diff --git a/base/src/org/compiere/model/MIssueSystem.java b/org.adempiere.base/src/org/compiere/model/MIssueSystem.java
similarity index 100%
rename from base/src/org/compiere/model/MIssueSystem.java
rename to org.adempiere.base/src/org/compiere/model/MIssueSystem.java
diff --git a/base/src/org/compiere/model/MIssueUser.java b/org.adempiere.base/src/org/compiere/model/MIssueUser.java
similarity index 100%
rename from base/src/org/compiere/model/MIssueUser.java
rename to org.adempiere.base/src/org/compiere/model/MIssueUser.java
diff --git a/base/src/org/compiere/model/MJournal.java b/org.adempiere.base/src/org/compiere/model/MJournal.java
similarity index 100%
rename from base/src/org/compiere/model/MJournal.java
rename to org.adempiere.base/src/org/compiere/model/MJournal.java
diff --git a/base/src/org/compiere/model/MJournalBatch.java b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java
similarity index 100%
rename from base/src/org/compiere/model/MJournalBatch.java
rename to org.adempiere.base/src/org/compiere/model/MJournalBatch.java
diff --git a/base/src/org/compiere/model/MJournalLine.java b/org.adempiere.base/src/org/compiere/model/MJournalLine.java
similarity index 100%
rename from base/src/org/compiere/model/MJournalLine.java
rename to org.adempiere.base/src/org/compiere/model/MJournalLine.java
diff --git a/base/src/org/compiere/model/MKCategory.java b/org.adempiere.base/src/org/compiere/model/MKCategory.java
similarity index 100%
rename from base/src/org/compiere/model/MKCategory.java
rename to org.adempiere.base/src/org/compiere/model/MKCategory.java
diff --git a/base/src/org/compiere/model/MLandedCost.java b/org.adempiere.base/src/org/compiere/model/MLandedCost.java
similarity index 100%
rename from base/src/org/compiere/model/MLandedCost.java
rename to org.adempiere.base/src/org/compiere/model/MLandedCost.java
diff --git a/base/src/org/compiere/model/MLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java
similarity index 100%
rename from base/src/org/compiere/model/MLandedCostAllocation.java
rename to org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java
diff --git a/base/src/org/compiere/model/MLanguage.java b/org.adempiere.base/src/org/compiere/model/MLanguage.java
similarity index 100%
rename from base/src/org/compiere/model/MLanguage.java
rename to org.adempiere.base/src/org/compiere/model/MLanguage.java
diff --git a/base/src/org/compiere/model/MLdapAccess.java b/org.adempiere.base/src/org/compiere/model/MLdapAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MLdapAccess.java
rename to org.adempiere.base/src/org/compiere/model/MLdapAccess.java
diff --git a/base/src/org/compiere/model/MLdapProcessor.java b/org.adempiere.base/src/org/compiere/model/MLdapProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/MLdapProcessor.java
rename to org.adempiere.base/src/org/compiere/model/MLdapProcessor.java
diff --git a/base/src/org/compiere/model/MLdapProcessorLog.java b/org.adempiere.base/src/org/compiere/model/MLdapProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/MLdapProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/MLdapProcessorLog.java
diff --git a/base/src/org/compiere/model/MLdapUser.java b/org.adempiere.base/src/org/compiere/model/MLdapUser.java
similarity index 100%
rename from base/src/org/compiere/model/MLdapUser.java
rename to org.adempiere.base/src/org/compiere/model/MLdapUser.java
diff --git a/base/src/org/compiere/model/MLocation.java b/org.adempiere.base/src/org/compiere/model/MLocation.java
similarity index 100%
rename from base/src/org/compiere/model/MLocation.java
rename to org.adempiere.base/src/org/compiere/model/MLocation.java
diff --git a/base/src/org/compiere/model/MLocationLookup.java b/org.adempiere.base/src/org/compiere/model/MLocationLookup.java
similarity index 100%
rename from base/src/org/compiere/model/MLocationLookup.java
rename to org.adempiere.base/src/org/compiere/model/MLocationLookup.java
diff --git a/base/src/org/compiere/model/MLocator.java b/org.adempiere.base/src/org/compiere/model/MLocator.java
similarity index 100%
rename from base/src/org/compiere/model/MLocator.java
rename to org.adempiere.base/src/org/compiere/model/MLocator.java
diff --git a/base/src/org/compiere/model/MLocatorLookup.java b/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java
similarity index 100%
rename from base/src/org/compiere/model/MLocatorLookup.java
rename to org.adempiere.base/src/org/compiere/model/MLocatorLookup.java
diff --git a/base/src/org/compiere/model/MLookup.java b/org.adempiere.base/src/org/compiere/model/MLookup.java
similarity index 100%
rename from base/src/org/compiere/model/MLookup.java
rename to org.adempiere.base/src/org/compiere/model/MLookup.java
diff --git a/base/src/org/compiere/model/MLookupCache.java b/org.adempiere.base/src/org/compiere/model/MLookupCache.java
similarity index 100%
rename from base/src/org/compiere/model/MLookupCache.java
rename to org.adempiere.base/src/org/compiere/model/MLookupCache.java
diff --git a/base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
similarity index 100%
rename from base/src/org/compiere/model/MLookupFactory.java
rename to org.adempiere.base/src/org/compiere/model/MLookupFactory.java
diff --git a/base/src/org/compiere/model/MLookupInfo.java b/org.adempiere.base/src/org/compiere/model/MLookupInfo.java
similarity index 100%
rename from base/src/org/compiere/model/MLookupInfo.java
rename to org.adempiere.base/src/org/compiere/model/MLookupInfo.java
diff --git a/base/src/org/compiere/model/MLot.java b/org.adempiere.base/src/org/compiere/model/MLot.java
similarity index 100%
rename from base/src/org/compiere/model/MLot.java
rename to org.adempiere.base/src/org/compiere/model/MLot.java
diff --git a/base/src/org/compiere/model/MLotCtl.java b/org.adempiere.base/src/org/compiere/model/MLotCtl.java
similarity index 100%
rename from base/src/org/compiere/model/MLotCtl.java
rename to org.adempiere.base/src/org/compiere/model/MLotCtl.java
diff --git a/base/src/org/compiere/model/MMailMsg.java b/org.adempiere.base/src/org/compiere/model/MMailMsg.java
similarity index 100%
rename from base/src/org/compiere/model/MMailMsg.java
rename to org.adempiere.base/src/org/compiere/model/MMailMsg.java
diff --git a/base/src/org/compiere/model/MMailText.java b/org.adempiere.base/src/org/compiere/model/MMailText.java
similarity index 100%
rename from base/src/org/compiere/model/MMailText.java
rename to org.adempiere.base/src/org/compiere/model/MMailText.java
diff --git a/base/src/org/compiere/model/MMatchInv.java b/org.adempiere.base/src/org/compiere/model/MMatchInv.java
similarity index 100%
rename from base/src/org/compiere/model/MMatchInv.java
rename to org.adempiere.base/src/org/compiere/model/MMatchInv.java
diff --git a/base/src/org/compiere/model/MMatchPO.java b/org.adempiere.base/src/org/compiere/model/MMatchPO.java
similarity index 100%
rename from base/src/org/compiere/model/MMatchPO.java
rename to org.adempiere.base/src/org/compiere/model/MMatchPO.java
diff --git a/base/src/org/compiere/model/MMeasure.java b/org.adempiere.base/src/org/compiere/model/MMeasure.java
similarity index 100%
rename from base/src/org/compiere/model/MMeasure.java
rename to org.adempiere.base/src/org/compiere/model/MMeasure.java
diff --git a/base/src/org/compiere/model/MMeasureCalc.java b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
similarity index 100%
rename from base/src/org/compiere/model/MMeasureCalc.java
rename to org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
diff --git a/base/src/org/compiere/model/MMedia.java b/org.adempiere.base/src/org/compiere/model/MMedia.java
similarity index 100%
rename from base/src/org/compiere/model/MMedia.java
rename to org.adempiere.base/src/org/compiere/model/MMedia.java
diff --git a/base/src/org/compiere/model/MMediaDeploy.java b/org.adempiere.base/src/org/compiere/model/MMediaDeploy.java
similarity index 100%
rename from base/src/org/compiere/model/MMediaDeploy.java
rename to org.adempiere.base/src/org/compiere/model/MMediaDeploy.java
diff --git a/base/src/org/compiere/model/MMediaServer.java b/org.adempiere.base/src/org/compiere/model/MMediaServer.java
similarity index 100%
rename from base/src/org/compiere/model/MMediaServer.java
rename to org.adempiere.base/src/org/compiere/model/MMediaServer.java
diff --git a/base/src/org/compiere/model/MMenu.java b/org.adempiere.base/src/org/compiere/model/MMenu.java
similarity index 100%
rename from base/src/org/compiere/model/MMenu.java
rename to org.adempiere.base/src/org/compiere/model/MMenu.java
diff --git a/base/src/org/compiere/model/MMessage.java b/org.adempiere.base/src/org/compiere/model/MMessage.java
similarity index 100%
rename from base/src/org/compiere/model/MMessage.java
rename to org.adempiere.base/src/org/compiere/model/MMessage.java
diff --git a/base/src/org/compiere/model/MMovement.java b/org.adempiere.base/src/org/compiere/model/MMovement.java
similarity index 100%
rename from base/src/org/compiere/model/MMovement.java
rename to org.adempiere.base/src/org/compiere/model/MMovement.java
diff --git a/base/src/org/compiere/model/MMovementConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/MMovementConfirm.java
rename to org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
diff --git a/base/src/org/compiere/model/MMovementLine.java b/org.adempiere.base/src/org/compiere/model/MMovementLine.java
similarity index 100%
rename from base/src/org/compiere/model/MMovementLine.java
rename to org.adempiere.base/src/org/compiere/model/MMovementLine.java
diff --git a/base/src/org/compiere/model/MMovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/MMovementLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/MMovementLineConfirm.java
diff --git a/base/src/org/compiere/model/MMovementLineMA.java b/org.adempiere.base/src/org/compiere/model/MMovementLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/MMovementLineMA.java
rename to org.adempiere.base/src/org/compiere/model/MMovementLineMA.java
diff --git a/base/src/org/compiere/model/MNewsChannel.java b/org.adempiere.base/src/org/compiere/model/MNewsChannel.java
similarity index 100%
rename from base/src/org/compiere/model/MNewsChannel.java
rename to org.adempiere.base/src/org/compiere/model/MNewsChannel.java
diff --git a/base/src/org/compiere/model/MNewsItem.java b/org.adempiere.base/src/org/compiere/model/MNewsItem.java
similarity index 100%
rename from base/src/org/compiere/model/MNewsItem.java
rename to org.adempiere.base/src/org/compiere/model/MNewsItem.java
diff --git a/base/src/org/compiere/model/MNote.java b/org.adempiere.base/src/org/compiere/model/MNote.java
similarity index 100%
rename from base/src/org/compiere/model/MNote.java
rename to org.adempiere.base/src/org/compiere/model/MNote.java
diff --git a/base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java
similarity index 95%
rename from base/src/org/compiere/model/MOrder.java
rename to org.adempiere.base/src/org/compiere/model/MOrder.java
index 12b3a339d7..987f6a2c4e 100644
--- a/base/src/org/compiere/model/MOrder.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrder.java
@@ -18,11 +18,15 @@ package org.compiere.model;
import java.io.File;
import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import java.util.Vector;
import java.util.logging.Level;
import java.util.regex.Pattern;
@@ -2427,5 +2431,92 @@ public class MOrder extends X_C_Order implements DocAction
|| DOCSTATUS_Closed.equals(ds)
|| DOCSTATUS_Reversed.equals(ds);
} // isComplete
+
+ private static final String OrderLinesToAllocate = "select C_OrderLine.* from C_OrderLine " +
+ "JOIN C_Order ON C_OrderLine.C_Order_ID=C_Order.C_Order_ID " +
+ "JOIN M_Product ON C_OrderLine.M_Product_ID=M_Product.M_Product_ID " +
+ "where C_Order.IsSOTrx='Y' AND C_Order.DocStatus='CO' AND QtyAllocated<(QtyOrdered-QtyDelivered) " +
+ "AND M_Product.M_Product_ID=? " +
+ "order by PriorityRule, C_OrderLine.Created ";
+ /**
+ * Finds all order lines that contains not yet delivered physical items of a specific product.
+ *
+ * @param conn An open connection.
+ * @param productId The product id being allocated
+ * @return Order lines to allocate products to.
+ * @throws SQLException
+ */
+ public static List getOrderLinesToAllocate(Connection conn, int productId, String trxName) throws SQLException {
+ List result = new Vector();
+ Properties ctx = Env.getCtx();
+ MOrderLine line;
+ PreparedStatement ps = conn.prepareStatement(OrderLinesToAllocate);
+ ps.setInt(1, productId);
+ ResultSet rs = ps.executeQuery();
+ while(rs.next()) {
+ line = new MOrderLine(ctx, rs, trxName);
+ result.add(line);
+ }
+ rs.close();
+ ps.close();
+ return(result);
+ }
+
+ /**
+ * Finds all products that can be allocated. A product can be allocated if there are more items
+ * on hand than what is already allocated. To be allocated the item must also be in demand
+ * (reserved < allocated)
+ *
+ * @param conn
+ * @return
+ * @throws SQLException
+ */
+ public static List getProductsToAllocate(Connection conn, int WarehouseID) throws SQLException {
+
+ List result = new Vector();
+ StockInfo si;
+ String query1 = "select M_Product_ID, sum(qtyonhand), sum(qtyreserved), sum(m_Product_Stock_v.qtyallocated) " +
+ "from M_Product_Stock_v " +
+ "WHERE M_Warehouse_ID=? AND M_Product_ID in " +
+ "(select DISTINCT C_OrderLine.M_Product_ID FROM C_OrderLine " +
+ "JOIN C_Order ON C_OrderLine.C_Order_ID=C_Order.C_Order_ID " +
+ "JOIN M_Product ON C_OrderLine.M_Product_ID=M_Product.M_Product_ID " +
+ "JOIN M_Product_Stock_v ON C_OrderLine.M_Product_ID=M_Product_Stock_v.M_Product_ID " +
+ "WHERE " +
+ "C_Order.IsSOTrx='Y' AND C_Order.DocStatus='CO' AND C_OrderLine.M_Warehouse_ID=? AND " +
+ "(QtyOrdered-QtyDelivered)>0 AND (QtyOrdered-QtyDelivered)>C_OrderLine.QtyAllocated)" +
+ "group by M_Product_ID " +
+ "order by M_Product_ID";
+
+ PreparedStatement ps = conn.prepareStatement(query1);
+ ps.setInt(1, WarehouseID);
+ ps.setInt(2, WarehouseID);
+ ResultSet rs = ps.executeQuery();
+
+ while(rs.next()) {
+ si = new StockInfo();
+ si.productId = rs.getInt(1);
+ si.qtyOnHand = rs.getBigDecimal(2);
+ si.qtyReserved = rs.getBigDecimal(3);
+ si.qtyAvailable = si.qtyOnHand.subtract(si.qtyReserved);
+ si.qtyAllocated = rs.getBigDecimal(4);
+ result.add(si);
+ }
+ rs.close();
+ ps.close();
+ return(result);
+ }
+
+ public static class StockInfo {
+
+ public int productId;
+ public BigDecimal qtyOnHand;
+ public BigDecimal qtyAvailable;
+ public BigDecimal qtyReserved;
+ public BigDecimal qtyAllocated;
+
+ public StockInfo() {}
+
+ }
} // MOrder
diff --git a/base/src/org/compiere/model/MOrderLine.java b/org.adempiere.base/src/org/compiere/model/MOrderLine.java
similarity index 100%
rename from base/src/org/compiere/model/MOrderLine.java
rename to org.adempiere.base/src/org/compiere/model/MOrderLine.java
diff --git a/base/src/org/compiere/model/MOrderTax.java b/org.adempiere.base/src/org/compiere/model/MOrderTax.java
similarity index 100%
rename from base/src/org/compiere/model/MOrderTax.java
rename to org.adempiere.base/src/org/compiere/model/MOrderTax.java
diff --git a/base/src/org/compiere/model/MOrg.java b/org.adempiere.base/src/org/compiere/model/MOrg.java
similarity index 100%
rename from base/src/org/compiere/model/MOrg.java
rename to org.adempiere.base/src/org/compiere/model/MOrg.java
diff --git a/base/src/org/compiere/model/MOrgInfo.java b/org.adempiere.base/src/org/compiere/model/MOrgInfo.java
similarity index 100%
rename from base/src/org/compiere/model/MOrgInfo.java
rename to org.adempiere.base/src/org/compiere/model/MOrgInfo.java
diff --git a/base/src/org/compiere/model/MPAttributeLookup.java b/org.adempiere.base/src/org/compiere/model/MPAttributeLookup.java
similarity index 100%
rename from base/src/org/compiere/model/MPAttributeLookup.java
rename to org.adempiere.base/src/org/compiere/model/MPAttributeLookup.java
diff --git a/base/src/org/compiere/model/MPInstance.java b/org.adempiere.base/src/org/compiere/model/MPInstance.java
similarity index 100%
rename from base/src/org/compiere/model/MPInstance.java
rename to org.adempiere.base/src/org/compiere/model/MPInstance.java
diff --git a/base/src/org/compiere/model/MPInstanceLog.java b/org.adempiere.base/src/org/compiere/model/MPInstanceLog.java
similarity index 100%
rename from base/src/org/compiere/model/MPInstanceLog.java
rename to org.adempiere.base/src/org/compiere/model/MPInstanceLog.java
diff --git a/base/src/org/compiere/model/MPInstancePara.java b/org.adempiere.base/src/org/compiere/model/MPInstancePara.java
similarity index 100%
rename from base/src/org/compiere/model/MPInstancePara.java
rename to org.adempiere.base/src/org/compiere/model/MPInstancePara.java
diff --git a/base/src/org/compiere/model/MPOS.java b/org.adempiere.base/src/org/compiere/model/MPOS.java
similarity index 100%
rename from base/src/org/compiere/model/MPOS.java
rename to org.adempiere.base/src/org/compiere/model/MPOS.java
diff --git a/base/src/org/compiere/model/MPOSKey.java b/org.adempiere.base/src/org/compiere/model/MPOSKey.java
similarity index 100%
rename from base/src/org/compiere/model/MPOSKey.java
rename to org.adempiere.base/src/org/compiere/model/MPOSKey.java
diff --git a/base/src/org/compiere/model/MPOSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
similarity index 100%
rename from base/src/org/compiere/model/MPOSKeyLayout.java
rename to org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java
diff --git a/base/src/org/compiere/model/MPOSTerminal.java b/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java
similarity index 100%
rename from base/src/org/compiere/model/MPOSTerminal.java
rename to org.adempiere.base/src/org/compiere/model/MPOSTerminal.java
diff --git a/base/src/org/compiere/model/MPackage.java b/org.adempiere.base/src/org/compiere/model/MPackage.java
similarity index 100%
rename from base/src/org/compiere/model/MPackage.java
rename to org.adempiere.base/src/org/compiere/model/MPackage.java
diff --git a/base/src/org/compiere/model/MPackageExp.java b/org.adempiere.base/src/org/compiere/model/MPackageExp.java
similarity index 100%
rename from base/src/org/compiere/model/MPackageExp.java
rename to org.adempiere.base/src/org/compiere/model/MPackageExp.java
diff --git a/base/src/org/compiere/model/MPackageExpCommon.java b/org.adempiere.base/src/org/compiere/model/MPackageExpCommon.java
similarity index 100%
rename from base/src/org/compiere/model/MPackageExpCommon.java
rename to org.adempiere.base/src/org/compiere/model/MPackageExpCommon.java
diff --git a/base/src/org/compiere/model/MPackageExpDetail.java b/org.adempiere.base/src/org/compiere/model/MPackageExpDetail.java
similarity index 100%
rename from base/src/org/compiere/model/MPackageExpDetail.java
rename to org.adempiere.base/src/org/compiere/model/MPackageExpDetail.java
diff --git a/base/src/org/compiere/model/MPackageLine.java b/org.adempiere.base/src/org/compiere/model/MPackageLine.java
similarity index 100%
rename from base/src/org/compiere/model/MPackageLine.java
rename to org.adempiere.base/src/org/compiere/model/MPackageLine.java
diff --git a/base/src/org/compiere/model/MPaySchedule.java b/org.adempiere.base/src/org/compiere/model/MPaySchedule.java
similarity index 100%
rename from base/src/org/compiere/model/MPaySchedule.java
rename to org.adempiere.base/src/org/compiere/model/MPaySchedule.java
diff --git a/base/src/org/compiere/model/MPaySelection.java b/org.adempiere.base/src/org/compiere/model/MPaySelection.java
similarity index 100%
rename from base/src/org/compiere/model/MPaySelection.java
rename to org.adempiere.base/src/org/compiere/model/MPaySelection.java
diff --git a/base/src/org/compiere/model/MPaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java
similarity index 100%
rename from base/src/org/compiere/model/MPaySelectionCheck.java
rename to org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java
diff --git a/base/src/org/compiere/model/MPaySelectionLine.java b/org.adempiere.base/src/org/compiere/model/MPaySelectionLine.java
similarity index 100%
rename from base/src/org/compiere/model/MPaySelectionLine.java
rename to org.adempiere.base/src/org/compiere/model/MPaySelectionLine.java
diff --git a/base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java
similarity index 100%
rename from base/src/org/compiere/model/MPayment.java
rename to org.adempiere.base/src/org/compiere/model/MPayment.java
diff --git a/base/src/org/compiere/model/MPaymentAllocate.java b/org.adempiere.base/src/org/compiere/model/MPaymentAllocate.java
similarity index 100%
rename from base/src/org/compiere/model/MPaymentAllocate.java
rename to org.adempiere.base/src/org/compiere/model/MPaymentAllocate.java
diff --git a/base/src/org/compiere/model/MPaymentBatch.java b/org.adempiere.base/src/org/compiere/model/MPaymentBatch.java
similarity index 100%
rename from base/src/org/compiere/model/MPaymentBatch.java
rename to org.adempiere.base/src/org/compiere/model/MPaymentBatch.java
diff --git a/base/src/org/compiere/model/MPaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/MPaymentProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/MPaymentProcessor.java
rename to org.adempiere.base/src/org/compiere/model/MPaymentProcessor.java
diff --git a/base/src/org/compiere/model/MPaymentTerm.java b/org.adempiere.base/src/org/compiere/model/MPaymentTerm.java
similarity index 100%
rename from base/src/org/compiere/model/MPaymentTerm.java
rename to org.adempiere.base/src/org/compiere/model/MPaymentTerm.java
diff --git a/base/src/org/compiere/model/MPaymentValidate.java b/org.adempiere.base/src/org/compiere/model/MPaymentValidate.java
similarity index 100%
rename from base/src/org/compiere/model/MPaymentValidate.java
rename to org.adempiere.base/src/org/compiere/model/MPaymentValidate.java
diff --git a/base/src/org/compiere/model/MPeriod.java b/org.adempiere.base/src/org/compiere/model/MPeriod.java
similarity index 100%
rename from base/src/org/compiere/model/MPeriod.java
rename to org.adempiere.base/src/org/compiere/model/MPeriod.java
diff --git a/base/src/org/compiere/model/MPeriodControl.java b/org.adempiere.base/src/org/compiere/model/MPeriodControl.java
similarity index 100%
rename from base/src/org/compiere/model/MPeriodControl.java
rename to org.adempiere.base/src/org/compiere/model/MPeriodControl.java
diff --git a/base/src/org/compiere/model/MPreference.java b/org.adempiere.base/src/org/compiere/model/MPreference.java
similarity index 100%
rename from base/src/org/compiere/model/MPreference.java
rename to org.adempiere.base/src/org/compiere/model/MPreference.java
diff --git a/base/src/org/compiere/model/MPriceList.java b/org.adempiere.base/src/org/compiere/model/MPriceList.java
similarity index 100%
rename from base/src/org/compiere/model/MPriceList.java
rename to org.adempiere.base/src/org/compiere/model/MPriceList.java
diff --git a/base/src/org/compiere/model/MPriceListVersion.java b/org.adempiere.base/src/org/compiere/model/MPriceListVersion.java
similarity index 100%
rename from base/src/org/compiere/model/MPriceListVersion.java
rename to org.adempiere.base/src/org/compiere/model/MPriceListVersion.java
diff --git a/base/src/org/compiere/model/MPrivateAccess.java b/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MPrivateAccess.java
rename to org.adempiere.base/src/org/compiere/model/MPrivateAccess.java
diff --git a/base/src/org/compiere/model/MProcess.java b/org.adempiere.base/src/org/compiere/model/MProcess.java
similarity index 100%
rename from base/src/org/compiere/model/MProcess.java
rename to org.adempiere.base/src/org/compiere/model/MProcess.java
diff --git a/base/src/org/compiere/model/MProcessAccess.java b/org.adempiere.base/src/org/compiere/model/MProcessAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MProcessAccess.java
rename to org.adempiere.base/src/org/compiere/model/MProcessAccess.java
diff --git a/base/src/org/compiere/model/MProcessPara.java b/org.adempiere.base/src/org/compiere/model/MProcessPara.java
similarity index 100%
rename from base/src/org/compiere/model/MProcessPara.java
rename to org.adempiere.base/src/org/compiere/model/MProcessPara.java
diff --git a/base/src/org/compiere/model/MProduct.java b/org.adempiere.base/src/org/compiere/model/MProduct.java
similarity index 100%
rename from base/src/org/compiere/model/MProduct.java
rename to org.adempiere.base/src/org/compiere/model/MProduct.java
diff --git a/base/src/org/compiere/model/MProductBOM.java b/org.adempiere.base/src/org/compiere/model/MProductBOM.java
similarity index 100%
rename from base/src/org/compiere/model/MProductBOM.java
rename to org.adempiere.base/src/org/compiere/model/MProductBOM.java
diff --git a/base/src/org/compiere/model/MProductCategory.java b/org.adempiere.base/src/org/compiere/model/MProductCategory.java
similarity index 100%
rename from base/src/org/compiere/model/MProductCategory.java
rename to org.adempiere.base/src/org/compiere/model/MProductCategory.java
diff --git a/base/src/org/compiere/model/MProductCategoryAcct.java b/org.adempiere.base/src/org/compiere/model/MProductCategoryAcct.java
similarity index 100%
rename from base/src/org/compiere/model/MProductCategoryAcct.java
rename to org.adempiere.base/src/org/compiere/model/MProductCategoryAcct.java
diff --git a/base/src/org/compiere/model/MProductCosting.java b/org.adempiere.base/src/org/compiere/model/MProductCosting.java
similarity index 100%
rename from base/src/org/compiere/model/MProductCosting.java
rename to org.adempiere.base/src/org/compiere/model/MProductCosting.java
diff --git a/base/src/org/compiere/model/MProductDownload.java b/org.adempiere.base/src/org/compiere/model/MProductDownload.java
similarity index 100%
rename from base/src/org/compiere/model/MProductDownload.java
rename to org.adempiere.base/src/org/compiere/model/MProductDownload.java
diff --git a/base/src/org/compiere/model/MProductPO.java b/org.adempiere.base/src/org/compiere/model/MProductPO.java
similarity index 100%
rename from base/src/org/compiere/model/MProductPO.java
rename to org.adempiere.base/src/org/compiere/model/MProductPO.java
diff --git a/base/src/org/compiere/model/MProductPrice.java b/org.adempiere.base/src/org/compiere/model/MProductPrice.java
similarity index 100%
rename from base/src/org/compiere/model/MProductPrice.java
rename to org.adempiere.base/src/org/compiere/model/MProductPrice.java
diff --git a/base/src/org/compiere/model/MProductPricing.java b/org.adempiere.base/src/org/compiere/model/MProductPricing.java
similarity index 100%
rename from base/src/org/compiere/model/MProductPricing.java
rename to org.adempiere.base/src/org/compiere/model/MProductPricing.java
diff --git a/base/src/org/compiere/model/MProject.java b/org.adempiere.base/src/org/compiere/model/MProject.java
similarity index 100%
rename from base/src/org/compiere/model/MProject.java
rename to org.adempiere.base/src/org/compiere/model/MProject.java
diff --git a/base/src/org/compiere/model/MProjectIssue.java b/org.adempiere.base/src/org/compiere/model/MProjectIssue.java
similarity index 100%
rename from base/src/org/compiere/model/MProjectIssue.java
rename to org.adempiere.base/src/org/compiere/model/MProjectIssue.java
diff --git a/base/src/org/compiere/model/MProjectLine.java b/org.adempiere.base/src/org/compiere/model/MProjectLine.java
similarity index 100%
rename from base/src/org/compiere/model/MProjectLine.java
rename to org.adempiere.base/src/org/compiere/model/MProjectLine.java
diff --git a/base/src/org/compiere/model/MProjectPhase.java b/org.adempiere.base/src/org/compiere/model/MProjectPhase.java
similarity index 100%
rename from base/src/org/compiere/model/MProjectPhase.java
rename to org.adempiere.base/src/org/compiere/model/MProjectPhase.java
diff --git a/base/src/org/compiere/model/MProjectTask.java b/org.adempiere.base/src/org/compiere/model/MProjectTask.java
similarity index 100%
rename from base/src/org/compiere/model/MProjectTask.java
rename to org.adempiere.base/src/org/compiere/model/MProjectTask.java
diff --git a/base/src/org/compiere/model/MProjectType.java b/org.adempiere.base/src/org/compiere/model/MProjectType.java
similarity index 100%
rename from base/src/org/compiere/model/MProjectType.java
rename to org.adempiere.base/src/org/compiere/model/MProjectType.java
diff --git a/base/src/org/compiere/model/MProjectTypePhase.java b/org.adempiere.base/src/org/compiere/model/MProjectTypePhase.java
similarity index 100%
rename from base/src/org/compiere/model/MProjectTypePhase.java
rename to org.adempiere.base/src/org/compiere/model/MProjectTypePhase.java
diff --git a/base/src/org/compiere/model/MProjectTypeTask.java b/org.adempiere.base/src/org/compiere/model/MProjectTypeTask.java
similarity index 100%
rename from base/src/org/compiere/model/MProjectTypeTask.java
rename to org.adempiere.base/src/org/compiere/model/MProjectTypeTask.java
diff --git a/base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java
similarity index 100%
rename from base/src/org/compiere/model/MQuery.java
rename to org.adempiere.base/src/org/compiere/model/MQuery.java
diff --git a/base/src/org/compiere/model/MRMA.java b/org.adempiere.base/src/org/compiere/model/MRMA.java
similarity index 100%
rename from base/src/org/compiere/model/MRMA.java
rename to org.adempiere.base/src/org/compiere/model/MRMA.java
diff --git a/base/src/org/compiere/model/MRMALine.java b/org.adempiere.base/src/org/compiere/model/MRMALine.java
similarity index 100%
rename from base/src/org/compiere/model/MRMALine.java
rename to org.adempiere.base/src/org/compiere/model/MRMALine.java
diff --git a/base/src/org/compiere/model/MRecordAccess.java b/org.adempiere.base/src/org/compiere/model/MRecordAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MRecordAccess.java
rename to org.adempiere.base/src/org/compiere/model/MRecordAccess.java
diff --git a/base/src/org/compiere/model/MRecurring.java b/org.adempiere.base/src/org/compiere/model/MRecurring.java
similarity index 100%
rename from base/src/org/compiere/model/MRecurring.java
rename to org.adempiere.base/src/org/compiere/model/MRecurring.java
diff --git a/base/src/org/compiere/model/MRecurringRun.java b/org.adempiere.base/src/org/compiere/model/MRecurringRun.java
similarity index 100%
rename from base/src/org/compiere/model/MRecurringRun.java
rename to org.adempiere.base/src/org/compiere/model/MRecurringRun.java
diff --git a/base/src/org/compiere/model/MRefList.java b/org.adempiere.base/src/org/compiere/model/MRefList.java
similarity index 100%
rename from base/src/org/compiere/model/MRefList.java
rename to org.adempiere.base/src/org/compiere/model/MRefList.java
diff --git a/base/src/org/compiere/model/MRefTable.java b/org.adempiere.base/src/org/compiere/model/MRefTable.java
similarity index 100%
rename from base/src/org/compiere/model/MRefTable.java
rename to org.adempiere.base/src/org/compiere/model/MRefTable.java
diff --git a/base/src/org/compiere/model/MRegion.java b/org.adempiere.base/src/org/compiere/model/MRegion.java
similarity index 100%
rename from base/src/org/compiere/model/MRegion.java
rename to org.adempiere.base/src/org/compiere/model/MRegion.java
diff --git a/base/src/org/compiere/model/MRegistration.java b/org.adempiere.base/src/org/compiere/model/MRegistration.java
similarity index 100%
rename from base/src/org/compiere/model/MRegistration.java
rename to org.adempiere.base/src/org/compiere/model/MRegistration.java
diff --git a/base/src/org/compiere/model/MRegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java
similarity index 100%
rename from base/src/org/compiere/model/MRegistrationAttribute.java
rename to org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java
diff --git a/base/src/org/compiere/model/MRegistrationValue.java b/org.adempiere.base/src/org/compiere/model/MRegistrationValue.java
similarity index 100%
rename from base/src/org/compiere/model/MRegistrationValue.java
rename to org.adempiere.base/src/org/compiere/model/MRegistrationValue.java
diff --git a/base/src/org/compiere/model/MReplenish.java b/org.adempiere.base/src/org/compiere/model/MReplenish.java
similarity index 100%
rename from base/src/org/compiere/model/MReplenish.java
rename to org.adempiere.base/src/org/compiere/model/MReplenish.java
diff --git a/base/src/org/compiere/model/MReplication.java b/org.adempiere.base/src/org/compiere/model/MReplication.java
similarity index 100%
rename from base/src/org/compiere/model/MReplication.java
rename to org.adempiere.base/src/org/compiere/model/MReplication.java
diff --git a/base/src/org/compiere/model/MReplicationLog.java b/org.adempiere.base/src/org/compiere/model/MReplicationLog.java
similarity index 100%
rename from base/src/org/compiere/model/MReplicationLog.java
rename to org.adempiere.base/src/org/compiere/model/MReplicationLog.java
diff --git a/base/src/org/compiere/model/MReplicationRun.java b/org.adempiere.base/src/org/compiere/model/MReplicationRun.java
similarity index 100%
rename from base/src/org/compiere/model/MReplicationRun.java
rename to org.adempiere.base/src/org/compiere/model/MReplicationRun.java
diff --git a/base/src/org/compiere/model/MReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java
similarity index 100%
rename from base/src/org/compiere/model/MReplicationStrategy.java
rename to org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java
diff --git a/base/src/org/compiere/model/MReportCube.java b/org.adempiere.base/src/org/compiere/model/MReportCube.java
similarity index 100%
rename from base/src/org/compiere/model/MReportCube.java
rename to org.adempiere.base/src/org/compiere/model/MReportCube.java
diff --git a/base/src/org/compiere/model/MRequest.java b/org.adempiere.base/src/org/compiere/model/MRequest.java
similarity index 100%
rename from base/src/org/compiere/model/MRequest.java
rename to org.adempiere.base/src/org/compiere/model/MRequest.java
diff --git a/base/src/org/compiere/model/MRequestAction.java b/org.adempiere.base/src/org/compiere/model/MRequestAction.java
similarity index 100%
rename from base/src/org/compiere/model/MRequestAction.java
rename to org.adempiere.base/src/org/compiere/model/MRequestAction.java
diff --git a/base/src/org/compiere/model/MRequestCategory.java b/org.adempiere.base/src/org/compiere/model/MRequestCategory.java
similarity index 100%
rename from base/src/org/compiere/model/MRequestCategory.java
rename to org.adempiere.base/src/org/compiere/model/MRequestCategory.java
diff --git a/base/src/org/compiere/model/MRequestProcessor.java b/org.adempiere.base/src/org/compiere/model/MRequestProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/MRequestProcessor.java
rename to org.adempiere.base/src/org/compiere/model/MRequestProcessor.java
diff --git a/base/src/org/compiere/model/MRequestProcessorLog.java b/org.adempiere.base/src/org/compiere/model/MRequestProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/MRequestProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/MRequestProcessorLog.java
diff --git a/base/src/org/compiere/model/MRequestProcessorRoute.java b/org.adempiere.base/src/org/compiere/model/MRequestProcessorRoute.java
similarity index 100%
rename from base/src/org/compiere/model/MRequestProcessorRoute.java
rename to org.adempiere.base/src/org/compiere/model/MRequestProcessorRoute.java
diff --git a/base/src/org/compiere/model/MRequestType.java b/org.adempiere.base/src/org/compiere/model/MRequestType.java
similarity index 100%
rename from base/src/org/compiere/model/MRequestType.java
rename to org.adempiere.base/src/org/compiere/model/MRequestType.java
diff --git a/base/src/org/compiere/model/MRequestUpdate.java b/org.adempiere.base/src/org/compiere/model/MRequestUpdate.java
similarity index 100%
rename from base/src/org/compiere/model/MRequestUpdate.java
rename to org.adempiere.base/src/org/compiere/model/MRequestUpdate.java
diff --git a/base/src/org/compiere/model/MRequisition.java b/org.adempiere.base/src/org/compiere/model/MRequisition.java
similarity index 100%
rename from base/src/org/compiere/model/MRequisition.java
rename to org.adempiere.base/src/org/compiere/model/MRequisition.java
diff --git a/base/src/org/compiere/model/MRequisitionLine.java b/org.adempiere.base/src/org/compiere/model/MRequisitionLine.java
similarity index 100%
rename from base/src/org/compiere/model/MRequisitionLine.java
rename to org.adempiere.base/src/org/compiere/model/MRequisitionLine.java
diff --git a/base/src/org/compiere/model/MResolution.java b/org.adempiere.base/src/org/compiere/model/MResolution.java
similarity index 100%
rename from base/src/org/compiere/model/MResolution.java
rename to org.adempiere.base/src/org/compiere/model/MResolution.java
diff --git a/base/src/org/compiere/model/MResource.java b/org.adempiere.base/src/org/compiere/model/MResource.java
similarity index 100%
rename from base/src/org/compiere/model/MResource.java
rename to org.adempiere.base/src/org/compiere/model/MResource.java
diff --git a/base/src/org/compiere/model/MResourceAssignment.java b/org.adempiere.base/src/org/compiere/model/MResourceAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/MResourceAssignment.java
rename to org.adempiere.base/src/org/compiere/model/MResourceAssignment.java
diff --git a/base/src/org/compiere/model/MResourceType.java b/org.adempiere.base/src/org/compiere/model/MResourceType.java
similarity index 100%
rename from base/src/org/compiere/model/MResourceType.java
rename to org.adempiere.base/src/org/compiere/model/MResourceType.java
diff --git a/base/src/org/compiere/model/MResourceUnAvailable.java b/org.adempiere.base/src/org/compiere/model/MResourceUnAvailable.java
similarity index 100%
rename from base/src/org/compiere/model/MResourceUnAvailable.java
rename to org.adempiere.base/src/org/compiere/model/MResourceUnAvailable.java
diff --git a/base/src/org/compiere/model/MRevenueRecognition.java b/org.adempiere.base/src/org/compiere/model/MRevenueRecognition.java
similarity index 100%
rename from base/src/org/compiere/model/MRevenueRecognition.java
rename to org.adempiere.base/src/org/compiere/model/MRevenueRecognition.java
diff --git a/base/src/org/compiere/model/MRevenueRecognitionPlan.java b/org.adempiere.base/src/org/compiere/model/MRevenueRecognitionPlan.java
similarity index 100%
rename from base/src/org/compiere/model/MRevenueRecognitionPlan.java
rename to org.adempiere.base/src/org/compiere/model/MRevenueRecognitionPlan.java
diff --git a/base/src/org/compiere/model/MRfQ.java b/org.adempiere.base/src/org/compiere/model/MRfQ.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQ.java
rename to org.adempiere.base/src/org/compiere/model/MRfQ.java
diff --git a/base/src/org/compiere/model/MRfQLine.java b/org.adempiere.base/src/org/compiere/model/MRfQLine.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQLine.java
rename to org.adempiere.base/src/org/compiere/model/MRfQLine.java
diff --git a/base/src/org/compiere/model/MRfQLineQty.java b/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQLineQty.java
rename to org.adempiere.base/src/org/compiere/model/MRfQLineQty.java
diff --git a/base/src/org/compiere/model/MRfQResponse.java b/org.adempiere.base/src/org/compiere/model/MRfQResponse.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQResponse.java
rename to org.adempiere.base/src/org/compiere/model/MRfQResponse.java
diff --git a/base/src/org/compiere/model/MRfQResponseLine.java b/org.adempiere.base/src/org/compiere/model/MRfQResponseLine.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQResponseLine.java
rename to org.adempiere.base/src/org/compiere/model/MRfQResponseLine.java
diff --git a/base/src/org/compiere/model/MRfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQResponseLineQty.java
rename to org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java
diff --git a/base/src/org/compiere/model/MRfQTopic.java b/org.adempiere.base/src/org/compiere/model/MRfQTopic.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQTopic.java
rename to org.adempiere.base/src/org/compiere/model/MRfQTopic.java
diff --git a/base/src/org/compiere/model/MRfQTopicSubscriber.java b/org.adempiere.base/src/org/compiere/model/MRfQTopicSubscriber.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQTopicSubscriber.java
rename to org.adempiere.base/src/org/compiere/model/MRfQTopicSubscriber.java
diff --git a/base/src/org/compiere/model/MRfQTopicSubscriberOnly.java b/org.adempiere.base/src/org/compiere/model/MRfQTopicSubscriberOnly.java
similarity index 100%
rename from base/src/org/compiere/model/MRfQTopicSubscriberOnly.java
rename to org.adempiere.base/src/org/compiere/model/MRfQTopicSubscriberOnly.java
diff --git a/base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java
similarity index 100%
rename from base/src/org/compiere/model/MRole.java
rename to org.adempiere.base/src/org/compiere/model/MRole.java
diff --git a/base/src/org/compiere/model/MRoleIncluded.java b/org.adempiere.base/src/org/compiere/model/MRoleIncluded.java
similarity index 100%
rename from base/src/org/compiere/model/MRoleIncluded.java
rename to org.adempiere.base/src/org/compiere/model/MRoleIncluded.java
diff --git a/base/src/org/compiere/model/MRoleMenu.java b/org.adempiere.base/src/org/compiere/model/MRoleMenu.java
similarity index 100%
rename from base/src/org/compiere/model/MRoleMenu.java
rename to org.adempiere.base/src/org/compiere/model/MRoleMenu.java
diff --git a/base/src/org/compiere/model/MRoleOrgAccess.java b/org.adempiere.base/src/org/compiere/model/MRoleOrgAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MRoleOrgAccess.java
rename to org.adempiere.base/src/org/compiere/model/MRoleOrgAccess.java
diff --git a/base/src/org/compiere/model/MRoleTest.java b/org.adempiere.base/src/org/compiere/model/MRoleTest.java
similarity index 100%
rename from base/src/org/compiere/model/MRoleTest.java
rename to org.adempiere.base/src/org/compiere/model/MRoleTest.java
diff --git a/base/src/org/compiere/model/MRule.java b/org.adempiere.base/src/org/compiere/model/MRule.java
similarity index 100%
rename from base/src/org/compiere/model/MRule.java
rename to org.adempiere.base/src/org/compiere/model/MRule.java
diff --git a/base/src/org/compiere/model/MSLACriteria.java b/org.adempiere.base/src/org/compiere/model/MSLACriteria.java
similarity index 100%
rename from base/src/org/compiere/model/MSLACriteria.java
rename to org.adempiere.base/src/org/compiere/model/MSLACriteria.java
diff --git a/base/src/org/compiere/model/MSLAGoal.java b/org.adempiere.base/src/org/compiere/model/MSLAGoal.java
similarity index 100%
rename from base/src/org/compiere/model/MSLAGoal.java
rename to org.adempiere.base/src/org/compiere/model/MSLAGoal.java
diff --git a/base/src/org/compiere/model/MSLAMeasure.java b/org.adempiere.base/src/org/compiere/model/MSLAMeasure.java
similarity index 100%
rename from base/src/org/compiere/model/MSLAMeasure.java
rename to org.adempiere.base/src/org/compiere/model/MSLAMeasure.java
diff --git a/base/src/org/compiere/model/MSalesRegion.java b/org.adempiere.base/src/org/compiere/model/MSalesRegion.java
similarity index 100%
rename from base/src/org/compiere/model/MSalesRegion.java
rename to org.adempiere.base/src/org/compiere/model/MSalesRegion.java
diff --git a/base/src/org/compiere/model/MScheduler.java b/org.adempiere.base/src/org/compiere/model/MScheduler.java
similarity index 100%
rename from base/src/org/compiere/model/MScheduler.java
rename to org.adempiere.base/src/org/compiere/model/MScheduler.java
diff --git a/base/src/org/compiere/model/MSchedulerLog.java b/org.adempiere.base/src/org/compiere/model/MSchedulerLog.java
similarity index 100%
rename from base/src/org/compiere/model/MSchedulerLog.java
rename to org.adempiere.base/src/org/compiere/model/MSchedulerLog.java
diff --git a/base/src/org/compiere/model/MSchedulerPara.java b/org.adempiere.base/src/org/compiere/model/MSchedulerPara.java
similarity index 100%
rename from base/src/org/compiere/model/MSchedulerPara.java
rename to org.adempiere.base/src/org/compiere/model/MSchedulerPara.java
diff --git a/base/src/org/compiere/model/MSchedulerRecipient.java b/org.adempiere.base/src/org/compiere/model/MSchedulerRecipient.java
similarity index 100%
rename from base/src/org/compiere/model/MSchedulerRecipient.java
rename to org.adempiere.base/src/org/compiere/model/MSchedulerRecipient.java
diff --git a/base/src/org/compiere/model/MSearchDefinition.java b/org.adempiere.base/src/org/compiere/model/MSearchDefinition.java
similarity index 100%
rename from base/src/org/compiere/model/MSearchDefinition.java
rename to org.adempiere.base/src/org/compiere/model/MSearchDefinition.java
diff --git a/base/src/org/compiere/model/MSequence.java b/org.adempiere.base/src/org/compiere/model/MSequence.java
similarity index 100%
rename from base/src/org/compiere/model/MSequence.java
rename to org.adempiere.base/src/org/compiere/model/MSequence.java
diff --git a/base/src/org/compiere/model/MSerNoCtl.java b/org.adempiere.base/src/org/compiere/model/MSerNoCtl.java
similarity index 100%
rename from base/src/org/compiere/model/MSerNoCtl.java
rename to org.adempiere.base/src/org/compiere/model/MSerNoCtl.java
diff --git a/base/src/org/compiere/model/MSession.java b/org.adempiere.base/src/org/compiere/model/MSession.java
similarity index 100%
rename from base/src/org/compiere/model/MSession.java
rename to org.adempiere.base/src/org/compiere/model/MSession.java
diff --git a/base/src/org/compiere/model/MSetup.java b/org.adempiere.base/src/org/compiere/model/MSetup.java
similarity index 95%
rename from base/src/org/compiere/model/MSetup.java
rename to org.adempiere.base/src/org/compiere/model/MSetup.java
index 072e6f0f7b..aec405d360 100644
--- a/base/src/org/compiere/model/MSetup.java
+++ b/org.adempiere.base/src/org/compiere/model/MSetup.java
@@ -23,7 +23,9 @@ import java.sql.SQLException;
import java.util.Properties;
import java.util.logging.Level;
-import org.compiere.process.DocumentTypeVerify;
+import org.adempiere.util.ProcessUtil;
+import org.compiere.process.ProcessInfo;
+import org.compiere.process.ProcessInfoParameter;
import org.compiere.util.AdempiereUserError;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@@ -748,8 +750,20 @@ public final class MSetup
}
// Validate Completeness
- DocumentTypeVerify.createDocumentTypes(m_ctx, getAD_Client_ID(), null, m_trx.getTrxName());
- DocumentTypeVerify.createPeriodControls(m_ctx, getAD_Client_ID(), null, m_trx.getTrxName());
+ ProcessInfo processInfo = new ProcessInfo("Document Type Verify", 0);
+ processInfo.setAD_Client_ID(getAD_Client_ID());
+ processInfo.setAD_User_ID(getAD_User_ID());
+ processInfo.setParameter(new ProcessInfoParameter[0]);
+ processInfo.setClassName("org.compiere.process.DocumentTypeVerify");
+ if (!ProcessUtil.startJavaProcess(m_ctx, processInfo, m_trx, false))
+ {
+ String err = "Document type verification failed. Message="+processInfo.getSummary();
+ log.log(Level.SEVERE, err);
+ m_info.append(err);
+ m_trx.rollback();
+ m_trx.close();
+ return false;
+ }
//
log.info("fini");
return true;
diff --git a/base/src/org/compiere/model/MShipper.java b/org.adempiere.base/src/org/compiere/model/MShipper.java
similarity index 100%
rename from base/src/org/compiere/model/MShipper.java
rename to org.adempiere.base/src/org/compiere/model/MShipper.java
diff --git a/base/src/org/compiere/model/MStatus.java b/org.adempiere.base/src/org/compiere/model/MStatus.java
similarity index 100%
rename from base/src/org/compiere/model/MStatus.java
rename to org.adempiere.base/src/org/compiere/model/MStatus.java
diff --git a/base/src/org/compiere/model/MStatusCategory.java b/org.adempiere.base/src/org/compiere/model/MStatusCategory.java
similarity index 100%
rename from base/src/org/compiere/model/MStatusCategory.java
rename to org.adempiere.base/src/org/compiere/model/MStatusCategory.java
diff --git a/base/src/org/compiere/model/MStorage.java b/org.adempiere.base/src/org/compiere/model/MStorage.java
similarity index 100%
rename from base/src/org/compiere/model/MStorage.java
rename to org.adempiere.base/src/org/compiere/model/MStorage.java
diff --git a/base/src/org/compiere/model/MStore.java b/org.adempiere.base/src/org/compiere/model/MStore.java
similarity index 100%
rename from base/src/org/compiere/model/MStore.java
rename to org.adempiere.base/src/org/compiere/model/MStore.java
diff --git a/base/src/org/compiere/model/MSysConfig.java b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
similarity index 100%
rename from base/src/org/compiere/model/MSysConfig.java
rename to org.adempiere.base/src/org/compiere/model/MSysConfig.java
diff --git a/base/src/org/compiere/model/MSystem.java b/org.adempiere.base/src/org/compiere/model/MSystem.java
similarity index 100%
rename from base/src/org/compiere/model/MSystem.java
rename to org.adempiere.base/src/org/compiere/model/MSystem.java
diff --git a/base/src/org/compiere/model/MTab.java b/org.adempiere.base/src/org/compiere/model/MTab.java
similarity index 100%
rename from base/src/org/compiere/model/MTab.java
rename to org.adempiere.base/src/org/compiere/model/MTab.java
diff --git a/base/src/org/compiere/model/MTable.java b/org.adempiere.base/src/org/compiere/model/MTable.java
similarity index 100%
rename from base/src/org/compiere/model/MTable.java
rename to org.adempiere.base/src/org/compiere/model/MTable.java
diff --git a/base/src/org/compiere/model/MTableAccess.java b/org.adempiere.base/src/org/compiere/model/MTableAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MTableAccess.java
rename to org.adempiere.base/src/org/compiere/model/MTableAccess.java
diff --git a/base/src/org/compiere/model/MTableScriptValidator.java b/org.adempiere.base/src/org/compiere/model/MTableScriptValidator.java
similarity index 100%
rename from base/src/org/compiere/model/MTableScriptValidator.java
rename to org.adempiere.base/src/org/compiere/model/MTableScriptValidator.java
diff --git a/base/src/org/compiere/model/MTask.java b/org.adempiere.base/src/org/compiere/model/MTask.java
similarity index 100%
rename from base/src/org/compiere/model/MTask.java
rename to org.adempiere.base/src/org/compiere/model/MTask.java
diff --git a/base/src/org/compiere/model/MTax.java b/org.adempiere.base/src/org/compiere/model/MTax.java
similarity index 100%
rename from base/src/org/compiere/model/MTax.java
rename to org.adempiere.base/src/org/compiere/model/MTax.java
diff --git a/base/src/org/compiere/model/MTaxCategory.java b/org.adempiere.base/src/org/compiere/model/MTaxCategory.java
similarity index 100%
rename from base/src/org/compiere/model/MTaxCategory.java
rename to org.adempiere.base/src/org/compiere/model/MTaxCategory.java
diff --git a/base/src/org/compiere/model/MTaxDeclaration.java b/org.adempiere.base/src/org/compiere/model/MTaxDeclaration.java
similarity index 100%
rename from base/src/org/compiere/model/MTaxDeclaration.java
rename to org.adempiere.base/src/org/compiere/model/MTaxDeclaration.java
diff --git a/base/src/org/compiere/model/MTaxDeclarationAcct.java b/org.adempiere.base/src/org/compiere/model/MTaxDeclarationAcct.java
similarity index 100%
rename from base/src/org/compiere/model/MTaxDeclarationAcct.java
rename to org.adempiere.base/src/org/compiere/model/MTaxDeclarationAcct.java
diff --git a/base/src/org/compiere/model/MTaxDeclarationLine.java b/org.adempiere.base/src/org/compiere/model/MTaxDeclarationLine.java
similarity index 100%
rename from base/src/org/compiere/model/MTaxDeclarationLine.java
rename to org.adempiere.base/src/org/compiere/model/MTaxDeclarationLine.java
diff --git a/base/src/org/compiere/model/MTaxPostal.java b/org.adempiere.base/src/org/compiere/model/MTaxPostal.java
similarity index 100%
rename from base/src/org/compiere/model/MTaxPostal.java
rename to org.adempiere.base/src/org/compiere/model/MTaxPostal.java
diff --git a/base/src/org/compiere/model/MTemplate.java b/org.adempiere.base/src/org/compiere/model/MTemplate.java
similarity index 100%
rename from base/src/org/compiere/model/MTemplate.java
rename to org.adempiere.base/src/org/compiere/model/MTemplate.java
diff --git a/base/src/org/compiere/model/MTest.java b/org.adempiere.base/src/org/compiere/model/MTest.java
similarity index 100%
rename from base/src/org/compiere/model/MTest.java
rename to org.adempiere.base/src/org/compiere/model/MTest.java
diff --git a/base/src/org/compiere/model/MTimeExpense.java b/org.adempiere.base/src/org/compiere/model/MTimeExpense.java
similarity index 100%
rename from base/src/org/compiere/model/MTimeExpense.java
rename to org.adempiere.base/src/org/compiere/model/MTimeExpense.java
diff --git a/base/src/org/compiere/model/MTimeExpenseLine.java b/org.adempiere.base/src/org/compiere/model/MTimeExpenseLine.java
similarity index 100%
rename from base/src/org/compiere/model/MTimeExpenseLine.java
rename to org.adempiere.base/src/org/compiere/model/MTimeExpenseLine.java
diff --git a/base/src/org/compiere/model/MTransaction.java b/org.adempiere.base/src/org/compiere/model/MTransaction.java
similarity index 100%
rename from base/src/org/compiere/model/MTransaction.java
rename to org.adempiere.base/src/org/compiere/model/MTransaction.java
diff --git a/base/src/org/compiere/model/MTree.java b/org.adempiere.base/src/org/compiere/model/MTree.java
similarity index 100%
rename from base/src/org/compiere/model/MTree.java
rename to org.adempiere.base/src/org/compiere/model/MTree.java
diff --git a/base/src/org/compiere/model/MTreeNode.java b/org.adempiere.base/src/org/compiere/model/MTreeNode.java
similarity index 100%
rename from base/src/org/compiere/model/MTreeNode.java
rename to org.adempiere.base/src/org/compiere/model/MTreeNode.java
diff --git a/base/src/org/compiere/model/MTree_Base.java b/org.adempiere.base/src/org/compiere/model/MTree_Base.java
similarity index 100%
rename from base/src/org/compiere/model/MTree_Base.java
rename to org.adempiere.base/src/org/compiere/model/MTree_Base.java
diff --git a/base/src/org/compiere/model/MTree_Node.java b/org.adempiere.base/src/org/compiere/model/MTree_Node.java
similarity index 100%
rename from base/src/org/compiere/model/MTree_Node.java
rename to org.adempiere.base/src/org/compiere/model/MTree_Node.java
diff --git a/base/src/org/compiere/model/MTree_NodeBP.java b/org.adempiere.base/src/org/compiere/model/MTree_NodeBP.java
similarity index 100%
rename from base/src/org/compiere/model/MTree_NodeBP.java
rename to org.adempiere.base/src/org/compiere/model/MTree_NodeBP.java
diff --git a/base/src/org/compiere/model/MTree_NodeCMC.java b/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java
similarity index 100%
rename from base/src/org/compiere/model/MTree_NodeCMC.java
rename to org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java
diff --git a/base/src/org/compiere/model/MTree_NodeCMS.java b/org.adempiere.base/src/org/compiere/model/MTree_NodeCMS.java
similarity index 100%
rename from base/src/org/compiere/model/MTree_NodeCMS.java
rename to org.adempiere.base/src/org/compiere/model/MTree_NodeCMS.java
diff --git a/base/src/org/compiere/model/MTree_NodeMM.java b/org.adempiere.base/src/org/compiere/model/MTree_NodeMM.java
similarity index 100%
rename from base/src/org/compiere/model/MTree_NodeMM.java
rename to org.adempiere.base/src/org/compiere/model/MTree_NodeMM.java
diff --git a/base/src/org/compiere/model/MTree_NodePR.java b/org.adempiere.base/src/org/compiere/model/MTree_NodePR.java
similarity index 100%
rename from base/src/org/compiere/model/MTree_NodePR.java
rename to org.adempiere.base/src/org/compiere/model/MTree_NodePR.java
diff --git a/base/src/org/compiere/model/MUOM.java b/org.adempiere.base/src/org/compiere/model/MUOM.java
similarity index 100%
rename from base/src/org/compiere/model/MUOM.java
rename to org.adempiere.base/src/org/compiere/model/MUOM.java
diff --git a/base/src/org/compiere/model/MUOMConversion.java b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java
similarity index 100%
rename from base/src/org/compiere/model/MUOMConversion.java
rename to org.adempiere.base/src/org/compiere/model/MUOMConversion.java
diff --git a/base/src/org/compiere/model/MUser.java b/org.adempiere.base/src/org/compiere/model/MUser.java
similarity index 100%
rename from base/src/org/compiere/model/MUser.java
rename to org.adempiere.base/src/org/compiere/model/MUser.java
diff --git a/base/src/org/compiere/model/MUserMail.java b/org.adempiere.base/src/org/compiere/model/MUserMail.java
similarity index 100%
rename from base/src/org/compiere/model/MUserMail.java
rename to org.adempiere.base/src/org/compiere/model/MUserMail.java
diff --git a/base/src/org/compiere/model/MUserOrgAccess.java b/org.adempiere.base/src/org/compiere/model/MUserOrgAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MUserOrgAccess.java
rename to org.adempiere.base/src/org/compiere/model/MUserOrgAccess.java
diff --git a/base/src/org/compiere/model/MUserQuery.java b/org.adempiere.base/src/org/compiere/model/MUserQuery.java
similarity index 100%
rename from base/src/org/compiere/model/MUserQuery.java
rename to org.adempiere.base/src/org/compiere/model/MUserQuery.java
diff --git a/base/src/org/compiere/model/MUserRoles.java b/org.adempiere.base/src/org/compiere/model/MUserRoles.java
similarity index 100%
rename from base/src/org/compiere/model/MUserRoles.java
rename to org.adempiere.base/src/org/compiere/model/MUserRoles.java
diff --git a/base/src/org/compiere/model/MWarehouse.java b/org.adempiere.base/src/org/compiere/model/MWarehouse.java
similarity index 100%
rename from base/src/org/compiere/model/MWarehouse.java
rename to org.adempiere.base/src/org/compiere/model/MWarehouse.java
diff --git a/base/src/org/compiere/model/MWarehousePrice.java b/org.adempiere.base/src/org/compiere/model/MWarehousePrice.java
similarity index 100%
rename from base/src/org/compiere/model/MWarehousePrice.java
rename to org.adempiere.base/src/org/compiere/model/MWarehousePrice.java
diff --git a/base/src/org/compiere/model/MWebMenu.java b/org.adempiere.base/src/org/compiere/model/MWebMenu.java
similarity index 100%
rename from base/src/org/compiere/model/MWebMenu.java
rename to org.adempiere.base/src/org/compiere/model/MWebMenu.java
diff --git a/base/src/org/compiere/model/MWebProject.java b/org.adempiere.base/src/org/compiere/model/MWebProject.java
similarity index 100%
rename from base/src/org/compiere/model/MWebProject.java
rename to org.adempiere.base/src/org/compiere/model/MWebProject.java
diff --git a/base/src/org/compiere/model/MWebProjectDomain.java b/org.adempiere.base/src/org/compiere/model/MWebProjectDomain.java
similarity index 100%
rename from base/src/org/compiere/model/MWebProjectDomain.java
rename to org.adempiere.base/src/org/compiere/model/MWebProjectDomain.java
diff --git a/base/src/org/compiere/model/MWebProperties.java b/org.adempiere.base/src/org/compiere/model/MWebProperties.java
similarity index 100%
rename from base/src/org/compiere/model/MWebProperties.java
rename to org.adempiere.base/src/org/compiere/model/MWebProperties.java
diff --git a/base/src/org/compiere/model/MWindow.java b/org.adempiere.base/src/org/compiere/model/MWindow.java
similarity index 100%
rename from base/src/org/compiere/model/MWindow.java
rename to org.adempiere.base/src/org/compiere/model/MWindow.java
diff --git a/base/src/org/compiere/model/MWindowAccess.java b/org.adempiere.base/src/org/compiere/model/MWindowAccess.java
similarity index 100%
rename from base/src/org/compiere/model/MWindowAccess.java
rename to org.adempiere.base/src/org/compiere/model/MWindowAccess.java
diff --git a/base/src/org/compiere/model/MWithholding.java b/org.adempiere.base/src/org/compiere/model/MWithholding.java
similarity index 100%
rename from base/src/org/compiere/model/MWithholding.java
rename to org.adempiere.base/src/org/compiere/model/MWithholding.java
diff --git a/base/src/org/compiere/model/MXIFAJournal.java b/org.adempiere.base/src/org/compiere/model/MXIFAJournal.java
similarity index 100%
rename from base/src/org/compiere/model/MXIFAJournal.java
rename to org.adempiere.base/src/org/compiere/model/MXIFAJournal.java
diff --git a/base/src/org/compiere/model/MYear.java b/org.adempiere.base/src/org/compiere/model/MYear.java
similarity index 95%
rename from base/src/org/compiere/model/MYear.java
rename to org.adempiere.base/src/org/compiere/model/MYear.java
index 9f38e73dce..669f2bde71 100644
--- a/base/src/org/compiere/model/MYear.java
+++ b/org.adempiere.base/src/org/compiere/model/MYear.java
@@ -18,7 +18,6 @@ package org.compiere.model;
import java.sql.ResultSet;
import java.sql.Timestamp;
-import java.text.DateFormatSymbols;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar;
@@ -28,7 +27,6 @@ import java.util.StringTokenizer;
import java.util.logging.Level;
import org.adempiere.exceptions.FillMandatoryException;
-import org.compiere.process.DocumentTypeVerify;
import org.compiere.process.SvrProcess;
import org.compiere.util.Env;
import org.compiere.util.Language;
diff --git a/base/src/org/compiere/model/M_Element.java b/org.adempiere.base/src/org/compiere/model/M_Element.java
similarity index 100%
rename from base/src/org/compiere/model/M_Element.java
rename to org.adempiere.base/src/org/compiere/model/M_Element.java
diff --git a/base/src/org/compiere/model/M_Registration.java b/org.adempiere.base/src/org/compiere/model/M_Registration.java
similarity index 100%
rename from base/src/org/compiere/model/M_Registration.java
rename to org.adempiere.base/src/org/compiere/model/M_Registration.java
diff --git a/base/src/org/compiere/model/Measure.java b/org.adempiere.base/src/org/compiere/model/Measure.java
similarity index 100%
rename from base/src/org/compiere/model/Measure.java
rename to org.adempiere.base/src/org/compiere/model/Measure.java
diff --git a/base/src/org/compiere/model/ModelValidationEngine.java b/org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java
similarity index 100%
rename from base/src/org/compiere/model/ModelValidationEngine.java
rename to org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java
diff --git a/base/src/org/compiere/model/ModelValidator.java b/org.adempiere.base/src/org/compiere/model/ModelValidator.java
similarity index 100%
rename from base/src/org/compiere/model/ModelValidator.java
rename to org.adempiere.base/src/org/compiere/model/ModelValidator.java
diff --git a/base/src/org/compiere/model/MultiMap.java b/org.adempiere.base/src/org/compiere/model/MultiMap.java
similarity index 100%
rename from base/src/org/compiere/model/MultiMap.java
rename to org.adempiere.base/src/org/compiere/model/MultiMap.java
diff --git a/base/src/org/compiere/model/NaturalAccountMap.java b/org.adempiere.base/src/org/compiere/model/NaturalAccountMap.java
similarity index 100%
rename from base/src/org/compiere/model/NaturalAccountMap.java
rename to org.adempiere.base/src/org/compiere/model/NaturalAccountMap.java
diff --git a/base/src/org/compiere/model/Null.java b/org.adempiere.base/src/org/compiere/model/Null.java
similarity index 100%
rename from base/src/org/compiere/model/Null.java
rename to org.adempiere.base/src/org/compiere/model/Null.java
diff --git a/base/src/org/compiere/model/Obscure.java b/org.adempiere.base/src/org/compiere/model/Obscure.java
similarity index 100%
rename from base/src/org/compiere/model/Obscure.java
rename to org.adempiere.base/src/org/compiere/model/Obscure.java
diff --git a/base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java
similarity index 100%
rename from base/src/org/compiere/model/PO.java
rename to org.adempiere.base/src/org/compiere/model/PO.java
diff --git a/base/src/org/compiere/model/POInfo.java b/org.adempiere.base/src/org/compiere/model/POInfo.java
similarity index 100%
rename from base/src/org/compiere/model/POInfo.java
rename to org.adempiere.base/src/org/compiere/model/POInfo.java
diff --git a/base/src/org/compiere/model/POInfoColumn.java b/org.adempiere.base/src/org/compiere/model/POInfoColumn.java
similarity index 100%
rename from base/src/org/compiere/model/POInfoColumn.java
rename to org.adempiere.base/src/org/compiere/model/POInfoColumn.java
diff --git a/base/src/org/compiere/model/POIterator.java b/org.adempiere.base/src/org/compiere/model/POIterator.java
similarity index 100%
rename from base/src/org/compiere/model/POIterator.java
rename to org.adempiere.base/src/org/compiere/model/POIterator.java
diff --git a/base/src/org/compiere/model/POResultSet.java b/org.adempiere.base/src/org/compiere/model/POResultSet.java
similarity index 100%
rename from base/src/org/compiere/model/POResultSet.java
rename to org.adempiere.base/src/org/compiere/model/POResultSet.java
diff --git a/base/src/org/compiere/model/PO_LOB.java b/org.adempiere.base/src/org/compiere/model/PO_LOB.java
similarity index 100%
rename from base/src/org/compiere/model/PO_LOB.java
rename to org.adempiere.base/src/org/compiere/model/PO_LOB.java
diff --git a/base/src/org/compiere/model/PO_Record.java b/org.adempiere.base/src/org/compiere/model/PO_Record.java
similarity index 100%
rename from base/src/org/compiere/model/PO_Record.java
rename to org.adempiere.base/src/org/compiere/model/PO_Record.java
diff --git a/base/src/org/compiere/model/PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/PaymentProcessor.java
rename to org.adempiere.base/src/org/compiere/model/PaymentProcessor.java
diff --git a/base/src/org/compiere/model/PreferenceListener.java b/org.adempiere.base/src/org/compiere/model/PreferenceListener.java
similarity index 100%
rename from base/src/org/compiere/model/PreferenceListener.java
rename to org.adempiere.base/src/org/compiere/model/PreferenceListener.java
diff --git a/base/src/org/compiere/model/PrintInfo.java b/org.adempiere.base/src/org/compiere/model/PrintInfo.java
similarity index 100%
rename from base/src/org/compiere/model/PrintInfo.java
rename to org.adempiere.base/src/org/compiere/model/PrintInfo.java
diff --git a/base/src/org/compiere/model/ProductCost.java b/org.adempiere.base/src/org/compiere/model/ProductCost.java
similarity index 100%
rename from base/src/org/compiere/model/ProductCost.java
rename to org.adempiere.base/src/org/compiere/model/ProductCost.java
diff --git a/base/src/org/compiere/model/Query.java b/org.adempiere.base/src/org/compiere/model/Query.java
similarity index 100%
rename from base/src/org/compiere/model/Query.java
rename to org.adempiere.base/src/org/compiere/model/Query.java
diff --git a/base/src/org/compiere/model/ScheduleUtil.java b/org.adempiere.base/src/org/compiere/model/ScheduleUtil.java
similarity index 100%
rename from base/src/org/compiere/model/ScheduleUtil.java
rename to org.adempiere.base/src/org/compiere/model/ScheduleUtil.java
diff --git a/base/src/org/compiere/model/Scriptlet.java b/org.adempiere.base/src/org/compiere/model/Scriptlet.java
similarity index 100%
rename from base/src/org/compiere/model/Scriptlet.java
rename to org.adempiere.base/src/org/compiere/model/Scriptlet.java
diff --git a/base/src/org/compiere/model/StateChangeEvent.java b/org.adempiere.base/src/org/compiere/model/StateChangeEvent.java
similarity index 100%
rename from base/src/org/compiere/model/StateChangeEvent.java
rename to org.adempiere.base/src/org/compiere/model/StateChangeEvent.java
diff --git a/base/src/org/compiere/model/StateChangeListener.java b/org.adempiere.base/src/org/compiere/model/StateChangeListener.java
similarity index 100%
rename from base/src/org/compiere/model/StateChangeListener.java
rename to org.adempiere.base/src/org/compiere/model/StateChangeListener.java
diff --git a/base/src/org/compiere/model/Tax.java b/org.adempiere.base/src/org/compiere/model/Tax.java
similarity index 100%
rename from base/src/org/compiere/model/Tax.java
rename to org.adempiere.base/src/org/compiere/model/Tax.java
diff --git a/base/src/org/compiere/model/TranslationTable.java b/org.adempiere.base/src/org/compiere/model/TranslationTable.java
similarity index 100%
rename from base/src/org/compiere/model/TranslationTable.java
rename to org.adempiere.base/src/org/compiere/model/TranslationTable.java
diff --git a/base/src/org/compiere/model/VO.java b/org.adempiere.base/src/org/compiere/model/VO.java
similarity index 100%
rename from base/src/org/compiere/model/VO.java
rename to org.adempiere.base/src/org/compiere/model/VO.java
diff --git a/base/src/org/compiere/model/X_AD_AccessLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_AccessLog.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
diff --git a/base/src/org/compiere/model/X_AD_Alert.java b/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Alert.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
diff --git a/base/src/org/compiere/model/X_AD_AlertProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_AlertProcessor.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
diff --git a/base/src/org/compiere/model/X_AD_AlertProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_AlertProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
diff --git a/base/src/org/compiere/model/X_AD_AlertRecipient.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_AlertRecipient.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
diff --git a/base/src/org/compiere/model/X_AD_AlertRule.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_AlertRule.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
diff --git a/base/src/org/compiere/model/X_AD_Archive.java b/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Archive.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
diff --git a/base/src/org/compiere/model/X_AD_Attachment.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Attachment.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
diff --git a/base/src/org/compiere/model/X_AD_AttachmentNote.java b/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_AttachmentNote.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
diff --git a/base/src/org/compiere/model/X_AD_Attribute.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Attribute.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
diff --git a/base/src/org/compiere/model/X_AD_Attribute_Value.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Attribute_Value.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
diff --git a/base/src/org/compiere/model/X_AD_ChangeLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ChangeLog.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
diff --git a/base/src/org/compiere/model/X_AD_Client.java b/org.adempiere.base/src/org/compiere/model/X_AD_Client.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Client.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Client.java
diff --git a/base/src/org/compiere/model/X_AD_ClientInfo.java b/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ClientInfo.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
diff --git a/base/src/org/compiere/model/X_AD_ClientShare.java b/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ClientShare.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
diff --git a/base/src/org/compiere/model/X_AD_Color.java b/org.adempiere.base/src/org/compiere/model/X_AD_Color.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Color.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Color.java
diff --git a/base/src/org/compiere/model/X_AD_Column.java b/org.adempiere.base/src/org/compiere/model/X_AD_Column.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Column.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Column.java
diff --git a/base/src/org/compiere/model/X_AD_Column_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Column_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Desktop.java b/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Desktop.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
diff --git a/base/src/org/compiere/model/X_AD_DesktopWorkbench.java b/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_DesktopWorkbench.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
diff --git a/base/src/org/compiere/model/X_AD_Document_Action_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Document_Action_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Element.java b/org.adempiere.base/src/org/compiere/model/X_AD_Element.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Element.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Element.java
diff --git a/base/src/org/compiere/model/X_AD_EntityType.java b/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_EntityType.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
diff --git a/base/src/org/compiere/model/X_AD_Error.java b/org.adempiere.base/src/org/compiere/model/X_AD_Error.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Error.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Error.java
diff --git a/base/src/org/compiere/model/X_AD_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Field.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Field.java
diff --git a/base/src/org/compiere/model/X_AD_FieldGroup.java b/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_FieldGroup.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
diff --git a/base/src/org/compiere/model/X_AD_Find.java b/org.adempiere.base/src/org/compiere/model/X_AD_Find.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Find.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Find.java
diff --git a/base/src/org/compiere/model/X_AD_Form.java b/org.adempiere.base/src/org/compiere/model/X_AD_Form.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Form.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Form.java
diff --git a/base/src/org/compiere/model/X_AD_Form_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Form_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
diff --git a/base/src/org/compiere/model/X_AD_HouseKeeping.java b/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_HouseKeeping.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
diff --git a/base/src/org/compiere/model/X_AD_Image.java b/org.adempiere.base/src/org/compiere/model/X_AD_Image.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Image.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Image.java
diff --git a/base/src/org/compiere/model/X_AD_ImpFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ImpFormat.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
diff --git a/base/src/org/compiere/model/X_AD_ImpFormat_Row.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ImpFormat_Row.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
diff --git a/base/src/org/compiere/model/X_AD_InfoColumn.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_InfoColumn.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
diff --git a/base/src/org/compiere/model/X_AD_InfoWindow.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_InfoWindow.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
diff --git a/base/src/org/compiere/model/X_AD_Issue.java b/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Issue.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
diff --git a/base/src/org/compiere/model/X_AD_LabelPrinter.java b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_LabelPrinter.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
diff --git a/base/src/org/compiere/model/X_AD_LabelPrinterFunction.java b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
diff --git a/base/src/org/compiere/model/X_AD_Language.java b/org.adempiere.base/src/org/compiere/model/X_AD_Language.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Language.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Language.java
diff --git a/base/src/org/compiere/model/X_AD_LdapAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_LdapAccess.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
diff --git a/base/src/org/compiere/model/X_AD_LdapProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_LdapProcessor.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
diff --git a/base/src/org/compiere/model/X_AD_LdapProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_LdapProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
diff --git a/base/src/org/compiere/model/X_AD_Menu.java b/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Menu.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
diff --git a/base/src/org/compiere/model/X_AD_Message.java b/org.adempiere.base/src/org/compiere/model/X_AD_Message.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Message.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Message.java
diff --git a/base/src/org/compiere/model/X_AD_MigrationScript.java b/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_MigrationScript.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
diff --git a/base/src/org/compiere/model/X_AD_ModelValidator.java b/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ModelValidator.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
diff --git a/base/src/org/compiere/model/X_AD_Modification.java b/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Modification.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
diff --git a/base/src/org/compiere/model/X_AD_Note.java b/org.adempiere.base/src/org/compiere/model/X_AD_Note.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Note.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Note.java
diff --git a/base/src/org/compiere/model/X_AD_Org.java b/org.adempiere.base/src/org/compiere/model/X_AD_Org.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Org.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Org.java
diff --git a/base/src/org/compiere/model/X_AD_OrgInfo.java b/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_OrgInfo.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
diff --git a/base/src/org/compiere/model/X_AD_OrgType.java b/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_OrgType.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
diff --git a/base/src/org/compiere/model/X_AD_PInstance.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PInstance.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
diff --git a/base/src/org/compiere/model/X_AD_PInstance_Log.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PInstance_Log.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
diff --git a/base/src/org/compiere/model/X_AD_PInstance_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PInstance_Para.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Exp.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Exp.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Exp_Common.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Common.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Exp_Common.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Common.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Exp_Detail.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Imp.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Backup.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Detail.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Inst.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Proc.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
diff --git a/base/src/org/compiere/model/X_AD_Preference.java b/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Preference.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
diff --git a/base/src/org/compiere/model/X_AD_PrintColor.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintColor.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
diff --git a/base/src/org/compiere/model/X_AD_PrintFont.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintFont.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
diff --git a/base/src/org/compiere/model/X_AD_PrintForm.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintForm.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
diff --git a/base/src/org/compiere/model/X_AD_PrintFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintFormat.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
diff --git a/base/src/org/compiere/model/X_AD_PrintFormatItem.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintFormatItem.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
diff --git a/base/src/org/compiere/model/X_AD_PrintGraph.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintGraph.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
diff --git a/base/src/org/compiere/model/X_AD_PrintLabel.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintLabel.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
diff --git a/base/src/org/compiere/model/X_AD_PrintLabelLine.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintLabelLine.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
diff --git a/base/src/org/compiere/model/X_AD_PrintPaper.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintPaper.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
diff --git a/base/src/org/compiere/model/X_AD_PrintTableFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_PrintTableFormat.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
diff --git a/base/src/org/compiere/model/X_AD_Private_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Private_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Process.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Process.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Process.java
diff --git a/base/src/org/compiere/model/X_AD_Process_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Process_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Process_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Process_Para.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
diff --git a/base/src/org/compiere/model/X_AD_Record_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Record_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Ref_List.java b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Ref_List.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
diff --git a/base/src/org/compiere/model/X_AD_Ref_Table.java b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Ref_Table.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
diff --git a/base/src/org/compiere/model/X_AD_Reference.java b/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Reference.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
diff --git a/base/src/org/compiere/model/X_AD_Registration.java b/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Registration.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
diff --git a/base/src/org/compiere/model/X_AD_RelationType.java b/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_RelationType.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
diff --git a/base/src/org/compiere/model/X_AD_Replication.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Replication.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
diff --git a/base/src/org/compiere/model/X_AD_ReplicationDocument.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ReplicationDocument.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
diff --git a/base/src/org/compiere/model/X_AD_ReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ReplicationStrategy.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
diff --git a/base/src/org/compiere/model/X_AD_ReplicationTable.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ReplicationTable.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
diff --git a/base/src/org/compiere/model/X_AD_Replication_Log.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Replication_Log.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
diff --git a/base/src/org/compiere/model/X_AD_Replication_Run.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Replication_Run.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
diff --git a/base/src/org/compiere/model/X_AD_ReportView.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ReportView.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
diff --git a/base/src/org/compiere/model/X_AD_ReportView_Col.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_ReportView_Col.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
diff --git a/base/src/org/compiere/model/X_AD_Role.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Role.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Role.java
diff --git a/base/src/org/compiere/model/X_AD_Role_Included.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Role_Included.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
diff --git a/base/src/org/compiere/model/X_AD_Role_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Role_OrgAccess.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
diff --git a/base/src/org/compiere/model/X_AD_Rule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Rule.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
diff --git a/base/src/org/compiere/model/X_AD_Scheduler.java b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Scheduler.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
diff --git a/base/src/org/compiere/model/X_AD_SchedulerLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_SchedulerLog.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
diff --git a/base/src/org/compiere/model/X_AD_SchedulerRecipient.java b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_SchedulerRecipient.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
diff --git a/base/src/org/compiere/model/X_AD_Scheduler_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Scheduler_Para.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
diff --git a/base/src/org/compiere/model/X_AD_SearchDefinition.java b/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_SearchDefinition.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
diff --git a/base/src/org/compiere/model/X_AD_Sequence.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Sequence.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
diff --git a/base/src/org/compiere/model/X_AD_Sequence_Audit.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Sequence_Audit.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
diff --git a/base/src/org/compiere/model/X_AD_Sequence_No.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Sequence_No.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
diff --git a/base/src/org/compiere/model/X_AD_Session.java b/org.adempiere.base/src/org/compiere/model/X_AD_Session.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Session.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Session.java
diff --git a/base/src/org/compiere/model/X_AD_SysConfig.java b/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_SysConfig.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
diff --git a/base/src/org/compiere/model/X_AD_System.java b/org.adempiere.base/src/org/compiere/model/X_AD_System.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_System.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_System.java
diff --git a/base/src/org/compiere/model/X_AD_Tab.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Tab.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
diff --git a/base/src/org/compiere/model/X_AD_Table.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Table.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Table.java
diff --git a/base/src/org/compiere/model/X_AD_Table_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Table_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Table_ScriptValidator.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
diff --git a/base/src/org/compiere/model/X_AD_Task.java b/org.adempiere.base/src/org/compiere/model/X_AD_Task.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Task.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Task.java
diff --git a/base/src/org/compiere/model/X_AD_TaskInstance.java b/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TaskInstance.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
diff --git a/base/src/org/compiere/model/X_AD_Task_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Task_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Tree.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Tree.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
diff --git a/base/src/org/compiere/model/X_AD_TreeBar.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeBar.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeBar.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeBar.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNode.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNode.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeBP.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeBP.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMC.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeCMC.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMM.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeCMM.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMS.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeCMS.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMT.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeCMT.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeMM.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeMM.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodePR.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodePR.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU1.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeU1.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU2.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeU2.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU3.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeU3.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU4.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_TreeNodeU4.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
diff --git a/base/src/org/compiere/model/X_AD_User.java b/org.adempiere.base/src/org/compiere/model/X_AD_User.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_User.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_User.java
diff --git a/base/src/org/compiere/model/X_AD_UserBPAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_UserBPAccess.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
diff --git a/base/src/org/compiere/model/X_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_UserDef_Field.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
diff --git a/base/src/org/compiere/model/X_AD_UserDef_Tab.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_UserDef_Tab.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
diff --git a/base/src/org/compiere/model/X_AD_UserDef_Win.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_UserDef_Win.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
diff --git a/base/src/org/compiere/model/X_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_UserMail.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
diff --git a/base/src/org/compiere/model/X_AD_UserQuery.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_UserQuery.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
diff --git a/base/src/org/compiere/model/X_AD_User_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_User_OrgAccess.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
diff --git a/base/src/org/compiere/model/X_AD_User_Roles.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_User_Roles.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
diff --git a/base/src/org/compiere/model/X_AD_User_Substitute.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_User_Substitute.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
diff --git a/base/src/org/compiere/model/X_AD_Val_Rule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Val_Rule.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
diff --git a/base/src/org/compiere/model/X_AD_WF_Activity.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_Activity.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
diff --git a/base/src/org/compiere/model/X_AD_WF_ActivityResult.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_ActivityResult.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
diff --git a/base/src/org/compiere/model/X_AD_WF_Block.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_Block.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
diff --git a/base/src/org/compiere/model/X_AD_WF_EventAudit.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_EventAudit.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
diff --git a/base/src/org/compiere/model/X_AD_WF_NextCondition.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_NextCondition.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
diff --git a/base/src/org/compiere/model/X_AD_WF_Node.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_Node.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
diff --git a/base/src/org/compiere/model/X_AD_WF_NodeNext.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_NodeNext.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
diff --git a/base/src/org/compiere/model/X_AD_WF_Node_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_Node_Para.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
diff --git a/base/src/org/compiere/model/X_AD_WF_Process.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_Process.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
diff --git a/base/src/org/compiere/model/X_AD_WF_ProcessData.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_ProcessData.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
diff --git a/base/src/org/compiere/model/X_AD_WF_Responsible.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WF_Responsible.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
diff --git a/base/src/org/compiere/model/X_AD_Window.java b/org.adempiere.base/src/org/compiere/model/X_AD_Window.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Window.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Window.java
diff --git a/base/src/org/compiere/model/X_AD_Window_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Window_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
diff --git a/base/src/org/compiere/model/X_AD_Workbench.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Workbench.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
diff --git a/base/src/org/compiere/model/X_AD_WorkbenchWindow.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WorkbenchWindow.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
diff --git a/base/src/org/compiere/model/X_AD_Workflow.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Workflow.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
diff --git a/base/src/org/compiere/model/X_AD_WorkflowProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WorkflowProcessor.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
diff --git a/base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
diff --git a/base/src/org/compiere/model/X_AD_Workflow_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
similarity index 100%
rename from base/src/org/compiere/model/X_AD_Workflow_Access.java
rename to org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
diff --git a/base/src/org/compiere/model/X_ASP_ClientException.java b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_ClientException.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
diff --git a/base/src/org/compiere/model/X_ASP_ClientLevel.java b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_ClientLevel.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
diff --git a/base/src/org/compiere/model/X_ASP_Field.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Field.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
diff --git a/base/src/org/compiere/model/X_ASP_Form.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Form.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
diff --git a/base/src/org/compiere/model/X_ASP_Level.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Level.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
diff --git a/base/src/org/compiere/model/X_ASP_Module.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Module.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
diff --git a/base/src/org/compiere/model/X_ASP_Process.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Process.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
diff --git a/base/src/org/compiere/model/X_ASP_Process_Para.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Process_Para.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
diff --git a/base/src/org/compiere/model/X_ASP_Tab.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Tab.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
diff --git a/base/src/org/compiere/model/X_ASP_Task.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Task.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
diff --git a/base/src/org/compiere/model/X_ASP_Window.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Window.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
diff --git a/base/src/org/compiere/model/X_ASP_Workflow.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
similarity index 100%
rename from base/src/org/compiere/model/X_ASP_Workflow.java
rename to org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
diff --git a/base/src/org/compiere/model/X_A_Asset.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Addition.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Addition.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Change.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Change.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Delivery.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Delivery.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Disposed.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Disposed.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Group.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Group.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Group_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Fin.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Info_Fin.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Ins.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Info_Ins.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Lic.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Info_Lic.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Oth.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Info_Oth.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Tax.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Info_Tax.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Retirement.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Retirement.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Reval_Entry.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Reval_Index.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Reval_Index.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Split.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Split.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Spread.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Spread.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Spread.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Spread.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Transfer.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Transfer.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
diff --git a/base/src/org/compiere/model/X_A_Asset_Use.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Asset_Use.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Build.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Build.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Convention.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Convention.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Entry.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Entry.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Exp.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Exp.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Forecast.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Forecast.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Method.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Method.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Table_Header.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Workfile.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Depreciation_Workfile.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
diff --git a/base/src/org/compiere/model/X_A_Registration.java b/org.adempiere.base/src/org/compiere/model/X_A_Registration.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_Registration.java
rename to org.adempiere.base/src/org/compiere/model/X_A_Registration.java
diff --git a/base/src/org/compiere/model/X_A_RegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_RegistrationAttribute.java
rename to org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
diff --git a/base/src/org/compiere/model/X_A_RegistrationProduct.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_RegistrationProduct.java
rename to org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
diff --git a/base/src/org/compiere/model/X_A_RegistrationValue.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
similarity index 100%
rename from base/src/org/compiere/model/X_A_RegistrationValue.java
rename to org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
diff --git a/base/src/org/compiere/model/X_B_Bid.java b/org.adempiere.base/src/org/compiere/model/X_B_Bid.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_Bid.java
rename to org.adempiere.base/src/org/compiere/model/X_B_Bid.java
diff --git a/base/src/org/compiere/model/X_B_BidComment.java b/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_BidComment.java
rename to org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
diff --git a/base/src/org/compiere/model/X_B_Buyer.java b/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_Buyer.java
rename to org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
diff --git a/base/src/org/compiere/model/X_B_BuyerFunds.java b/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_BuyerFunds.java
rename to org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
diff --git a/base/src/org/compiere/model/X_B_Offer.java b/org.adempiere.base/src/org/compiere/model/X_B_Offer.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_Offer.java
rename to org.adempiere.base/src/org/compiere/model/X_B_Offer.java
diff --git a/base/src/org/compiere/model/X_B_Seller.java b/org.adempiere.base/src/org/compiere/model/X_B_Seller.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_Seller.java
rename to org.adempiere.base/src/org/compiere/model/X_B_Seller.java
diff --git a/base/src/org/compiere/model/X_B_SellerFunds.java b/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_SellerFunds.java
rename to org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
diff --git a/base/src/org/compiere/model/X_B_Topic.java b/org.adempiere.base/src/org/compiere/model/X_B_Topic.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_Topic.java
rename to org.adempiere.base/src/org/compiere/model/X_B_Topic.java
diff --git a/base/src/org/compiere/model/X_B_TopicCategory.java b/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_TopicCategory.java
rename to org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
diff --git a/base/src/org/compiere/model/X_B_TopicType.java b/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
similarity index 100%
rename from base/src/org/compiere/model/X_B_TopicType.java
rename to org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
diff --git a/base/src/org/compiere/model/X_CM_AccessContainer.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessContainer.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_AccessContainer.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_AccessContainer.java
diff --git a/base/src/org/compiere/model/X_CM_AccessListBPGroup.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessListBPGroup.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_AccessListBPGroup.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_AccessListBPGroup.java
diff --git a/base/src/org/compiere/model/X_CM_AccessListRole.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessListRole.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_AccessListRole.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_AccessListRole.java
diff --git a/base/src/org/compiere/model/X_CM_AccessMedia.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessMedia.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_AccessMedia.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_AccessMedia.java
diff --git a/base/src/org/compiere/model/X_CM_AccessNewsChannel.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessNewsChannel.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_AccessNewsChannel.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_AccessNewsChannel.java
diff --git a/base/src/org/compiere/model/X_CM_AccessProfile.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessProfile.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_AccessProfile.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_AccessProfile.java
diff --git a/base/src/org/compiere/model/X_CM_AccessStage.java b/org.adempiere.base/src/org/compiere/model/X_CM_AccessStage.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_AccessStage.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_AccessStage.java
diff --git a/base/src/org/compiere/model/X_CM_Ad.java b/org.adempiere.base/src/org/compiere/model/X_CM_Ad.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Ad.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Ad.java
diff --git a/base/src/org/compiere/model/X_CM_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/X_CM_Ad_Cat.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Ad_Cat.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Ad_Cat.java
diff --git a/base/src/org/compiere/model/X_CM_BroadcastServer.java b/org.adempiere.base/src/org/compiere/model/X_CM_BroadcastServer.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_BroadcastServer.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_BroadcastServer.java
diff --git a/base/src/org/compiere/model/X_CM_CStage.java b/org.adempiere.base/src/org/compiere/model/X_CM_CStage.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_CStage.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_CStage.java
diff --git a/base/src/org/compiere/model/X_CM_CStageTTable.java b/org.adempiere.base/src/org/compiere/model/X_CM_CStageTTable.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_CStageTTable.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_CStageTTable.java
diff --git a/base/src/org/compiere/model/X_CM_CStage_Element.java b/org.adempiere.base/src/org/compiere/model/X_CM_CStage_Element.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_CStage_Element.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_CStage_Element.java
diff --git a/base/src/org/compiere/model/X_CM_Chat.java b/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Chat.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
diff --git a/base/src/org/compiere/model/X_CM_ChatEntry.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_ChatEntry.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
diff --git a/base/src/org/compiere/model/X_CM_ChatType.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_ChatType.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
diff --git a/base/src/org/compiere/model/X_CM_ChatTypeUpdate.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
diff --git a/base/src/org/compiere/model/X_CM_ChatUpdate.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_ChatUpdate.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
diff --git a/base/src/org/compiere/model/X_CM_Container.java b/org.adempiere.base/src/org/compiere/model/X_CM_Container.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Container.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Container.java
diff --git a/base/src/org/compiere/model/X_CM_ContainerTTable.java b/org.adempiere.base/src/org/compiere/model/X_CM_ContainerTTable.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_ContainerTTable.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_ContainerTTable.java
diff --git a/base/src/org/compiere/model/X_CM_Container_Element.java b/org.adempiere.base/src/org/compiere/model/X_CM_Container_Element.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Container_Element.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Container_Element.java
diff --git a/base/src/org/compiere/model/X_CM_Container_URL.java b/org.adempiere.base/src/org/compiere/model/X_CM_Container_URL.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Container_URL.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Container_URL.java
diff --git a/base/src/org/compiere/model/X_CM_Media.java b/org.adempiere.base/src/org/compiere/model/X_CM_Media.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Media.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Media.java
diff --git a/base/src/org/compiere/model/X_CM_MediaDeploy.java b/org.adempiere.base/src/org/compiere/model/X_CM_MediaDeploy.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_MediaDeploy.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_MediaDeploy.java
diff --git a/base/src/org/compiere/model/X_CM_Media_Server.java b/org.adempiere.base/src/org/compiere/model/X_CM_Media_Server.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Media_Server.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Media_Server.java
diff --git a/base/src/org/compiere/model/X_CM_NewsChannel.java b/org.adempiere.base/src/org/compiere/model/X_CM_NewsChannel.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_NewsChannel.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_NewsChannel.java
diff --git a/base/src/org/compiere/model/X_CM_NewsItem.java b/org.adempiere.base/src/org/compiere/model/X_CM_NewsItem.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_NewsItem.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_NewsItem.java
diff --git a/base/src/org/compiere/model/X_CM_Template.java b/org.adempiere.base/src/org/compiere/model/X_CM_Template.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Template.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Template.java
diff --git a/base/src/org/compiere/model/X_CM_TemplateTable.java b/org.adempiere.base/src/org/compiere/model/X_CM_TemplateTable.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_TemplateTable.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_TemplateTable.java
diff --git a/base/src/org/compiere/model/X_CM_Template_Ad_Cat.java b/org.adempiere.base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
diff --git a/base/src/org/compiere/model/X_CM_WebAccessLog.java b/org.adempiere.base/src/org/compiere/model/X_CM_WebAccessLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_WebAccessLog.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_WebAccessLog.java
diff --git a/base/src/org/compiere/model/X_CM_WebProject.java b/org.adempiere.base/src/org/compiere/model/X_CM_WebProject.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_WebProject.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_WebProject.java
diff --git a/base/src/org/compiere/model/X_CM_WebProject_Domain.java b/org.adempiere.base/src/org/compiere/model/X_CM_WebProject_Domain.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_WebProject_Domain.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_WebProject_Domain.java
diff --git a/base/src/org/compiere/model/X_CM_WikiToken.java b/org.adempiere.base/src/org/compiere/model/X_CM_WikiToken.java
similarity index 100%
rename from base/src/org/compiere/model/X_CM_WikiToken.java
rename to org.adempiere.base/src/org/compiere/model/X_CM_WikiToken.java
diff --git a/base/src/org/compiere/model/X_C_AcctProcessor.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AcctProcessor.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
diff --git a/base/src/org/compiere/model/X_C_AcctProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AcctProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
diff --git a/base/src/org/compiere/model/X_C_AcctSchema.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AcctSchema.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
diff --git a/base/src/org/compiere/model/X_C_AcctSchema_Default.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AcctSchema_Default.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
diff --git a/base/src/org/compiere/model/X_C_AcctSchema_Element.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AcctSchema_Element.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
diff --git a/base/src/org/compiere/model/X_C_AcctSchema_GL.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AcctSchema_GL.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
diff --git a/base/src/org/compiere/model/X_C_Activity.java b/org.adempiere.base/src/org/compiere/model/X_C_Activity.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Activity.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Activity.java
diff --git a/base/src/org/compiere/model/X_C_AllocationHdr.java b/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AllocationHdr.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
diff --git a/base/src/org/compiere/model/X_C_AllocationLine.java b/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_AllocationLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
diff --git a/base/src/org/compiere/model/X_C_BP_BankAccount.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_BankAccount.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
diff --git a/base/src/org/compiere/model/X_C_BP_Customer_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_Customer_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
diff --git a/base/src/org/compiere/model/X_C_BP_EDI.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_EDI.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
diff --git a/base/src/org/compiere/model/X_C_BP_Employee_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_Employee_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
diff --git a/base/src/org/compiere/model/X_C_BP_Group.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_Group.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
diff --git a/base/src/org/compiere/model/X_C_BP_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_Group_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
diff --git a/base/src/org/compiere/model/X_C_BP_Relation.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_Relation.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
diff --git a/base/src/org/compiere/model/X_C_BP_Vendor_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
diff --git a/base/src/org/compiere/model/X_C_BP_Withholding.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BP_Withholding.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
diff --git a/base/src/org/compiere/model/X_C_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BPartner.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
diff --git a/base/src/org/compiere/model/X_C_BPartner_Location.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BPartner_Location.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
diff --git a/base/src/org/compiere/model/X_C_BPartner_Product.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BPartner_Product.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
diff --git a/base/src/org/compiere/model/X_C_Bank.java b/org.adempiere.base/src/org/compiere/model/X_C_Bank.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Bank.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Bank.java
diff --git a/base/src/org/compiere/model/X_C_BankAccount.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BankAccount.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
diff --git a/base/src/org/compiere/model/X_C_BankAccountDoc.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BankAccountDoc.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
diff --git a/base/src/org/compiere/model/X_C_BankAccount_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BankAccount_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
diff --git a/base/src/org/compiere/model/X_C_BankStatement.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BankStatement.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
diff --git a/base/src/org/compiere/model/X_C_BankStatementLine.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BankStatementLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
diff --git a/base/src/org/compiere/model/X_C_BankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BankStatementLoader.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
diff --git a/base/src/org/compiere/model/X_C_BankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_BankStatementMatcher.java
rename to org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
diff --git a/base/src/org/compiere/model/X_C_Calendar.java b/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Calendar.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
diff --git a/base/src/org/compiere/model/X_C_Campaign.java b/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Campaign.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
diff --git a/base/src/org/compiere/model/X_C_Cash.java b/org.adempiere.base/src/org/compiere/model/X_C_Cash.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Cash.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Cash.java
diff --git a/base/src/org/compiere/model/X_C_CashBook.java b/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CashBook.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
diff --git a/base/src/org/compiere/model/X_C_CashBook_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CashBook_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
diff --git a/base/src/org/compiere/model/X_C_CashLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CashLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
diff --git a/base/src/org/compiere/model/X_C_Channel.java b/org.adempiere.base/src/org/compiere/model/X_C_Channel.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Channel.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Channel.java
diff --git a/base/src/org/compiere/model/X_C_Charge.java b/org.adempiere.base/src/org/compiere/model/X_C_Charge.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Charge.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Charge.java
diff --git a/base/src/org/compiere/model/X_C_ChargeType.java b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ChargeType.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
diff --git a/base/src/org/compiere/model/X_C_ChargeType_DocType.java b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ChargeType_DocType.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
diff --git a/base/src/org/compiere/model/X_C_Charge_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Charge_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
diff --git a/base/src/org/compiere/model/X_C_City.java b/org.adempiere.base/src/org/compiere/model/X_C_City.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_City.java
rename to org.adempiere.base/src/org/compiere/model/X_C_City.java
diff --git a/base/src/org/compiere/model/X_C_Commission.java b/org.adempiere.base/src/org/compiere/model/X_C_Commission.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Commission.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Commission.java
diff --git a/base/src/org/compiere/model/X_C_CommissionAmt.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CommissionAmt.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
diff --git a/base/src/org/compiere/model/X_C_CommissionDetail.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CommissionDetail.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
diff --git a/base/src/org/compiere/model/X_C_CommissionLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CommissionLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
diff --git a/base/src/org/compiere/model/X_C_CommissionRun.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CommissionRun.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
diff --git a/base/src/org/compiere/model/X_C_ConversionType.java b/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ConversionType.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
diff --git a/base/src/org/compiere/model/X_C_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Conversion_Rate.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
diff --git a/base/src/org/compiere/model/X_C_Country.java b/org.adempiere.base/src/org/compiere/model/X_C_Country.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Country.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Country.java
diff --git a/base/src/org/compiere/model/X_C_Currency.java b/org.adempiere.base/src/org/compiere/model/X_C_Currency.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Currency.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Currency.java
diff --git a/base/src/org/compiere/model/X_C_Currency_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Currency_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
diff --git a/base/src/org/compiere/model/X_C_Cycle.java b/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Cycle.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
diff --git a/base/src/org/compiere/model/X_C_CyclePhase.java b/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CyclePhase.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
diff --git a/base/src/org/compiere/model/X_C_CycleStep.java b/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_CycleStep.java
rename to org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
diff --git a/base/src/org/compiere/model/X_C_DocType.java b/org.adempiere.base/src/org/compiere/model/X_C_DocType.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_DocType.java
rename to org.adempiere.base/src/org/compiere/model/X_C_DocType.java
diff --git a/base/src/org/compiere/model/X_C_DocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_DocTypeCounter.java
rename to org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
diff --git a/base/src/org/compiere/model/X_C_Dunning.java b/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Dunning.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
diff --git a/base/src/org/compiere/model/X_C_DunningLevel.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_DunningLevel.java
rename to org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
diff --git a/base/src/org/compiere/model/X_C_DunningRun.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_DunningRun.java
rename to org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
diff --git a/base/src/org/compiere/model/X_C_DunningRunEntry.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_DunningRunEntry.java
rename to org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
diff --git a/base/src/org/compiere/model/X_C_DunningRunLine.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_DunningRunLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
diff --git a/base/src/org/compiere/model/X_C_Element.java b/org.adempiere.base/src/org/compiere/model/X_C_Element.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Element.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Element.java
diff --git a/base/src/org/compiere/model/X_C_ElementValue.java b/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ElementValue.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
diff --git a/base/src/org/compiere/model/X_C_Greeting.java b/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Greeting.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
diff --git a/base/src/org/compiere/model/X_C_InterOrg_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_InterOrg_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
diff --git a/base/src/org/compiere/model/X_C_Invoice.java b/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Invoice.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
diff --git a/base/src/org/compiere/model/X_C_InvoiceBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_InvoiceBatch.java
rename to org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
diff --git a/base/src/org/compiere/model/X_C_InvoiceBatchLine.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_InvoiceBatchLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
diff --git a/base/src/org/compiere/model/X_C_InvoiceLine.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_InvoiceLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
diff --git a/base/src/org/compiere/model/X_C_InvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_InvoicePaySchedule.java
rename to org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
diff --git a/base/src/org/compiere/model/X_C_InvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_InvoiceSchedule.java
rename to org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
diff --git a/base/src/org/compiere/model/X_C_InvoiceTax.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_InvoiceTax.java
rename to org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
diff --git a/base/src/org/compiere/model/X_C_Job.java b/org.adempiere.base/src/org/compiere/model/X_C_Job.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Job.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Job.java
diff --git a/base/src/org/compiere/model/X_C_JobAssignment.java b/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_JobAssignment.java
rename to org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
diff --git a/base/src/org/compiere/model/X_C_JobCategory.java b/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_JobCategory.java
rename to org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
diff --git a/base/src/org/compiere/model/X_C_JobRemuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_JobRemuneration.java
rename to org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
diff --git a/base/src/org/compiere/model/X_C_LandedCost.java b/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_LandedCost.java
rename to org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
diff --git a/base/src/org/compiere/model/X_C_LandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_LandedCostAllocation.java
rename to org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
diff --git a/base/src/org/compiere/model/X_C_Location.java b/org.adempiere.base/src/org/compiere/model/X_C_Location.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Location.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Location.java
diff --git a/base/src/org/compiere/model/X_C_NonBusinessDay.java b/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_NonBusinessDay.java
rename to org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
diff --git a/base/src/org/compiere/model/X_C_Order.java b/org.adempiere.base/src/org/compiere/model/X_C_Order.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Order.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Order.java
diff --git a/base/src/org/compiere/model/X_C_OrderLine.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_OrderLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
diff --git a/base/src/org/compiere/model/X_C_OrderSource.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_OrderSource.java
rename to org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
diff --git a/base/src/org/compiere/model/X_C_OrderTax.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_OrderTax.java
rename to org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
diff --git a/base/src/org/compiere/model/X_C_OrgAssignment.java b/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_OrgAssignment.java
rename to org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
diff --git a/base/src/org/compiere/model/X_C_POS.java b/org.adempiere.base/src/org/compiere/model/X_C_POS.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_POS.java
rename to org.adempiere.base/src/org/compiere/model/X_C_POS.java
diff --git a/base/src/org/compiere/model/X_C_POSKey.java b/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_POSKey.java
rename to org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
diff --git a/base/src/org/compiere/model/X_C_POSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_POSKeyLayout.java
rename to org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
diff --git a/base/src/org/compiere/model/X_C_PaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaySchedule.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
diff --git a/base/src/org/compiere/model/X_C_PaySelection.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaySelection.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
diff --git a/base/src/org/compiere/model/X_C_PaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaySelectionCheck.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
diff --git a/base/src/org/compiere/model/X_C_PaySelectionLine.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaySelectionLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
diff --git a/base/src/org/compiere/model/X_C_Payment.java b/org.adempiere.base/src/org/compiere/model/X_C_Payment.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Payment.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Payment.java
diff --git a/base/src/org/compiere/model/X_C_PaymentAllocate.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaymentAllocate.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
diff --git a/base/src/org/compiere/model/X_C_PaymentBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaymentBatch.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
diff --git a/base/src/org/compiere/model/X_C_PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaymentProcessor.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
diff --git a/base/src/org/compiere/model/X_C_PaymentTerm.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PaymentTerm.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
diff --git a/base/src/org/compiere/model/X_C_Period.java b/org.adempiere.base/src/org/compiere/model/X_C_Period.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Period.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Period.java
diff --git a/base/src/org/compiere/model/X_C_PeriodControl.java b/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_PeriodControl.java
rename to org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
diff --git a/base/src/org/compiere/model/X_C_Phase.java b/org.adempiere.base/src/org/compiere/model/X_C_Phase.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Phase.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Phase.java
diff --git a/base/src/org/compiere/model/X_C_Project.java b/org.adempiere.base/src/org/compiere/model/X_C_Project.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Project.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Project.java
diff --git a/base/src/org/compiere/model/X_C_ProjectIssue.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ProjectIssue.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
diff --git a/base/src/org/compiere/model/X_C_ProjectIssueMA.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ProjectIssueMA.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
diff --git a/base/src/org/compiere/model/X_C_ProjectLine.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ProjectLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
diff --git a/base/src/org/compiere/model/X_C_ProjectPhase.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ProjectPhase.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
diff --git a/base/src/org/compiere/model/X_C_ProjectTask.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ProjectTask.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
diff --git a/base/src/org/compiere/model/X_C_ProjectType.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ProjectType.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
diff --git a/base/src/org/compiere/model/X_C_Project_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Project_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
diff --git a/base/src/org/compiere/model/X_C_Recurring.java b/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Recurring.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
diff --git a/base/src/org/compiere/model/X_C_Recurring_Run.java b/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Recurring_Run.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
diff --git a/base/src/org/compiere/model/X_C_Region.java b/org.adempiere.base/src/org/compiere/model/X_C_Region.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Region.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Region.java
diff --git a/base/src/org/compiere/model/X_C_Remuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Remuneration.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
diff --git a/base/src/org/compiere/model/X_C_RevenueRecognition.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RevenueRecognition.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
diff --git a/base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
diff --git a/base/src/org/compiere/model/X_C_RevenueRecognition_Run.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
diff --git a/base/src/org/compiere/model/X_C_RfQ.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQ.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
diff --git a/base/src/org/compiere/model/X_C_RfQLine.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
diff --git a/base/src/org/compiere/model/X_C_RfQLineQty.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQLineQty.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
diff --git a/base/src/org/compiere/model/X_C_RfQResponse.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQResponse.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
diff --git a/base/src/org/compiere/model/X_C_RfQResponseLine.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQResponseLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
diff --git a/base/src/org/compiere/model/X_C_RfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQResponseLineQty.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
diff --git a/base/src/org/compiere/model/X_C_RfQ_Topic.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQ_Topic.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
diff --git a/base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
diff --git a/base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
rename to org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
diff --git a/base/src/org/compiere/model/X_C_SalesRegion.java b/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_SalesRegion.java
rename to org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
diff --git a/base/src/org/compiere/model/X_C_ServiceLevel.java b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ServiceLevel.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
diff --git a/base/src/org/compiere/model/X_C_ServiceLevelLine.java b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ServiceLevelLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
diff --git a/base/src/org/compiere/model/X_C_SubAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_SubAcct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
diff --git a/base/src/org/compiere/model/X_C_Subscription.java b/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Subscription.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
diff --git a/base/src/org/compiere/model/X_C_SubscriptionType.java b/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_SubscriptionType.java
rename to org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
diff --git a/base/src/org/compiere/model/X_C_Subscription_Delivery.java b/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Subscription_Delivery.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
diff --git a/base/src/org/compiere/model/X_C_Task.java b/org.adempiere.base/src/org/compiere/model/X_C_Task.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Task.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Task.java
diff --git a/base/src/org/compiere/model/X_C_Tax.java b/org.adempiere.base/src/org/compiere/model/X_C_Tax.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Tax.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Tax.java
diff --git a/base/src/org/compiere/model/X_C_TaxCategory.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_TaxCategory.java
rename to org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
diff --git a/base/src/org/compiere/model/X_C_TaxDeclaration.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_TaxDeclaration.java
rename to org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
diff --git a/base/src/org/compiere/model/X_C_TaxDeclarationAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
diff --git a/base/src/org/compiere/model/X_C_TaxDeclarationLine.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_TaxDeclarationLine.java
rename to org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
diff --git a/base/src/org/compiere/model/X_C_TaxPostal.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_TaxPostal.java
rename to org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
diff --git a/base/src/org/compiere/model/X_C_Tax_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Tax_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
diff --git a/base/src/org/compiere/model/X_C_UOM.java b/org.adempiere.base/src/org/compiere/model/X_C_UOM.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_UOM.java
rename to org.adempiere.base/src/org/compiere/model/X_C_UOM.java
diff --git a/base/src/org/compiere/model/X_C_UOM_Conversion.java b/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_UOM_Conversion.java
rename to org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
diff --git a/base/src/org/compiere/model/X_C_UserRemuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_UserRemuneration.java
rename to org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
diff --git a/base/src/org/compiere/model/X_C_ValidCombination.java b/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_ValidCombination.java
rename to org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
diff --git a/base/src/org/compiere/model/X_C_Withholding.java b/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Withholding.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
diff --git a/base/src/org/compiere/model/X_C_Withholding_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Withholding_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
diff --git a/base/src/org/compiere/model/X_C_Year.java b/org.adempiere.base/src/org/compiere/model/X_C_Year.java
similarity index 100%
rename from base/src/org/compiere/model/X_C_Year.java
rename to org.adempiere.base/src/org/compiere/model/X_C_Year.java
diff --git a/base/src/org/compiere/model/X_EXP_Format.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
similarity index 100%
rename from base/src/org/compiere/model/X_EXP_Format.java
rename to org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
diff --git a/base/src/org/compiere/model/X_EXP_FormatLine.java b/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_EXP_FormatLine.java
rename to org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
diff --git a/base/src/org/compiere/model/X_EXP_Processor.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
similarity index 100%
rename from base/src/org/compiere/model/X_EXP_Processor.java
rename to org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
diff --git a/base/src/org/compiere/model/X_EXP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
similarity index 100%
rename from base/src/org/compiere/model/X_EXP_ProcessorParameter.java
rename to org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
diff --git a/base/src/org/compiere/model/X_EXP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
similarity index 100%
rename from base/src/org/compiere/model/X_EXP_Processor_Type.java
rename to org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
diff --git a/base/src/org/compiere/model/X_Fact_Acct.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_Fact_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
diff --git a/base/src/org/compiere/model/X_Fact_Acct_Summary.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
similarity index 100%
rename from base/src/org/compiere/model/X_Fact_Acct_Summary.java
rename to org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
diff --git a/base/src/org/compiere/model/X_GL_Budget.java b/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_Budget.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
diff --git a/base/src/org/compiere/model/X_GL_BudgetControl.java b/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_BudgetControl.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
diff --git a/base/src/org/compiere/model/X_GL_Category.java b/org.adempiere.base/src/org/compiere/model/X_GL_Category.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_Category.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_Category.java
diff --git a/base/src/org/compiere/model/X_GL_Distribution.java b/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_Distribution.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
diff --git a/base/src/org/compiere/model/X_GL_DistributionLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_DistributionLine.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
diff --git a/base/src/org/compiere/model/X_GL_Fund.java b/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_Fund.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
diff --git a/base/src/org/compiere/model/X_GL_FundRestriction.java b/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_FundRestriction.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
diff --git a/base/src/org/compiere/model/X_GL_Journal.java b/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_Journal.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
diff --git a/base/src/org/compiere/model/X_GL_JournalBatch.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_JournalBatch.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
diff --git a/base/src/org/compiere/model/X_GL_JournalLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_GL_JournalLine.java
rename to org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
diff --git a/base/src/org/compiere/model/X_IMP_Processor.java b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
similarity index 100%
rename from base/src/org/compiere/model/X_IMP_Processor.java
rename to org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
diff --git a/base/src/org/compiere/model/X_IMP_ProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_IMP_ProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
diff --git a/base/src/org/compiere/model/X_IMP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
similarity index 100%
rename from base/src/org/compiere/model/X_IMP_ProcessorParameter.java
rename to org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
diff --git a/base/src/org/compiere/model/X_IMP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
similarity index 100%
rename from base/src/org/compiere/model/X_IMP_Processor_Type.java
rename to org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
diff --git a/base/src/org/compiere/model/X_I_Asset.java b/org.adempiere.base/src/org/compiere/model/X_I_Asset.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_Asset.java
rename to org.adempiere.base/src/org/compiere/model/X_I_Asset.java
diff --git a/base/src/org/compiere/model/X_I_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_BPartner.java
rename to org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
diff --git a/base/src/org/compiere/model/X_I_BankStatement.java b/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_BankStatement.java
rename to org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
diff --git a/base/src/org/compiere/model/X_I_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_Conversion_Rate.java
rename to org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
diff --git a/base/src/org/compiere/model/X_I_ElementValue.java b/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_ElementValue.java
rename to org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
diff --git a/base/src/org/compiere/model/X_I_FAJournal.java b/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_FAJournal.java
rename to org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
diff --git a/base/src/org/compiere/model/X_I_GLJournal.java b/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_GLJournal.java
rename to org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
diff --git a/base/src/org/compiere/model/X_I_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_InOutLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
diff --git a/base/src/org/compiere/model/X_I_Inventory.java b/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_Inventory.java
rename to org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
diff --git a/base/src/org/compiere/model/X_I_Invoice.java b/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_Invoice.java
rename to org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
diff --git a/base/src/org/compiere/model/X_I_Order.java b/org.adempiere.base/src/org/compiere/model/X_I_Order.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_Order.java
rename to org.adempiere.base/src/org/compiere/model/X_I_Order.java
diff --git a/base/src/org/compiere/model/X_I_Payment.java b/org.adempiere.base/src/org/compiere/model/X_I_Payment.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_Payment.java
rename to org.adempiere.base/src/org/compiere/model/X_I_Payment.java
diff --git a/base/src/org/compiere/model/X_I_PriceList.java b/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_PriceList.java
rename to org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
diff --git a/base/src/org/compiere/model/X_I_Product.java b/org.adempiere.base/src/org/compiere/model/X_I_Product.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_Product.java
rename to org.adempiere.base/src/org/compiere/model/X_I_Product.java
diff --git a/base/src/org/compiere/model/X_I_ReportLine.java b/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_I_ReportLine.java
rename to org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
diff --git a/base/src/org/compiere/model/X_K_Category.java b/org.adempiere.base/src/org/compiere/model/X_K_Category.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Category.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Category.java
diff --git a/base/src/org/compiere/model/X_K_CategoryValue.java b/org.adempiere.base/src/org/compiere/model/X_K_CategoryValue.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_CategoryValue.java
rename to org.adempiere.base/src/org/compiere/model/X_K_CategoryValue.java
diff --git a/base/src/org/compiere/model/X_K_Comment.java b/org.adempiere.base/src/org/compiere/model/X_K_Comment.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Comment.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Comment.java
diff --git a/base/src/org/compiere/model/X_K_Entry.java b/org.adempiere.base/src/org/compiere/model/X_K_Entry.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Entry.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Entry.java
diff --git a/base/src/org/compiere/model/X_K_EntryCategory.java b/org.adempiere.base/src/org/compiere/model/X_K_EntryCategory.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_EntryCategory.java
rename to org.adempiere.base/src/org/compiere/model/X_K_EntryCategory.java
diff --git a/base/src/org/compiere/model/X_K_EntryRelated.java b/org.adempiere.base/src/org/compiere/model/X_K_EntryRelated.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_EntryRelated.java
rename to org.adempiere.base/src/org/compiere/model/X_K_EntryRelated.java
diff --git a/base/src/org/compiere/model/X_K_Index.java b/org.adempiere.base/src/org/compiere/model/X_K_Index.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Index.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Index.java
diff --git a/base/src/org/compiere/model/X_K_IndexLog.java b/org.adempiere.base/src/org/compiere/model/X_K_IndexLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_IndexLog.java
rename to org.adempiere.base/src/org/compiere/model/X_K_IndexLog.java
diff --git a/base/src/org/compiere/model/X_K_IndexStop.java b/org.adempiere.base/src/org/compiere/model/X_K_IndexStop.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_IndexStop.java
rename to org.adempiere.base/src/org/compiere/model/X_K_IndexStop.java
diff --git a/base/src/org/compiere/model/X_K_Source.java b/org.adempiere.base/src/org/compiere/model/X_K_Source.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Source.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Source.java
diff --git a/base/src/org/compiere/model/X_K_Synonym.java b/org.adempiere.base/src/org/compiere/model/X_K_Synonym.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Synonym.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Synonym.java
diff --git a/base/src/org/compiere/model/X_K_Topic.java b/org.adempiere.base/src/org/compiere/model/X_K_Topic.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Topic.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Topic.java
diff --git a/base/src/org/compiere/model/X_K_Type.java b/org.adempiere.base/src/org/compiere/model/X_K_Type.java
similarity index 100%
rename from base/src/org/compiere/model/X_K_Type.java
rename to org.adempiere.base/src/org/compiere/model/X_K_Type.java
diff --git a/base/src/org/compiere/model/X_M_Attribute.java b/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Attribute.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
diff --git a/base/src/org/compiere/model/X_M_AttributeInstance.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_AttributeInstance.java
rename to org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
diff --git a/base/src/org/compiere/model/X_M_AttributeSearch.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_AttributeSearch.java
rename to org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
diff --git a/base/src/org/compiere/model/X_M_AttributeSet.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_AttributeSet.java
rename to org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
diff --git a/base/src/org/compiere/model/X_M_AttributeSetExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_AttributeSetExclude.java
rename to org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
diff --git a/base/src/org/compiere/model/X_M_AttributeSetInstance.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_AttributeSetInstance.java
rename to org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
diff --git a/base/src/org/compiere/model/X_M_AttributeUse.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_AttributeUse.java
rename to org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
diff --git a/base/src/org/compiere/model/X_M_AttributeValue.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_AttributeValue.java
rename to org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
diff --git a/base/src/org/compiere/model/X_M_BOM.java b/org.adempiere.base/src/org/compiere/model/X_M_BOM.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_BOM.java
rename to org.adempiere.base/src/org/compiere/model/X_M_BOM.java
diff --git a/base/src/org/compiere/model/X_M_BOMAlternative.java b/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_BOMAlternative.java
rename to org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
diff --git a/base/src/org/compiere/model/X_M_BOMProduct.java b/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_BOMProduct.java
rename to org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
diff --git a/base/src/org/compiere/model/X_M_ChangeNotice.java b/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ChangeNotice.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
diff --git a/base/src/org/compiere/model/X_M_ChangeRequest.java b/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ChangeRequest.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
diff --git a/base/src/org/compiere/model/X_M_Cost.java b/org.adempiere.base/src/org/compiere/model/X_M_Cost.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Cost.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Cost.java
diff --git a/base/src/org/compiere/model/X_M_CostDetail.java b/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_CostDetail.java
rename to org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
diff --git a/base/src/org/compiere/model/X_M_CostElement.java b/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_CostElement.java
rename to org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
diff --git a/base/src/org/compiere/model/X_M_CostQueue.java b/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_CostQueue.java
rename to org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
diff --git a/base/src/org/compiere/model/X_M_CostType.java b/org.adempiere.base/src/org/compiere/model/X_M_CostType.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_CostType.java
rename to org.adempiere.base/src/org/compiere/model/X_M_CostType.java
diff --git a/base/src/org/compiere/model/X_M_Demand.java b/org.adempiere.base/src/org/compiere/model/X_M_Demand.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Demand.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Demand.java
diff --git a/base/src/org/compiere/model/X_M_DemandDetail.java b/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DemandDetail.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
diff --git a/base/src/org/compiere/model/X_M_DemandLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DemandLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
diff --git a/base/src/org/compiere/model/X_M_DiscountSchema.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DiscountSchema.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
diff --git a/base/src/org/compiere/model/X_M_DiscountSchemaBreak.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
diff --git a/base/src/org/compiere/model/X_M_DiscountSchemaLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DiscountSchemaLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
diff --git a/base/src/org/compiere/model/X_M_DistributionList.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DistributionList.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
diff --git a/base/src/org/compiere/model/X_M_DistributionListLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DistributionListLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
diff --git a/base/src/org/compiere/model/X_M_DistributionRun.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DistributionRun.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
diff --git a/base/src/org/compiere/model/X_M_DistributionRunLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_DistributionRunLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
diff --git a/base/src/org/compiere/model/X_M_Forecast.java b/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Forecast.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
diff --git a/base/src/org/compiere/model/X_M_ForecastLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ForecastLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
diff --git a/base/src/org/compiere/model/X_M_Freight.java b/org.adempiere.base/src/org/compiere/model/X_M_Freight.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Freight.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Freight.java
diff --git a/base/src/org/compiere/model/X_M_FreightCategory.java b/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_FreightCategory.java
rename to org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
diff --git a/base/src/org/compiere/model/X_M_InOut.java b/org.adempiere.base/src/org/compiere/model/X_M_InOut.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_InOut.java
rename to org.adempiere.base/src/org/compiere/model/X_M_InOut.java
diff --git a/base/src/org/compiere/model/X_M_InOutConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_InOutConfirm.java
rename to org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
diff --git a/base/src/org/compiere/model/X_M_InOutLine.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_InOutLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
diff --git a/base/src/org/compiere/model/X_M_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_InOutLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
diff --git a/base/src/org/compiere/model/X_M_InOutLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_InOutLineMA.java
rename to org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
diff --git a/base/src/org/compiere/model/X_M_Inventory.java b/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Inventory.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
diff --git a/base/src/org/compiere/model/X_M_InventoryLine.java b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_InventoryLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
diff --git a/base/src/org/compiere/model/X_M_InventoryLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_InventoryLineMA.java
rename to org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
diff --git a/base/src/org/compiere/model/X_M_Locator.java b/org.adempiere.base/src/org/compiere/model/X_M_Locator.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Locator.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Locator.java
diff --git a/base/src/org/compiere/model/X_M_Lot.java b/org.adempiere.base/src/org/compiere/model/X_M_Lot.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Lot.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Lot.java
diff --git a/base/src/org/compiere/model/X_M_LotCtl.java b/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_LotCtl.java
rename to org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
diff --git a/base/src/org/compiere/model/X_M_LotCtlExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_LotCtlExclude.java
rename to org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
diff --git a/base/src/org/compiere/model/X_M_MatchInv.java b/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_MatchInv.java
rename to org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
diff --git a/base/src/org/compiere/model/X_M_MatchPO.java b/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_MatchPO.java
rename to org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
diff --git a/base/src/org/compiere/model/X_M_Movement.java b/org.adempiere.base/src/org/compiere/model/X_M_Movement.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Movement.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Movement.java
diff --git a/base/src/org/compiere/model/X_M_MovementConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_MovementConfirm.java
rename to org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
diff --git a/base/src/org/compiere/model/X_M_MovementLine.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_MovementLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
diff --git a/base/src/org/compiere/model/X_M_MovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_MovementLineConfirm.java
rename to org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
diff --git a/base/src/org/compiere/model/X_M_MovementLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_MovementLineMA.java
rename to org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
diff --git a/base/src/org/compiere/model/X_M_OperationResource.java b/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_OperationResource.java
rename to org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
diff --git a/base/src/org/compiere/model/X_M_Package.java b/org.adempiere.base/src/org/compiere/model/X_M_Package.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Package.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Package.java
diff --git a/base/src/org/compiere/model/X_M_PackageLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PackageLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
diff --git a/base/src/org/compiere/model/X_M_PerpetualInv.java b/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PerpetualInv.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
diff --git a/base/src/org/compiere/model/X_M_PriceList.java b/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PriceList.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
diff --git a/base/src/org/compiere/model/X_M_PriceList_Version.java b/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PriceList_Version.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
diff --git a/base/src/org/compiere/model/X_M_Product.java b/org.adempiere.base/src/org/compiere/model/X_M_Product.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Product.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Product.java
diff --git a/base/src/org/compiere/model/X_M_ProductDownload.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ProductDownload.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
diff --git a/base/src/org/compiere/model/X_M_ProductOperation.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ProductOperation.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
diff --git a/base/src/org/compiere/model/X_M_ProductPrice.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ProductPrice.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
diff --git a/base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
diff --git a/base/src/org/compiere/model/X_M_Product_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Product_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
diff --git a/base/src/org/compiere/model/X_M_Product_BOM.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Product_BOM.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
diff --git a/base/src/org/compiere/model/X_M_Product_Category.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Product_Category.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
diff --git a/base/src/org/compiere/model/X_M_Product_Category_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Product_Category_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
diff --git a/base/src/org/compiere/model/X_M_Product_Costing.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Costing.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Product_Costing.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Product_Costing.java
diff --git a/base/src/org/compiere/model/X_M_Product_PO.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Product_PO.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
diff --git a/base/src/org/compiere/model/X_M_Production.java b/org.adempiere.base/src/org/compiere/model/X_M_Production.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Production.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Production.java
diff --git a/base/src/org/compiere/model/X_M_ProductionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ProductionLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
diff --git a/base/src/org/compiere/model/X_M_ProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ProductionLineMA.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
diff --git a/base/src/org/compiere/model/X_M_ProductionPlan.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_ProductionPlan.java
rename to org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
diff --git a/base/src/org/compiere/model/X_M_Promotion.java b/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Promotion.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
diff --git a/base/src/org/compiere/model/X_M_PromotionDistribution.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PromotionDistribution.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
diff --git a/base/src/org/compiere/model/X_M_PromotionGroup.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PromotionGroup.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
diff --git a/base/src/org/compiere/model/X_M_PromotionGroupLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PromotionGroupLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
diff --git a/base/src/org/compiere/model/X_M_PromotionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PromotionLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
diff --git a/base/src/org/compiere/model/X_M_PromotionPreCondition.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PromotionPreCondition.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
diff --git a/base/src/org/compiere/model/X_M_PromotionReward.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_PromotionReward.java
rename to org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
diff --git a/base/src/org/compiere/model/X_M_RMA.java b/org.adempiere.base/src/org/compiere/model/X_M_RMA.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_RMA.java
rename to org.adempiere.base/src/org/compiere/model/X_M_RMA.java
diff --git a/base/src/org/compiere/model/X_M_RMALine.java b/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_RMALine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
diff --git a/base/src/org/compiere/model/X_M_RMAType.java b/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_RMAType.java
rename to org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
diff --git a/base/src/org/compiere/model/X_M_RelatedProduct.java b/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_RelatedProduct.java
rename to org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
diff --git a/base/src/org/compiere/model/X_M_Replenish.java b/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Replenish.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
diff --git a/base/src/org/compiere/model/X_M_Requisition.java b/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Requisition.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
diff --git a/base/src/org/compiere/model/X_M_RequisitionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_RequisitionLine.java
rename to org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
diff --git a/base/src/org/compiere/model/X_M_SerNoCtl.java b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_SerNoCtl.java
rename to org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
diff --git a/base/src/org/compiere/model/X_M_SerNoCtlExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_SerNoCtlExclude.java
rename to org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
diff --git a/base/src/org/compiere/model/X_M_Shipper.java b/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Shipper.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
diff --git a/base/src/org/compiere/model/X_M_Storage.java b/org.adempiere.base/src/org/compiere/model/X_M_Storage.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Storage.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Storage.java
diff --git a/base/src/org/compiere/model/X_M_Substitute.java b/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Substitute.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
diff --git a/base/src/org/compiere/model/X_M_Transaction.java b/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Transaction.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
diff --git a/base/src/org/compiere/model/X_M_TransactionAllocation.java b/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_TransactionAllocation.java
rename to org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
diff --git a/base/src/org/compiere/model/X_M_Warehouse.java b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Warehouse.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
diff --git a/base/src/org/compiere/model/X_M_Warehouse_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
similarity index 100%
rename from base/src/org/compiere/model/X_M_Warehouse_Acct.java
rename to org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
diff --git a/base/src/org/compiere/model/X_PA_Achievement.java b/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_Achievement.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
diff --git a/base/src/org/compiere/model/X_PA_Benchmark.java b/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_Benchmark.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
diff --git a/base/src/org/compiere/model/X_PA_BenchmarkData.java b/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_BenchmarkData.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
diff --git a/base/src/org/compiere/model/X_PA_ColorSchema.java b/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_ColorSchema.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
diff --git a/base/src/org/compiere/model/X_PA_DashboardContent.java b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_DashboardContent.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
diff --git a/base/src/org/compiere/model/X_PA_Goal.java b/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_Goal.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
diff --git a/base/src/org/compiere/model/X_PA_GoalRestriction.java b/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_GoalRestriction.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
diff --git a/base/src/org/compiere/model/X_PA_Hierarchy.java b/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_Hierarchy.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
diff --git a/base/src/org/compiere/model/X_PA_Measure.java b/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_Measure.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
diff --git a/base/src/org/compiere/model/X_PA_MeasureCalc.java b/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_MeasureCalc.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
diff --git a/base/src/org/compiere/model/X_PA_Ratio.java b/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_Ratio.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
diff --git a/base/src/org/compiere/model/X_PA_RatioElement.java b/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_RatioElement.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
diff --git a/base/src/org/compiere/model/X_PA_Report.java b/org.adempiere.base/src/org/compiere/model/X_PA_Report.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_Report.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_Report.java
diff --git a/base/src/org/compiere/model/X_PA_ReportColumn.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_ReportColumn.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
diff --git a/base/src/org/compiere/model/X_PA_ReportColumnSet.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_ReportColumnSet.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
diff --git a/base/src/org/compiere/model/X_PA_ReportCube.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_ReportCube.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
diff --git a/base/src/org/compiere/model/X_PA_ReportLine.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_ReportLine.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
diff --git a/base/src/org/compiere/model/X_PA_ReportLineSet.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_ReportLineSet.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
diff --git a/base/src/org/compiere/model/X_PA_ReportSource.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_ReportSource.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
diff --git a/base/src/org/compiere/model/X_PA_SLA_Criteria.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_SLA_Criteria.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
diff --git a/base/src/org/compiere/model/X_PA_SLA_Goal.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_SLA_Goal.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
diff --git a/base/src/org/compiere/model/X_PA_SLA_Measure.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
similarity index 100%
rename from base/src/org/compiere/model/X_PA_SLA_Measure.java
rename to org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
diff --git a/base/src/org/compiere/model/X_RV_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
similarity index 100%
rename from base/src/org/compiere/model/X_RV_BPartner.java
rename to org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
diff --git a/base/src/org/compiere/model/X_RV_WarehousePrice.java b/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
similarity index 100%
rename from base/src/org/compiere/model/X_RV_WarehousePrice.java
rename to org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
diff --git a/base/src/org/compiere/model/X_R_Category.java b/org.adempiere.base/src/org/compiere/model/X_R_Category.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_Category.java
rename to org.adempiere.base/src/org/compiere/model/X_R_Category.java
diff --git a/base/src/org/compiere/model/X_R_CategoryUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_CategoryUpdates.java
rename to org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
diff --git a/base/src/org/compiere/model/X_R_ContactInterest.java b/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_ContactInterest.java
rename to org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
diff --git a/base/src/org/compiere/model/X_R_Group.java b/org.adempiere.base/src/org/compiere/model/X_R_Group.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_Group.java
rename to org.adempiere.base/src/org/compiere/model/X_R_Group.java
diff --git a/base/src/org/compiere/model/X_R_GroupUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_GroupUpdates.java
rename to org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
diff --git a/base/src/org/compiere/model/X_R_InterestArea.java b/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_InterestArea.java
rename to org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
diff --git a/base/src/org/compiere/model/X_R_IssueKnown.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_IssueKnown.java
rename to org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
diff --git a/base/src/org/compiere/model/X_R_IssueProject.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_IssueProject.java
rename to org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
diff --git a/base/src/org/compiere/model/X_R_IssueRecommendation.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_IssueRecommendation.java
rename to org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
diff --git a/base/src/org/compiere/model/X_R_IssueStatus.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_IssueStatus.java
rename to org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
diff --git a/base/src/org/compiere/model/X_R_IssueSystem.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_IssueSystem.java
rename to org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
diff --git a/base/src/org/compiere/model/X_R_IssueUser.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_IssueUser.java
rename to org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
diff --git a/base/src/org/compiere/model/X_R_MailText.java b/org.adempiere.base/src/org/compiere/model/X_R_MailText.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_MailText.java
rename to org.adempiere.base/src/org/compiere/model/X_R_MailText.java
diff --git a/base/src/org/compiere/model/X_R_Request.java b/org.adempiere.base/src/org/compiere/model/X_R_Request.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_Request.java
rename to org.adempiere.base/src/org/compiere/model/X_R_Request.java
diff --git a/base/src/org/compiere/model/X_R_RequestAction.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestAction.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
diff --git a/base/src/org/compiere/model/X_R_RequestProcessor.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestProcessor.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
diff --git a/base/src/org/compiere/model/X_R_RequestProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestProcessorLog.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
diff --git a/base/src/org/compiere/model/X_R_RequestProcessor_Route.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestProcessor_Route.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
diff --git a/base/src/org/compiere/model/X_R_RequestType.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestType.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
diff --git a/base/src/org/compiere/model/X_R_RequestTypeUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestTypeUpdates.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
diff --git a/base/src/org/compiere/model/X_R_RequestUpdate.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestUpdate.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
diff --git a/base/src/org/compiere/model/X_R_RequestUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_RequestUpdates.java
rename to org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
diff --git a/base/src/org/compiere/model/X_R_Resolution.java b/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_Resolution.java
rename to org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
diff --git a/base/src/org/compiere/model/X_R_StandardResponse.java b/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_StandardResponse.java
rename to org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
diff --git a/base/src/org/compiere/model/X_R_Status.java b/org.adempiere.base/src/org/compiere/model/X_R_Status.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_Status.java
rename to org.adempiere.base/src/org/compiere/model/X_R_Status.java
diff --git a/base/src/org/compiere/model/X_R_StatusCategory.java b/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
similarity index 100%
rename from base/src/org/compiere/model/X_R_StatusCategory.java
rename to org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
diff --git a/base/src/org/compiere/model/X_S_ExpenseType.java b/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_ExpenseType.java
rename to org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
diff --git a/base/src/org/compiere/model/X_S_Resource.java b/org.adempiere.base/src/org/compiere/model/X_S_Resource.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_Resource.java
rename to org.adempiere.base/src/org/compiere/model/X_S_Resource.java
diff --git a/base/src/org/compiere/model/X_S_ResourceAssignment.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_ResourceAssignment.java
rename to org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
diff --git a/base/src/org/compiere/model/X_S_ResourceType.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_ResourceType.java
rename to org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
diff --git a/base/src/org/compiere/model/X_S_ResourceUnAvailable.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_ResourceUnAvailable.java
rename to org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
diff --git a/base/src/org/compiere/model/X_S_TimeExpense.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_TimeExpense.java
rename to org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
diff --git a/base/src/org/compiere/model/X_S_TimeExpenseLine.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_TimeExpenseLine.java
rename to org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
diff --git a/base/src/org/compiere/model/X_S_TimeType.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_TimeType.java
rename to org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
diff --git a/base/src/org/compiere/model/X_S_Training.java b/org.adempiere.base/src/org/compiere/model/X_S_Training.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_Training.java
rename to org.adempiere.base/src/org/compiere/model/X_S_Training.java
diff --git a/base/src/org/compiere/model/X_S_Training_Class.java b/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
similarity index 100%
rename from base/src/org/compiere/model/X_S_Training_Class.java
rename to org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
diff --git a/base/src/org/compiere/model/X_T_Aging.java b/org.adempiere.base/src/org/compiere/model/X_T_Aging.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_Aging.java
rename to org.adempiere.base/src/org/compiere/model/X_T_Aging.java
diff --git a/base/src/org/compiere/model/X_T_DistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_DistributionRunDetail.java
rename to org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
diff --git a/base/src/org/compiere/model/X_T_InventoryValue.java b/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_InventoryValue.java
rename to org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
diff --git a/base/src/org/compiere/model/X_T_InvoiceGL.java b/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_InvoiceGL.java
rename to org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
diff --git a/base/src/org/compiere/model/X_T_Replenish.java b/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_Replenish.java
rename to org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
diff --git a/base/src/org/compiere/model/X_T_Report.java b/org.adempiere.base/src/org/compiere/model/X_T_Report.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_Report.java
rename to org.adempiere.base/src/org/compiere/model/X_T_Report.java
diff --git a/base/src/org/compiere/model/X_T_ReportStatement.java b/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_ReportStatement.java
rename to org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
diff --git a/base/src/org/compiere/model/X_T_Transaction.java b/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
similarity index 100%
rename from base/src/org/compiere/model/X_T_Transaction.java
rename to org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
diff --git a/base/src/org/compiere/model/X_Test.java b/org.adempiere.base/src/org/compiere/model/X_Test.java
similarity index 100%
rename from base/src/org/compiere/model/X_Test.java
rename to org.adempiere.base/src/org/compiere/model/X_Test.java
diff --git a/base/src/org/compiere/model/X_U_BlackListCheque.java b/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
similarity index 100%
rename from base/src/org/compiere/model/X_U_BlackListCheque.java
rename to org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
diff --git a/base/src/org/compiere/model/X_U_POSTerminal.java b/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
similarity index 100%
rename from base/src/org/compiere/model/X_U_POSTerminal.java
rename to org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
diff --git a/base/src/org/compiere/model/X_U_RoleMenu.java b/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
similarity index 100%
rename from base/src/org/compiere/model/X_U_RoleMenu.java
rename to org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
diff --git a/base/src/org/compiere/model/X_U_WebMenu.java b/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
similarity index 100%
rename from base/src/org/compiere/model/X_U_WebMenu.java
rename to org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
diff --git a/base/src/org/compiere/model/X_U_Web_Properties.java b/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
similarity index 100%
rename from base/src/org/compiere/model/X_U_Web_Properties.java
rename to org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
diff --git a/base/src/org/compiere/model/X_W_Advertisement.java b/org.adempiere.base/src/org/compiere/model/X_W_Advertisement.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_Advertisement.java
rename to org.adempiere.base/src/org/compiere/model/X_W_Advertisement.java
diff --git a/base/src/org/compiere/model/X_W_Basket.java b/org.adempiere.base/src/org/compiere/model/X_W_Basket.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_Basket.java
rename to org.adempiere.base/src/org/compiere/model/X_W_Basket.java
diff --git a/base/src/org/compiere/model/X_W_BasketLine.java b/org.adempiere.base/src/org/compiere/model/X_W_BasketLine.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_BasketLine.java
rename to org.adempiere.base/src/org/compiere/model/X_W_BasketLine.java
diff --git a/base/src/org/compiere/model/X_W_Click.java b/org.adempiere.base/src/org/compiere/model/X_W_Click.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_Click.java
rename to org.adempiere.base/src/org/compiere/model/X_W_Click.java
diff --git a/base/src/org/compiere/model/X_W_ClickCount.java b/org.adempiere.base/src/org/compiere/model/X_W_ClickCount.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_ClickCount.java
rename to org.adempiere.base/src/org/compiere/model/X_W_ClickCount.java
diff --git a/base/src/org/compiere/model/X_W_Counter.java b/org.adempiere.base/src/org/compiere/model/X_W_Counter.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_Counter.java
rename to org.adempiere.base/src/org/compiere/model/X_W_Counter.java
diff --git a/base/src/org/compiere/model/X_W_CounterCount.java b/org.adempiere.base/src/org/compiere/model/X_W_CounterCount.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_CounterCount.java
rename to org.adempiere.base/src/org/compiere/model/X_W_CounterCount.java
diff --git a/base/src/org/compiere/model/X_W_MailMsg.java b/org.adempiere.base/src/org/compiere/model/X_W_MailMsg.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_MailMsg.java
rename to org.adempiere.base/src/org/compiere/model/X_W_MailMsg.java
diff --git a/base/src/org/compiere/model/X_W_Store.java b/org.adempiere.base/src/org/compiere/model/X_W_Store.java
similarity index 100%
rename from base/src/org/compiere/model/X_W_Store.java
rename to org.adempiere.base/src/org/compiere/model/X_W_Store.java
diff --git a/base/src/org/compiere/model/package.html b/org.adempiere.base/src/org/compiere/model/package.html
similarity index 100%
rename from base/src/org/compiere/model/package.html
rename to org.adempiere.base/src/org/compiere/model/package.html
diff --git a/base/src/org/compiere/package.html b/org.adempiere.base/src/org/compiere/package.html
similarity index 100%
rename from base/src/org/compiere/package.html
rename to org.adempiere.base/src/org/compiere/package.html
diff --git a/base/src/org/compiere/print/ArchiveEngine.java b/org.adempiere.base/src/org/compiere/print/ArchiveEngine.java
similarity index 100%
rename from base/src/org/compiere/print/ArchiveEngine.java
rename to org.adempiere.base/src/org/compiere/print/ArchiveEngine.java
diff --git a/base/src/org/compiere/print/CPaper.java b/org.adempiere.base/src/org/compiere/print/CPaper.java
similarity index 100%
rename from base/src/org/compiere/print/CPaper.java
rename to org.adempiere.base/src/org/compiere/print/CPaper.java
diff --git a/base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java
similarity index 100%
rename from base/src/org/compiere/print/DataEngine.java
rename to org.adempiere.base/src/org/compiere/print/DataEngine.java
diff --git a/base/src/org/compiere/print/IHTMLExtension.java b/org.adempiere.base/src/org/compiere/print/IHTMLExtension.java
similarity index 100%
rename from base/src/org/compiere/print/IHTMLExtension.java
rename to org.adempiere.base/src/org/compiere/print/IHTMLExtension.java
diff --git a/base/src/org/compiere/print/IReportEngineEventListener.java b/org.adempiere.base/src/org/compiere/print/IReportEngineEventListener.java
similarity index 100%
rename from base/src/org/compiere/print/IReportEngineEventListener.java
rename to org.adempiere.base/src/org/compiere/print/IReportEngineEventListener.java
diff --git a/base/src/org/compiere/print/MPrintColor.java b/org.adempiere.base/src/org/compiere/print/MPrintColor.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintColor.java
rename to org.adempiere.base/src/org/compiere/print/MPrintColor.java
diff --git a/base/src/org/compiere/print/MPrintFont.java b/org.adempiere.base/src/org/compiere/print/MPrintFont.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintFont.java
rename to org.adempiere.base/src/org/compiere/print/MPrintFont.java
diff --git a/base/src/org/compiere/print/MPrintFormat.java b/org.adempiere.base/src/org/compiere/print/MPrintFormat.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintFormat.java
rename to org.adempiere.base/src/org/compiere/print/MPrintFormat.java
diff --git a/base/src/org/compiere/print/MPrintFormatItem.java b/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintFormatItem.java
rename to org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
diff --git a/base/src/org/compiere/print/MPrintFormatProcess.java b/org.adempiere.base/src/org/compiere/print/MPrintFormatProcess.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintFormatProcess.java
rename to org.adempiere.base/src/org/compiere/print/MPrintFormatProcess.java
diff --git a/base/src/org/compiere/print/MPrintGraph.java b/org.adempiere.base/src/org/compiere/print/MPrintGraph.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintGraph.java
rename to org.adempiere.base/src/org/compiere/print/MPrintGraph.java
diff --git a/base/src/org/compiere/print/MPrintPaper.java b/org.adempiere.base/src/org/compiere/print/MPrintPaper.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintPaper.java
rename to org.adempiere.base/src/org/compiere/print/MPrintPaper.java
diff --git a/base/src/org/compiere/print/MPrintTableFormat.java b/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
similarity index 100%
rename from base/src/org/compiere/print/MPrintTableFormat.java
rename to org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java
diff --git a/base/src/org/compiere/print/PrintData.java b/org.adempiere.base/src/org/compiere/print/PrintData.java
similarity index 100%
rename from base/src/org/compiere/print/PrintData.java
rename to org.adempiere.base/src/org/compiere/print/PrintData.java
diff --git a/base/src/org/compiere/print/PrintDataColumn.java b/org.adempiere.base/src/org/compiere/print/PrintDataColumn.java
similarity index 100%
rename from base/src/org/compiere/print/PrintDataColumn.java
rename to org.adempiere.base/src/org/compiere/print/PrintDataColumn.java
diff --git a/base/src/org/compiere/print/PrintDataElement.java b/org.adempiere.base/src/org/compiere/print/PrintDataElement.java
similarity index 100%
rename from base/src/org/compiere/print/PrintDataElement.java
rename to org.adempiere.base/src/org/compiere/print/PrintDataElement.java
diff --git a/base/src/org/compiere/print/PrintDataFunction.java b/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java
similarity index 100%
rename from base/src/org/compiere/print/PrintDataFunction.java
rename to org.adempiere.base/src/org/compiere/print/PrintDataFunction.java
diff --git a/base/src/org/compiere/print/PrintDataGroup.java b/org.adempiere.base/src/org/compiere/print/PrintDataGroup.java
similarity index 100%
rename from base/src/org/compiere/print/PrintDataGroup.java
rename to org.adempiere.base/src/org/compiere/print/PrintDataGroup.java
diff --git a/base/src/org/compiere/print/PrintDataHandler.java b/org.adempiere.base/src/org/compiere/print/PrintDataHandler.java
similarity index 100%
rename from base/src/org/compiere/print/PrintDataHandler.java
rename to org.adempiere.base/src/org/compiere/print/PrintDataHandler.java
diff --git a/base/src/org/compiere/print/PrintFormatUtil.java b/org.adempiere.base/src/org/compiere/print/PrintFormatUtil.java
similarity index 100%
rename from base/src/org/compiere/print/PrintFormatUtil.java
rename to org.adempiere.base/src/org/compiere/print/PrintFormatUtil.java
diff --git a/base/src/org/compiere/print/PrintUtil.java b/org.adempiere.base/src/org/compiere/print/PrintUtil.java
similarity index 100%
rename from base/src/org/compiere/print/PrintUtil.java
rename to org.adempiere.base/src/org/compiere/print/PrintUtil.java
diff --git a/base/src/org/compiere/print/ReportEngine.java b/org.adempiere.base/src/org/compiere/print/ReportEngine.java
similarity index 100%
rename from base/src/org/compiere/print/ReportEngine.java
rename to org.adempiere.base/src/org/compiere/print/ReportEngine.java
diff --git a/base/src/org/compiere/print/ReportEngineEvent.java b/org.adempiere.base/src/org/compiere/print/ReportEngineEvent.java
similarity index 100%
rename from base/src/org/compiere/print/ReportEngineEvent.java
rename to org.adempiere.base/src/org/compiere/print/ReportEngineEvent.java
diff --git a/base/src/org/compiere/print/ServerReportCtl.java b/org.adempiere.base/src/org/compiere/print/ServerReportCtl.java
similarity index 100%
rename from base/src/org/compiere/print/ServerReportCtl.java
rename to org.adempiere.base/src/org/compiere/print/ServerReportCtl.java
diff --git a/base/src/org/compiere/print/layout/BarcodeElement.java b/org.adempiere.base/src/org/compiere/print/layout/BarcodeElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/BarcodeElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/BarcodeElement.java
diff --git a/base/src/org/compiere/print/layout/BoxElement.java b/org.adempiere.base/src/org/compiere/print/layout/BoxElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/BoxElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/BoxElement.java
diff --git a/base/src/org/compiere/print/layout/Dimension2DImpl.java b/org.adempiere.base/src/org/compiere/print/layout/Dimension2DImpl.java
similarity index 100%
rename from base/src/org/compiere/print/layout/Dimension2DImpl.java
rename to org.adempiere.base/src/org/compiere/print/layout/Dimension2DImpl.java
diff --git a/base/src/org/compiere/print/layout/GraphElement.java b/org.adempiere.base/src/org/compiere/print/layout/GraphElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/GraphElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/GraphElement.java
diff --git a/base/src/org/compiere/print/layout/GridElement.java b/org.adempiere.base/src/org/compiere/print/layout/GridElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/GridElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/GridElement.java
diff --git a/base/src/org/compiere/print/layout/HTMLElement.java b/org.adempiere.base/src/org/compiere/print/layout/HTMLElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/HTMLElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/HTMLElement.java
diff --git a/base/src/org/compiere/print/layout/HTMLRenderer.java b/org.adempiere.base/src/org/compiere/print/layout/HTMLRenderer.java
similarity index 100%
rename from base/src/org/compiere/print/layout/HTMLRenderer.java
rename to org.adempiere.base/src/org/compiere/print/layout/HTMLRenderer.java
diff --git a/base/src/org/compiere/print/layout/HeaderFooter.java b/org.adempiere.base/src/org/compiere/print/layout/HeaderFooter.java
similarity index 100%
rename from base/src/org/compiere/print/layout/HeaderFooter.java
rename to org.adempiere.base/src/org/compiere/print/layout/HeaderFooter.java
diff --git a/base/src/org/compiere/print/layout/ImageElement.java b/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/ImageElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/ImageElement.java
diff --git a/base/src/org/compiere/print/layout/LayoutEngine.java b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
similarity index 100%
rename from base/src/org/compiere/print/layout/LayoutEngine.java
rename to org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
diff --git a/base/src/org/compiere/print/layout/LocationElement.java b/org.adempiere.base/src/org/compiere/print/layout/LocationElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/LocationElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/LocationElement.java
diff --git a/base/src/org/compiere/print/layout/PInstanceLogElement.java b/org.adempiere.base/src/org/compiere/print/layout/PInstanceLogElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/PInstanceLogElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/PInstanceLogElement.java
diff --git a/base/src/org/compiere/print/layout/Page.java b/org.adempiere.base/src/org/compiere/print/layout/Page.java
similarity index 100%
rename from base/src/org/compiere/print/layout/Page.java
rename to org.adempiere.base/src/org/compiere/print/layout/Page.java
diff --git a/base/src/org/compiere/print/layout/ParameterElement.java b/org.adempiere.base/src/org/compiere/print/layout/ParameterElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/ParameterElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/ParameterElement.java
diff --git a/base/src/org/compiere/print/layout/PrintElement.java b/org.adempiere.base/src/org/compiere/print/layout/PrintElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/PrintElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/PrintElement.java
diff --git a/base/src/org/compiere/print/layout/StringElement.java b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/StringElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/StringElement.java
diff --git a/base/src/org/compiere/print/layout/TableElement.java b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java
similarity index 100%
rename from base/src/org/compiere/print/layout/TableElement.java
rename to org.adempiere.base/src/org/compiere/print/layout/TableElement.java
diff --git a/base/src/org/compiere/print/layout/false10.gif b/org.adempiere.base/src/org/compiere/print/layout/false10.gif
similarity index 100%
rename from base/src/org/compiere/print/layout/false10.gif
rename to org.adempiere.base/src/org/compiere/print/layout/false10.gif
diff --git a/base/src/org/compiere/print/layout/true10.gif b/org.adempiere.base/src/org/compiere/print/layout/true10.gif
similarity index 100%
rename from base/src/org/compiere/print/layout/true10.gif
rename to org.adempiere.base/src/org/compiere/print/layout/true10.gif
diff --git a/base/src/org/compiere/print/package.html b/org.adempiere.base/src/org/compiere/print/package.html
similarity index 100%
rename from base/src/org/compiere/print/package.html
rename to org.adempiere.base/src/org/compiere/print/package.html
diff --git a/base/src/org/compiere/process/AdempiereServer.java b/org.adempiere.base/src/org/compiere/process/AdempiereServer.java
similarity index 100%
rename from base/src/org/compiere/process/AdempiereServer.java
rename to org.adempiere.base/src/org/compiere/process/AdempiereServer.java
diff --git a/base/src/org/compiere/process/AdempiereService.java b/org.adempiere.base/src/org/compiere/process/AdempiereService.java
similarity index 100%
rename from base/src/org/compiere/process/AdempiereService.java
rename to org.adempiere.base/src/org/compiere/process/AdempiereService.java
diff --git a/base/src/org/compiere/process/ClientProcess.java b/org.adempiere.base/src/org/compiere/process/ClientProcess.java
similarity index 100%
rename from base/src/org/compiere/process/ClientProcess.java
rename to org.adempiere.base/src/org/compiere/process/ClientProcess.java
diff --git a/base/src/org/compiere/process/DocAction.java b/org.adempiere.base/src/org/compiere/process/DocAction.java
similarity index 100%
rename from base/src/org/compiere/process/DocAction.java
rename to org.adempiere.base/src/org/compiere/process/DocAction.java
diff --git a/base/src/org/compiere/process/DocActionTemplate.java b/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
similarity index 100%
rename from base/src/org/compiere/process/DocActionTemplate.java
rename to org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
diff --git a/base/src/org/compiere/process/DocOptions.java b/org.adempiere.base/src/org/compiere/process/DocOptions.java
similarity index 100%
rename from base/src/org/compiere/process/DocOptions.java
rename to org.adempiere.base/src/org/compiere/process/DocOptions.java
diff --git a/base/src/org/compiere/process/DocumentEngine.java b/org.adempiere.base/src/org/compiere/process/DocumentEngine.java
similarity index 100%
rename from base/src/org/compiere/process/DocumentEngine.java
rename to org.adempiere.base/src/org/compiere/process/DocumentEngine.java
diff --git a/base/src/org/compiere/process/ProcessCall.java b/org.adempiere.base/src/org/compiere/process/ProcessCall.java
similarity index 100%
rename from base/src/org/compiere/process/ProcessCall.java
rename to org.adempiere.base/src/org/compiere/process/ProcessCall.java
diff --git a/base/src/org/compiere/process/ProcessInfo.java b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
similarity index 100%
rename from base/src/org/compiere/process/ProcessInfo.java
rename to org.adempiere.base/src/org/compiere/process/ProcessInfo.java
diff --git a/base/src/org/compiere/process/ProcessInfoLog.java b/org.adempiere.base/src/org/compiere/process/ProcessInfoLog.java
similarity index 100%
rename from base/src/org/compiere/process/ProcessInfoLog.java
rename to org.adempiere.base/src/org/compiere/process/ProcessInfoLog.java
diff --git a/base/src/org/compiere/process/ProcessInfoParameter.java b/org.adempiere.base/src/org/compiere/process/ProcessInfoParameter.java
similarity index 100%
rename from base/src/org/compiere/process/ProcessInfoParameter.java
rename to org.adempiere.base/src/org/compiere/process/ProcessInfoParameter.java
diff --git a/base/src/org/compiere/process/ProcessInfoUtil.java b/org.adempiere.base/src/org/compiere/process/ProcessInfoUtil.java
similarity index 100%
rename from base/src/org/compiere/process/ProcessInfoUtil.java
rename to org.adempiere.base/src/org/compiere/process/ProcessInfoUtil.java
diff --git a/base/src/org/compiere/process/RemoteMergeDataVO.java b/org.adempiere.base/src/org/compiere/process/RemoteMergeDataVO.java
similarity index 100%
rename from base/src/org/compiere/process/RemoteMergeDataVO.java
rename to org.adempiere.base/src/org/compiere/process/RemoteMergeDataVO.java
diff --git a/base/src/org/compiere/process/RemoteSetupVO.java b/org.adempiere.base/src/org/compiere/process/RemoteSetupVO.java
similarity index 100%
rename from base/src/org/compiere/process/RemoteSetupVO.java
rename to org.adempiere.base/src/org/compiere/process/RemoteSetupVO.java
diff --git a/base/src/org/compiere/process/RemoteUpdateVO.java b/org.adempiere.base/src/org/compiere/process/RemoteUpdateVO.java
similarity index 100%
rename from base/src/org/compiere/process/RemoteUpdateVO.java
rename to org.adempiere.base/src/org/compiere/process/RemoteUpdateVO.java
diff --git a/base/src/org/compiere/process/ServerProcessCtl.java b/org.adempiere.base/src/org/compiere/process/ServerProcessCtl.java
similarity index 100%
rename from base/src/org/compiere/process/ServerProcessCtl.java
rename to org.adempiere.base/src/org/compiere/process/ServerProcessCtl.java
diff --git a/base/src/org/compiere/process/StateEngine.java b/org.adempiere.base/src/org/compiere/process/StateEngine.java
similarity index 100%
rename from base/src/org/compiere/process/StateEngine.java
rename to org.adempiere.base/src/org/compiere/process/StateEngine.java
diff --git a/base/src/org/compiere/process/SvrProcess.java b/org.adempiere.base/src/org/compiere/process/SvrProcess.java
similarity index 100%
rename from base/src/org/compiere/process/SvrProcess.java
rename to org.adempiere.base/src/org/compiere/process/SvrProcess.java
diff --git a/base/src/org/compiere/process/package.html b/org.adempiere.base/src/org/compiere/process/package.html
similarity index 100%
rename from base/src/org/compiere/process/package.html
rename to org.adempiere.base/src/org/compiere/process/package.html
diff --git a/base/src/org/compiere/report/FinReport.java b/org.adempiere.base/src/org/compiere/report/FinReport.java
similarity index 100%
rename from base/src/org/compiere/report/FinReport.java
rename to org.adempiere.base/src/org/compiere/report/FinReport.java
diff --git a/base/src/org/compiere/report/FinReportJasper.java b/org.adempiere.base/src/org/compiere/report/FinReportJasper.java
similarity index 100%
rename from base/src/org/compiere/report/FinReportJasper.java
rename to org.adempiere.base/src/org/compiere/report/FinReportJasper.java
diff --git a/base/src/org/compiere/report/FinReportPeriod.java b/org.adempiere.base/src/org/compiere/report/FinReportPeriod.java
similarity index 100%
rename from base/src/org/compiere/report/FinReportPeriod.java
rename to org.adempiere.base/src/org/compiere/report/FinReportPeriod.java
diff --git a/base/src/org/compiere/report/FinStatement.java b/org.adempiere.base/src/org/compiere/report/FinStatement.java
similarity index 100%
rename from base/src/org/compiere/report/FinStatement.java
rename to org.adempiere.base/src/org/compiere/report/FinStatement.java
diff --git a/base/src/org/compiere/report/MReport.java b/org.adempiere.base/src/org/compiere/report/MReport.java
similarity index 100%
rename from base/src/org/compiere/report/MReport.java
rename to org.adempiere.base/src/org/compiere/report/MReport.java
diff --git a/base/src/org/compiere/report/MReportColumn.java b/org.adempiere.base/src/org/compiere/report/MReportColumn.java
similarity index 100%
rename from base/src/org/compiere/report/MReportColumn.java
rename to org.adempiere.base/src/org/compiere/report/MReportColumn.java
diff --git a/base/src/org/compiere/report/MReportColumnSet.java b/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java
similarity index 100%
rename from base/src/org/compiere/report/MReportColumnSet.java
rename to org.adempiere.base/src/org/compiere/report/MReportColumnSet.java
diff --git a/base/src/org/compiere/report/MReportLine.java b/org.adempiere.base/src/org/compiere/report/MReportLine.java
similarity index 100%
rename from base/src/org/compiere/report/MReportLine.java
rename to org.adempiere.base/src/org/compiere/report/MReportLine.java
diff --git a/base/src/org/compiere/report/MReportLineSet.java b/org.adempiere.base/src/org/compiere/report/MReportLineSet.java
similarity index 100%
rename from base/src/org/compiere/report/MReportLineSet.java
rename to org.adempiere.base/src/org/compiere/report/MReportLineSet.java
diff --git a/base/src/org/compiere/report/MReportSource.java b/org.adempiere.base/src/org/compiere/report/MReportSource.java
similarity index 100%
rename from base/src/org/compiere/report/MReportSource.java
rename to org.adempiere.base/src/org/compiere/report/MReportSource.java
diff --git a/base/src/org/compiere/report/MReportTree.java b/org.adempiere.base/src/org/compiere/report/MReportTree.java
similarity index 100%
rename from base/src/org/compiere/report/MReportTree.java
rename to org.adempiere.base/src/org/compiere/report/MReportTree.java
diff --git a/base/src/org/compiere/report/TrialBalance.java b/org.adempiere.base/src/org/compiere/report/TrialBalance.java
similarity index 100%
rename from base/src/org/compiere/report/TrialBalance.java
rename to org.adempiere.base/src/org/compiere/report/TrialBalance.java
diff --git a/base/src/org/compiere/report/core/RColumn.java b/org.adempiere.base/src/org/compiere/report/core/RColumn.java
similarity index 100%
rename from base/src/org/compiere/report/core/RColumn.java
rename to org.adempiere.base/src/org/compiere/report/core/RColumn.java
diff --git a/base/src/org/compiere/report/core/RModel.java b/org.adempiere.base/src/org/compiere/report/core/RModel.java
similarity index 100%
rename from base/src/org/compiere/report/core/RModel.java
rename to org.adempiere.base/src/org/compiere/report/core/RModel.java
diff --git a/base/src/org/compiere/report/core/RModelData.java b/org.adempiere.base/src/org/compiere/report/core/RModelData.java
similarity index 100%
rename from base/src/org/compiere/report/core/RModelData.java
rename to org.adempiere.base/src/org/compiere/report/core/RModelData.java
diff --git a/base/src/org/compiere/report/core/RModelExcelExporter.java b/org.adempiere.base/src/org/compiere/report/core/RModelExcelExporter.java
similarity index 100%
rename from base/src/org/compiere/report/core/RModelExcelExporter.java
rename to org.adempiere.base/src/org/compiere/report/core/RModelExcelExporter.java
diff --git a/base/src/org/compiere/report/core/ResultTableModel.java b/org.adempiere.base/src/org/compiere/report/core/ResultTableModel.java
similarity index 100%
rename from base/src/org/compiere/report/core/ResultTableModel.java
rename to org.adempiere.base/src/org/compiere/report/core/ResultTableModel.java
diff --git a/base/src/org/compiere/sla/DeliveryAccuracy.java b/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java
similarity index 100%
rename from base/src/org/compiere/sla/DeliveryAccuracy.java
rename to org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java
diff --git a/base/src/org/compiere/sla/SLACriteria.java b/org.adempiere.base/src/org/compiere/sla/SLACriteria.java
similarity index 100%
rename from base/src/org/compiere/sla/SLACriteria.java
rename to org.adempiere.base/src/org/compiere/sla/SLACriteria.java
diff --git a/base/src/org/compiere/sla/SLAGoalProcess.java b/org.adempiere.base/src/org/compiere/sla/SLAGoalProcess.java
similarity index 100%
rename from base/src/org/compiere/sla/SLAGoalProcess.java
rename to org.adempiere.base/src/org/compiere/sla/SLAGoalProcess.java
diff --git a/base/src/org/compiere/sla/SLAMeasureProcess.java b/org.adempiere.base/src/org/compiere/sla/SLAMeasureProcess.java
similarity index 100%
rename from base/src/org/compiere/sla/SLAMeasureProcess.java
rename to org.adempiere.base/src/org/compiere/sla/SLAMeasureProcess.java
diff --git a/base/src/org/compiere/tools/FileUtil.java b/org.adempiere.base/src/org/compiere/tools/FileUtil.java
similarity index 100%
rename from base/src/org/compiere/tools/FileUtil.java
rename to org.adempiere.base/src/org/compiere/tools/FileUtil.java
diff --git a/base/src/org/compiere/tools/RMIUtil.java b/org.adempiere.base/src/org/compiere/tools/RMIUtil.java
similarity index 100%
rename from base/src/org/compiere/tools/RMIUtil.java
rename to org.adempiere.base/src/org/compiere/tools/RMIUtil.java
diff --git a/base/src/org/compiere/tools/Strip.java b/org.adempiere.base/src/org/compiere/tools/Strip.java
similarity index 100%
rename from base/src/org/compiere/tools/Strip.java
rename to org.adempiere.base/src/org/compiere/tools/Strip.java
diff --git a/base/src/org/compiere/util/ASyncProcess.java b/org.adempiere.base/src/org/compiere/util/ASyncProcess.java
similarity index 100%
rename from base/src/org/compiere/util/ASyncProcess.java
rename to org.adempiere.base/src/org/compiere/util/ASyncProcess.java
diff --git a/base/src/org/compiere/util/ASyncWorker.java b/org.adempiere.base/src/org/compiere/util/ASyncWorker.java
similarity index 100%
rename from base/src/org/compiere/util/ASyncWorker.java
rename to org.adempiere.base/src/org/compiere/util/ASyncWorker.java
diff --git a/base/src/org/compiere/util/AdempiereSystemError.java b/org.adempiere.base/src/org/compiere/util/AdempiereSystemError.java
similarity index 100%
rename from base/src/org/compiere/util/AdempiereSystemError.java
rename to org.adempiere.base/src/org/compiere/util/AdempiereSystemError.java
diff --git a/base/src/org/compiere/util/AdempiereUserError.java b/org.adempiere.base/src/org/compiere/util/AdempiereUserError.java
similarity index 100%
rename from base/src/org/compiere/util/AdempiereUserError.java
rename to org.adempiere.base/src/org/compiere/util/AdempiereUserError.java
diff --git a/base/src/org/compiere/util/AmtInWords.java b/org.adempiere.base/src/org/compiere/util/AmtInWords.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords.java
diff --git a/base/src/org/compiere/util/AmtInWords_BG.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_BG.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_BG.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_BG.java
diff --git a/base/src/org/compiere/util/AmtInWords_CA.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_CA.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_CA.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_CA.java
diff --git a/base/src/org/compiere/util/AmtInWords_EN.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_EN.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_EN.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_EN.java
diff --git a/base/src/org/compiere/util/AmtInWords_ES.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_ES.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_ES.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_ES.java
diff --git a/base/src/org/compiere/util/AmtInWords_FA.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_FA.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_FA.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_FA.java
diff --git a/base/src/org/compiere/util/AmtInWords_FR.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_FR.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_FR.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_FR.java
diff --git a/base/src/org/compiere/util/AmtInWords_HR.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_HR.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java
diff --git a/base/src/org/compiere/util/AmtInWords_HU.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_HU.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_HU.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_HU.java
diff --git a/base/src/org/compiere/util/AmtInWords_IN.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_IN.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_IN.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_IN.java
diff --git a/base/src/org/compiere/util/AmtInWords_IT.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_IT.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_IT.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_IT.java
diff --git a/base/src/org/compiere/util/AmtInWords_MS.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_MS.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_MS.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_MS.java
diff --git a/base/src/org/compiere/util/AmtInWords_PL.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_PL.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_PL.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_PL.java
diff --git a/base/src/org/compiere/util/AmtInWords_PT.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_PT.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java
diff --git a/base/src/org/compiere/util/AmtInWords_SR.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_SR.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_SR.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_SR.java
diff --git a/base/src/org/compiere/util/AmtInWords_TH.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_TH.java
similarity index 100%
rename from base/src/org/compiere/util/AmtInWords_TH.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_TH.java
diff --git a/base/src/org/compiere/util/AmtInWords_VI.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_VI.java
similarity index 96%
rename from base/src/org/compiere/util/AmtInWords_VI.java
rename to org.adempiere.base/src/org/compiere/util/AmtInWords_VI.java
index 775babe949..66499f3e21 100644
--- a/base/src/org/compiere/util/AmtInWords_VI.java
+++ b/org.adempiere.base/src/org/compiere/util/AmtInWords_VI.java
@@ -16,10 +16,6 @@
*****************************************************************************/
package org.compiere.util;
-import org.apache.tools.ant.taskdefs.Length;
-import org.python.modules.math;
-
-
/**
* Amount in Words for Vietnamese
* @author Vietsourcing-The class is based on the AmtInWords_EN.java written by jjanke
diff --git a/base/src/org/compiere/util/ByteArrayDataSource.java b/org.adempiere.base/src/org/compiere/util/ByteArrayDataSource.java
similarity index 100%
rename from base/src/org/compiere/util/ByteArrayDataSource.java
rename to org.adempiere.base/src/org/compiere/util/ByteArrayDataSource.java
diff --git a/base/src/org/compiere/util/CCache.java b/org.adempiere.base/src/org/compiere/util/CCache.java
similarity index 100%
rename from base/src/org/compiere/util/CCache.java
rename to org.adempiere.base/src/org/compiere/util/CCache.java
diff --git a/base/src/org/compiere/util/CCachedRowSet.java b/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
similarity index 100%
rename from base/src/org/compiere/util/CCachedRowSet.java
rename to org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
diff --git a/base/src/org/compiere/util/CCallableStatement.java b/org.adempiere.base/src/org/compiere/util/CCallableStatement.java
similarity index 100%
rename from base/src/org/compiere/util/CCallableStatement.java
rename to org.adempiere.base/src/org/compiere/util/CCallableStatement.java
diff --git a/base/src/org/compiere/util/CLogConsole.java b/org.adempiere.base/src/org/compiere/util/CLogConsole.java
similarity index 100%
rename from base/src/org/compiere/util/CLogConsole.java
rename to org.adempiere.base/src/org/compiere/util/CLogConsole.java
diff --git a/base/src/org/compiere/util/CLogErrorBuffer.java b/org.adempiere.base/src/org/compiere/util/CLogErrorBuffer.java
similarity index 100%
rename from base/src/org/compiere/util/CLogErrorBuffer.java
rename to org.adempiere.base/src/org/compiere/util/CLogErrorBuffer.java
diff --git a/base/src/org/compiere/util/CLogFile.java b/org.adempiere.base/src/org/compiere/util/CLogFile.java
similarity index 100%
rename from base/src/org/compiere/util/CLogFile.java
rename to org.adempiere.base/src/org/compiere/util/CLogFile.java
diff --git a/base/src/org/compiere/util/CLogFilter.java b/org.adempiere.base/src/org/compiere/util/CLogFilter.java
similarity index 100%
rename from base/src/org/compiere/util/CLogFilter.java
rename to org.adempiere.base/src/org/compiere/util/CLogFilter.java
diff --git a/base/src/org/compiere/util/CLogFormatter.java b/org.adempiere.base/src/org/compiere/util/CLogFormatter.java
similarity index 100%
rename from base/src/org/compiere/util/CLogFormatter.java
rename to org.adempiere.base/src/org/compiere/util/CLogFormatter.java
diff --git a/base/src/org/compiere/util/CLogMgt.java b/org.adempiere.base/src/org/compiere/util/CLogMgt.java
similarity index 96%
rename from base/src/org/compiere/util/CLogMgt.java
rename to org.adempiere.base/src/org/compiere/util/CLogMgt.java
index 07c53230a0..7f6e381557 100644
--- a/base/src/org/compiere/util/CLogMgt.java
+++ b/org.adempiere.base/src/org/compiere/util/CLogMgt.java
@@ -160,7 +160,6 @@ public class CLogMgt
// setLevel(s_currentLevel);
// setLoggerLevel(Level.ALL, null);
//
- CLogMgtLog4J.initialize(isClient);
// System.out.println("Handlers=" + s_handlers.size() + ", Level=" + s_currentLevel);
} // initialize
diff --git a/base/src/org/compiere/util/CLogger.java b/org.adempiere.base/src/org/compiere/util/CLogger.java
similarity index 100%
rename from base/src/org/compiere/util/CLogger.java
rename to org.adempiere.base/src/org/compiere/util/CLogger.java
diff --git a/base/src/org/compiere/util/CMemoryUsage.java b/org.adempiere.base/src/org/compiere/util/CMemoryUsage.java
similarity index 100%
rename from base/src/org/compiere/util/CMemoryUsage.java
rename to org.adempiere.base/src/org/compiere/util/CMemoryUsage.java
diff --git a/base/src/org/compiere/util/CPreparedStatement.java b/org.adempiere.base/src/org/compiere/util/CPreparedStatement.java
similarity index 100%
rename from base/src/org/compiere/util/CPreparedStatement.java
rename to org.adempiere.base/src/org/compiere/util/CPreparedStatement.java
diff --git a/base/src/org/compiere/util/CStatement.java b/org.adempiere.base/src/org/compiere/util/CStatement.java
similarity index 100%
rename from base/src/org/compiere/util/CStatement.java
rename to org.adempiere.base/src/org/compiere/util/CStatement.java
diff --git a/base/src/org/compiere/util/CStatementVO.java b/org.adempiere.base/src/org/compiere/util/CStatementVO.java
similarity index 100%
rename from base/src/org/compiere/util/CStatementVO.java
rename to org.adempiere.base/src/org/compiere/util/CStatementVO.java
diff --git a/base/src/org/compiere/util/CacheInterface.java b/org.adempiere.base/src/org/compiere/util/CacheInterface.java
similarity index 100%
rename from base/src/org/compiere/util/CacheInterface.java
rename to org.adempiere.base/src/org/compiere/util/CacheInterface.java
diff --git a/base/src/org/compiere/util/CacheMgt.java b/org.adempiere.base/src/org/compiere/util/CacheMgt.java
similarity index 100%
rename from base/src/org/compiere/util/CacheMgt.java
rename to org.adempiere.base/src/org/compiere/util/CacheMgt.java
diff --git a/base/src/org/compiere/util/CallableResult.java b/org.adempiere.base/src/org/compiere/util/CallableResult.java
similarity index 100%
rename from base/src/org/compiere/util/CallableResult.java
rename to org.adempiere.base/src/org/compiere/util/CallableResult.java
diff --git a/base/src/org/compiere/util/ContextProvider.java b/org.adempiere.base/src/org/compiere/util/ContextProvider.java
similarity index 100%
rename from base/src/org/compiere/util/ContextProvider.java
rename to org.adempiere.base/src/org/compiere/util/ContextProvider.java
diff --git a/base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java
similarity index 96%
rename from base/src/org/compiere/util/DB.java
rename to org.adempiere.base/src/org/compiere/util/DB.java
index 9f2945112c..5d885470a5 100644
--- a/base/src/org/compiere/util/DB.java
+++ b/org.adempiere.base/src/org/compiere/util/DB.java
@@ -40,6 +40,7 @@ import javax.swing.JOptionPane;
import javax.swing.UIManager;
import org.adempiere.exceptions.DBException;
+import org.adempiere.util.ProcessUtil;
import org.compiere.Adempiere;
import org.compiere.db.AdempiereDatabase;
import org.compiere.db.CConnection;
@@ -53,8 +54,8 @@ import org.compiere.model.MSysConfig;
import org.compiere.model.MSystem;
import org.compiere.model.PO;
import org.compiere.model.POResultSet;
-import org.compiere.process.SequenceCheck;
-
+import org.compiere.process.ProcessInfo;
+import org.compiere.process.ProcessInfoParameter;
/**
* General Database Interface
@@ -156,7 +157,10 @@ public final class DB
// Sequence check
log.info("Sequence");
- SequenceCheck.validate(ctx);
+ ProcessInfo processInfo = new ProcessInfo("Sequence Check", 0);
+ processInfo.setClassName("org.compiere.process.SequenceCheck");
+ processInfo.setParameter(new ProcessInfoParameter[0]);
+ ProcessUtil.startJavaProcess(ctx, processInfo, null);
// Costing Setup
log.info("Costing");
diff --git a/base/src/org/compiere/util/DBException.java b/org.adempiere.base/src/org/compiere/util/DBException.java
similarity index 100%
rename from base/src/org/compiere/util/DBException.java
rename to org.adempiere.base/src/org/compiere/util/DBException.java
diff --git a/base/src/org/compiere/util/DefaultContextProvider.java b/org.adempiere.base/src/org/compiere/util/DefaultContextProvider.java
similarity index 100%
rename from base/src/org/compiere/util/DefaultContextProvider.java
rename to org.adempiere.base/src/org/compiere/util/DefaultContextProvider.java
diff --git a/base/src/org/compiere/util/DisplayType.java b/org.adempiere.base/src/org/compiere/util/DisplayType.java
similarity index 100%
rename from base/src/org/compiere/util/DisplayType.java
rename to org.adempiere.base/src/org/compiere/util/DisplayType.java
diff --git a/base/src/org/compiere/util/EMail.java b/org.adempiere.base/src/org/compiere/util/EMail.java
similarity index 100%
rename from base/src/org/compiere/util/EMail.java
rename to org.adempiere.base/src/org/compiere/util/EMail.java
diff --git a/base/src/org/compiere/util/EMailAuthenticator.java b/org.adempiere.base/src/org/compiere/util/EMailAuthenticator.java
similarity index 100%
rename from base/src/org/compiere/util/EMailAuthenticator.java
rename to org.adempiere.base/src/org/compiere/util/EMailAuthenticator.java
diff --git a/base/src/org/compiere/util/EMailTest.java b/org.adempiere.base/src/org/compiere/util/EMailTest.java
similarity index 100%
rename from base/src/org/compiere/util/EMailTest.java
rename to org.adempiere.base/src/org/compiere/util/EMailTest.java
diff --git a/base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java
similarity index 100%
rename from base/src/org/compiere/util/Env.java
rename to org.adempiere.base/src/org/compiere/util/Env.java
diff --git a/base/src/org/compiere/util/EnvLoader.java b/org.adempiere.base/src/org/compiere/util/EnvLoader.java
similarity index 100%
rename from base/src/org/compiere/util/EnvLoader.java
rename to org.adempiere.base/src/org/compiere/util/EnvLoader.java
diff --git a/base/src/org/compiere/util/Evaluatee.java b/org.adempiere.base/src/org/compiere/util/Evaluatee.java
similarity index 100%
rename from base/src/org/compiere/util/Evaluatee.java
rename to org.adempiere.base/src/org/compiere/util/Evaluatee.java
diff --git a/base/src/org/compiere/util/Evaluator.java b/org.adempiere.base/src/org/compiere/util/Evaluator.java
similarity index 100%
rename from base/src/org/compiere/util/Evaluator.java
rename to org.adempiere.base/src/org/compiere/util/Evaluator.java
diff --git a/base/src/org/compiere/util/ExecuteResult.java b/org.adempiere.base/src/org/compiere/util/ExecuteResult.java
similarity index 100%
rename from base/src/org/compiere/util/ExecuteResult.java
rename to org.adempiere.base/src/org/compiere/util/ExecuteResult.java
diff --git a/base/src/org/compiere/util/ExtensionFileFilter.java b/org.adempiere.base/src/org/compiere/util/ExtensionFileFilter.java
similarity index 100%
rename from base/src/org/compiere/util/ExtensionFileFilter.java
rename to org.adempiere.base/src/org/compiere/util/ExtensionFileFilter.java
diff --git a/base/src/org/compiere/util/FileUpload.java b/org.adempiere.base/src/org/compiere/util/FileUpload.java
similarity index 100%
rename from base/src/org/compiere/util/FileUpload.java
rename to org.adempiere.base/src/org/compiere/util/FileUpload.java
diff --git a/base/src/org/compiere/util/HtmlCode.java b/org.adempiere.base/src/org/compiere/util/HtmlCode.java
similarity index 100%
rename from base/src/org/compiere/util/HtmlCode.java
rename to org.adempiere.base/src/org/compiere/util/HtmlCode.java
diff --git a/base/src/org/compiere/util/IEnvEventListener.java b/org.adempiere.base/src/org/compiere/util/IEnvEventListener.java
similarity index 100%
rename from base/src/org/compiere/util/IEnvEventListener.java
rename to org.adempiere.base/src/org/compiere/util/IEnvEventListener.java
diff --git a/base/src/org/compiere/util/Ini.java b/org.adempiere.base/src/org/compiere/util/Ini.java
similarity index 100%
rename from base/src/org/compiere/util/Ini.java
rename to org.adempiere.base/src/org/compiere/util/Ini.java
diff --git a/base/src/org/compiere/util/IniRes.java b/org.adempiere.base/src/org/compiere/util/IniRes.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes.java
rename to org.adempiere.base/src/org/compiere/util/IniRes.java
diff --git a/base/src/org/compiere/util/IniRes_ar.java b/org.adempiere.base/src/org/compiere/util/IniRes_ar.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_ar.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_ar.java
diff --git a/base/src/org/compiere/util/IniRes_bg.java b/org.adempiere.base/src/org/compiere/util/IniRes_bg.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_bg.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_bg.java
diff --git a/base/src/org/compiere/util/IniRes_ca.java b/org.adempiere.base/src/org/compiere/util/IniRes_ca.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_ca.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_ca.java
diff --git a/base/src/org/compiere/util/IniRes_da.java b/org.adempiere.base/src/org/compiere/util/IniRes_da.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_da.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_da.java
diff --git a/base/src/org/compiere/util/IniRes_de.java b/org.adempiere.base/src/org/compiere/util/IniRes_de.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_de.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_de.java
diff --git a/base/src/org/compiere/util/IniRes_el.java b/org.adempiere.base/src/org/compiere/util/IniRes_el.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_el.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_el.java
diff --git a/base/src/org/compiere/util/IniRes_es.java b/org.adempiere.base/src/org/compiere/util/IniRes_es.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_es.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_es.java
diff --git a/base/src/org/compiere/util/IniRes_fa.java b/org.adempiere.base/src/org/compiere/util/IniRes_fa.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_fa.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_fa.java
diff --git a/base/src/org/compiere/util/IniRes_fr.java b/org.adempiere.base/src/org/compiere/util/IniRes_fr.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_fr.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_fr.java
diff --git a/base/src/org/compiere/util/IniRes_hr.java b/org.adempiere.base/src/org/compiere/util/IniRes_hr.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_hr.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_hr.java
diff --git a/base/src/org/compiere/util/IniRes_hu.java b/org.adempiere.base/src/org/compiere/util/IniRes_hu.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_hu.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_hu.java
diff --git a/base/src/org/compiere/util/IniRes_in.java b/org.adempiere.base/src/org/compiere/util/IniRes_in.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_in.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_in.java
diff --git a/base/src/org/compiere/util/IniRes_it.java b/org.adempiere.base/src/org/compiere/util/IniRes_it.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_it.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_it.java
diff --git a/base/src/org/compiere/util/IniRes_ja.java b/org.adempiere.base/src/org/compiere/util/IniRes_ja.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_ja.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_ja.java
diff --git a/base/src/org/compiere/util/IniRes_ml.java b/org.adempiere.base/src/org/compiere/util/IniRes_ml.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_ml.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_ml.java
diff --git a/base/src/org/compiere/util/IniRes_ms.java b/org.adempiere.base/src/org/compiere/util/IniRes_ms.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_ms.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_ms.java
diff --git a/base/src/org/compiere/util/IniRes_nl.java b/org.adempiere.base/src/org/compiere/util/IniRes_nl.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_nl.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_nl.java
diff --git a/base/src/org/compiere/util/IniRes_no.java b/org.adempiere.base/src/org/compiere/util/IniRes_no.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_no.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_no.java
diff --git a/base/src/org/compiere/util/IniRes_pl.java b/org.adempiere.base/src/org/compiere/util/IniRes_pl.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_pl.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_pl.java
diff --git a/base/src/org/compiere/util/IniRes_pt.java b/org.adempiere.base/src/org/compiere/util/IniRes_pt.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_pt.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_pt.java
diff --git a/base/src/org/compiere/util/IniRes_ro.java b/org.adempiere.base/src/org/compiere/util/IniRes_ro.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_ro.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_ro.java
diff --git a/base/src/org/compiere/util/IniRes_ru.java b/org.adempiere.base/src/org/compiere/util/IniRes_ru.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_ru.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_ru.java
diff --git a/base/src/org/compiere/util/IniRes_sl.java b/org.adempiere.base/src/org/compiere/util/IniRes_sl.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_sl.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_sl.java
diff --git a/base/src/org/compiere/util/IniRes_sr.java b/org.adempiere.base/src/org/compiere/util/IniRes_sr.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_sr.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_sr.java
diff --git a/base/src/org/compiere/util/IniRes_sv.java b/org.adempiere.base/src/org/compiere/util/IniRes_sv.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_sv.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_sv.java
diff --git a/base/src/org/compiere/util/IniRes_th.java b/org.adempiere.base/src/org/compiere/util/IniRes_th.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_th.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_th.java
diff --git a/base/src/org/compiere/util/IniRes_vi.java b/org.adempiere.base/src/org/compiere/util/IniRes_vi.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_vi.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_vi.java
diff --git a/base/src/org/compiere/util/IniRes_zh.java b/org.adempiere.base/src/org/compiere/util/IniRes_zh.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_zh.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_zh.java
diff --git a/base/src/org/compiere/util/IniRes_zh_CN.java b/org.adempiere.base/src/org/compiere/util/IniRes_zh_CN.java
similarity index 100%
rename from base/src/org/compiere/util/IniRes_zh_CN.java
rename to org.adempiere.base/src/org/compiere/util/IniRes_zh_CN.java
diff --git a/base/src/org/compiere/util/KeyNamePair.java b/org.adempiere.base/src/org/compiere/util/KeyNamePair.java
similarity index 100%
rename from base/src/org/compiere/util/KeyNamePair.java
rename to org.adempiere.base/src/org/compiere/util/KeyNamePair.java
diff --git a/base/src/org/compiere/util/Language.java b/org.adempiere.base/src/org/compiere/util/Language.java
similarity index 100%
rename from base/src/org/compiere/util/Language.java
rename to org.adempiere.base/src/org/compiere/util/Language.java
diff --git a/base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java
similarity index 100%
rename from base/src/org/compiere/util/Login.java
rename to org.adempiere.base/src/org/compiere/util/Login.java
diff --git a/base/src/org/compiere/util/MSort.java b/org.adempiere.base/src/org/compiere/util/MSort.java
similarity index 100%
rename from base/src/org/compiere/util/MSort.java
rename to org.adempiere.base/src/org/compiere/util/MSort.java
diff --git a/base/src/org/compiere/util/MimeType.java b/org.adempiere.base/src/org/compiere/util/MimeType.java
similarity index 100%
rename from base/src/org/compiere/util/MimeType.java
rename to org.adempiere.base/src/org/compiere/util/MimeType.java
diff --git a/base/src/org/compiere/util/Msg.java b/org.adempiere.base/src/org/compiere/util/Msg.java
similarity index 100%
rename from base/src/org/compiere/util/Msg.java
rename to org.adempiere.base/src/org/compiere/util/Msg.java
diff --git a/base/src/org/compiere/util/NamePair.java b/org.adempiere.base/src/org/compiere/util/NamePair.java
similarity index 100%
rename from base/src/org/compiere/util/NamePair.java
rename to org.adempiere.base/src/org/compiere/util/NamePair.java
diff --git a/base/src/org/compiere/util/NullParameter.java b/org.adempiere.base/src/org/compiere/util/NullParameter.java
similarity index 100%
rename from base/src/org/compiere/util/NullParameter.java
rename to org.adempiere.base/src/org/compiere/util/NullParameter.java
diff --git a/base/src/org/compiere/util/OutputParameter.java b/org.adempiere.base/src/org/compiere/util/OutputParameter.java
similarity index 100%
rename from base/src/org/compiere/util/OutputParameter.java
rename to org.adempiere.base/src/org/compiere/util/OutputParameter.java
diff --git a/base/src/org/compiere/util/Queue.java b/org.adempiere.base/src/org/compiere/util/Queue.java
similarity index 100%
rename from base/src/org/compiere/util/Queue.java
rename to org.adempiere.base/src/org/compiere/util/Queue.java
diff --git a/base/src/org/compiere/util/ReplenishInterface.java b/org.adempiere.base/src/org/compiere/util/ReplenishInterface.java
similarity index 100%
rename from base/src/org/compiere/util/ReplenishInterface.java
rename to org.adempiere.base/src/org/compiere/util/ReplenishInterface.java
diff --git a/base/src/org/compiere/util/SavepointVO.java b/org.adempiere.base/src/org/compiere/util/SavepointVO.java
similarity index 100%
rename from base/src/org/compiere/util/SavepointVO.java
rename to org.adempiere.base/src/org/compiere/util/SavepointVO.java
diff --git a/base/src/org/compiere/util/Secure.java b/org.adempiere.base/src/org/compiere/util/Secure.java
similarity index 100%
rename from base/src/org/compiere/util/Secure.java
rename to org.adempiere.base/src/org/compiere/util/Secure.java
diff --git a/base/src/org/compiere/util/SecureEngine.java b/org.adempiere.base/src/org/compiere/util/SecureEngine.java
similarity index 100%
rename from base/src/org/compiere/util/SecureEngine.java
rename to org.adempiere.base/src/org/compiere/util/SecureEngine.java
diff --git a/base/src/org/compiere/util/SecureInterface.java b/org.adempiere.base/src/org/compiere/util/SecureInterface.java
similarity index 100%
rename from base/src/org/compiere/util/SecureInterface.java
rename to org.adempiere.base/src/org/compiere/util/SecureInterface.java
diff --git a/base/src/org/compiere/util/StoredHtmlSrc.java b/org.adempiere.base/src/org/compiere/util/StoredHtmlSrc.java
similarity index 100%
rename from base/src/org/compiere/util/StoredHtmlSrc.java
rename to org.adempiere.base/src/org/compiere/util/StoredHtmlSrc.java
diff --git a/base/src/org/compiere/util/Task.java b/org.adempiere.base/src/org/compiere/util/Task.java
similarity index 100%
rename from base/src/org/compiere/util/Task.java
rename to org.adempiere.base/src/org/compiere/util/Task.java
diff --git a/base/src/org/compiere/util/TimeUtil.java b/org.adempiere.base/src/org/compiere/util/TimeUtil.java
similarity index 100%
rename from base/src/org/compiere/util/TimeUtil.java
rename to org.adempiere.base/src/org/compiere/util/TimeUtil.java
diff --git a/base/src/org/compiere/util/Trace.java b/org.adempiere.base/src/org/compiere/util/Trace.java
similarity index 100%
rename from base/src/org/compiere/util/Trace.java
rename to org.adempiere.base/src/org/compiere/util/Trace.java
diff --git a/base/src/org/compiere/util/Trx.java b/org.adempiere.base/src/org/compiere/util/Trx.java
similarity index 100%
rename from base/src/org/compiere/util/Trx.java
rename to org.adempiere.base/src/org/compiere/util/Trx.java
diff --git a/base/src/org/compiere/util/TrxRunnable.java b/org.adempiere.base/src/org/compiere/util/TrxRunnable.java
similarity index 100%
rename from base/src/org/compiere/util/TrxRunnable.java
rename to org.adempiere.base/src/org/compiere/util/TrxRunnable.java
diff --git a/base/src/org/compiere/util/Util.java b/org.adempiere.base/src/org/compiere/util/Util.java
similarity index 100%
rename from base/src/org/compiere/util/Util.java
rename to org.adempiere.base/src/org/compiere/util/Util.java
diff --git a/base/src/org/compiere/util/ValueNamePair.java b/org.adempiere.base/src/org/compiere/util/ValueNamePair.java
similarity index 100%
rename from base/src/org/compiere/util/ValueNamePair.java
rename to org.adempiere.base/src/org/compiere/util/ValueNamePair.java
diff --git a/base/src/org/compiere/util/WebDoc.java b/org.adempiere.base/src/org/compiere/util/WebDoc.java
similarity index 100%
rename from base/src/org/compiere/util/WebDoc.java
rename to org.adempiere.base/src/org/compiere/util/WebDoc.java
diff --git a/base/src/org/compiere/util/WebEnv.java b/org.adempiere.base/src/org/compiere/util/WebEnv.java
similarity index 100%
rename from base/src/org/compiere/util/WebEnv.java
rename to org.adempiere.base/src/org/compiere/util/WebEnv.java
diff --git a/base/src/org/compiere/util/WebInfo.java b/org.adempiere.base/src/org/compiere/util/WebInfo.java
similarity index 100%
rename from base/src/org/compiere/util/WebInfo.java
rename to org.adempiere.base/src/org/compiere/util/WebInfo.java
diff --git a/base/src/org/compiere/util/WebLogin.java b/org.adempiere.base/src/org/compiere/util/WebLogin.java
similarity index 100%
rename from base/src/org/compiere/util/WebLogin.java
rename to org.adempiere.base/src/org/compiere/util/WebLogin.java
diff --git a/base/src/org/compiere/util/WebSessionCtx.java b/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
similarity index 100%
rename from base/src/org/compiere/util/WebSessionCtx.java
rename to org.adempiere.base/src/org/compiere/util/WebSessionCtx.java
diff --git a/base/src/org/compiere/util/WebUser.java b/org.adempiere.base/src/org/compiere/util/WebUser.java
similarity index 100%
rename from base/src/org/compiere/util/WebUser.java
rename to org.adempiere.base/src/org/compiere/util/WebUser.java
diff --git a/base/src/org/compiere/util/WebUtil.java b/org.adempiere.base/src/org/compiere/util/WebUtil.java
similarity index 100%
rename from base/src/org/compiere/util/WebUtil.java
rename to org.adempiere.base/src/org/compiere/util/WebUtil.java
diff --git a/base/src/org/compiere/util/ZipUtil.java b/org.adempiere.base/src/org/compiere/util/ZipUtil.java
similarity index 100%
rename from base/src/org/compiere/util/ZipUtil.java
rename to org.adempiere.base/src/org/compiere/util/ZipUtil.java
diff --git a/base/src/org/compiere/util/logClient.properties b/org.adempiere.base/src/org/compiere/util/logClient.properties
similarity index 100%
rename from base/src/org/compiere/util/logClient.properties
rename to org.adempiere.base/src/org/compiere/util/logClient.properties
diff --git a/base/src/org/compiere/util/logServer.properties b/org.adempiere.base/src/org/compiere/util/logServer.properties
similarity index 100%
rename from base/src/org/compiere/util/logServer.properties
rename to org.adempiere.base/src/org/compiere/util/logServer.properties
diff --git a/base/src/org/compiere/wf/DocWorkflowManager.java b/org.adempiere.base/src/org/compiere/wf/DocWorkflowManager.java
similarity index 100%
rename from base/src/org/compiere/wf/DocWorkflowManager.java
rename to org.adempiere.base/src/org/compiere/wf/DocWorkflowManager.java
diff --git a/base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFActivity.java
rename to org.adempiere.base/src/org/compiere/wf/MWFActivity.java
diff --git a/base/src/org/compiere/wf/MWFBlock.java b/org.adempiere.base/src/org/compiere/wf/MWFBlock.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFBlock.java
rename to org.adempiere.base/src/org/compiere/wf/MWFBlock.java
diff --git a/base/src/org/compiere/wf/MWFEventAudit.java b/org.adempiere.base/src/org/compiere/wf/MWFEventAudit.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFEventAudit.java
rename to org.adempiere.base/src/org/compiere/wf/MWFEventAudit.java
diff --git a/base/src/org/compiere/wf/MWFNextCondition.java b/org.adempiere.base/src/org/compiere/wf/MWFNextCondition.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFNextCondition.java
rename to org.adempiere.base/src/org/compiere/wf/MWFNextCondition.java
diff --git a/base/src/org/compiere/wf/MWFNode.java b/org.adempiere.base/src/org/compiere/wf/MWFNode.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFNode.java
rename to org.adempiere.base/src/org/compiere/wf/MWFNode.java
diff --git a/base/src/org/compiere/wf/MWFNodeNext.java b/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFNodeNext.java
rename to org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java
diff --git a/base/src/org/compiere/wf/MWFNodePara.java b/org.adempiere.base/src/org/compiere/wf/MWFNodePara.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFNodePara.java
rename to org.adempiere.base/src/org/compiere/wf/MWFNodePara.java
diff --git a/base/src/org/compiere/wf/MWFProcess.java b/org.adempiere.base/src/org/compiere/wf/MWFProcess.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFProcess.java
rename to org.adempiere.base/src/org/compiere/wf/MWFProcess.java
diff --git a/base/src/org/compiere/wf/MWFResponsible.java b/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
similarity index 100%
rename from base/src/org/compiere/wf/MWFResponsible.java
rename to org.adempiere.base/src/org/compiere/wf/MWFResponsible.java
diff --git a/base/src/org/compiere/wf/MWorkflow.java b/org.adempiere.base/src/org/compiere/wf/MWorkflow.java
similarity index 100%
rename from base/src/org/compiere/wf/MWorkflow.java
rename to org.adempiere.base/src/org/compiere/wf/MWorkflow.java
diff --git a/base/src/org/compiere/wf/MWorkflowAccess.java b/org.adempiere.base/src/org/compiere/wf/MWorkflowAccess.java
similarity index 100%
rename from base/src/org/compiere/wf/MWorkflowAccess.java
rename to org.adempiere.base/src/org/compiere/wf/MWorkflowAccess.java
diff --git a/base/src/org/compiere/wf/MWorkflowProcessor.java b/org.adempiere.base/src/org/compiere/wf/MWorkflowProcessor.java
similarity index 100%
rename from base/src/org/compiere/wf/MWorkflowProcessor.java
rename to org.adempiere.base/src/org/compiere/wf/MWorkflowProcessor.java
diff --git a/base/src/org/compiere/wf/MWorkflowProcessorLog.java b/org.adempiere.base/src/org/compiere/wf/MWorkflowProcessorLog.java
similarity index 100%
rename from base/src/org/compiere/wf/MWorkflowProcessorLog.java
rename to org.adempiere.base/src/org/compiere/wf/MWorkflowProcessorLog.java
diff --git a/base/src/org/compiere/wf/WFActivityManage.java b/org.adempiere.base/src/org/compiere/wf/WFActivityManage.java
similarity index 100%
rename from base/src/org/compiere/wf/WFActivityManage.java
rename to org.adempiere.base/src/org/compiere/wf/WFActivityManage.java
diff --git a/base/src/org/compiere/wf/WFProcessManage.java b/org.adempiere.base/src/org/compiere/wf/WFProcessManage.java
similarity index 100%
rename from base/src/org/compiere/wf/WFProcessManage.java
rename to org.adempiere.base/src/org/compiere/wf/WFProcessManage.java
diff --git a/base/src/org/compiere/wf/WorkflowMoveToClient.java b/org.adempiere.base/src/org/compiere/wf/WorkflowMoveToClient.java
similarity index 100%
rename from base/src/org/compiere/wf/WorkflowMoveToClient.java
rename to org.adempiere.base/src/org/compiere/wf/WorkflowMoveToClient.java
diff --git a/base/src/org/compiere/wf/WorkflowValidate.java b/org.adempiere.base/src/org/compiere/wf/WorkflowValidate.java
similarity index 100%
rename from base/src/org/compiere/wf/WorkflowValidate.java
rename to org.adempiere.base/src/org/compiere/wf/WorkflowValidate.java
diff --git a/base/src/org/eevolution/model/CalloutBOM.java b/org.adempiere.base/src/org/eevolution/model/CalloutBOM.java
similarity index 100%
rename from base/src/org/eevolution/model/CalloutBOM.java
rename to org.adempiere.base/src/org/eevolution/model/CalloutBOM.java
diff --git a/base/src/org/eevolution/model/I_C_TaxBase.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxBase.java
similarity index 100%
rename from base/src/org/eevolution/model/I_C_TaxBase.java
rename to org.adempiere.base/src/org/eevolution/model/I_C_TaxBase.java
diff --git a/base/src/org/eevolution/model/I_C_TaxDefinition.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxDefinition.java
similarity index 100%
rename from base/src/org/eevolution/model/I_C_TaxDefinition.java
rename to org.adempiere.base/src/org/eevolution/model/I_C_TaxDefinition.java
diff --git a/base/src/org/eevolution/model/I_C_TaxGroup.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxGroup.java
similarity index 100%
rename from base/src/org/eevolution/model/I_C_TaxGroup.java
rename to org.adempiere.base/src/org/eevolution/model/I_C_TaxGroup.java
diff --git a/base/src/org/eevolution/model/I_C_TaxType.java b/org.adempiere.base/src/org/eevolution/model/I_C_TaxType.java
similarity index 100%
rename from base/src/org/eevolution/model/I_C_TaxType.java
rename to org.adempiere.base/src/org/eevolution/model/I_C_TaxType.java
diff --git a/base/src/org/eevolution/model/I_DD_NetworkDistribution.java b/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistribution.java
similarity index 100%
rename from base/src/org/eevolution/model/I_DD_NetworkDistribution.java
rename to org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistribution.java
diff --git a/base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java b/org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java
similarity index 100%
rename from base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java
rename to org.adempiere.base/src/org/eevolution/model/I_DD_NetworkDistributionLine.java
diff --git a/base/src/org/eevolution/model/I_DD_Order.java b/org.adempiere.base/src/org/eevolution/model/I_DD_Order.java
similarity index 100%
rename from base/src/org/eevolution/model/I_DD_Order.java
rename to org.adempiere.base/src/org/eevolution/model/I_DD_Order.java
diff --git a/base/src/org/eevolution/model/I_DD_OrderLine.java b/org.adempiere.base/src/org/eevolution/model/I_DD_OrderLine.java
similarity index 100%
rename from base/src/org/eevolution/model/I_DD_OrderLine.java
rename to org.adempiere.base/src/org/eevolution/model/I_DD_OrderLine.java
diff --git a/base/src/org/eevolution/model/I_HR_Attribute.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Attribute.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Attribute.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Attribute.java
diff --git a/base/src/org/eevolution/model/I_HR_Concept.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Concept.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Concept.java
diff --git a/base/src/org/eevolution/model/I_HR_Concept_Acct.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Acct.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Concept_Acct.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Acct.java
diff --git a/base/src/org/eevolution/model/I_HR_Concept_Category.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Category.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Concept_Category.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Concept_Category.java
diff --git a/base/src/org/eevolution/model/I_HR_Contract.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Contract.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Contract.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Contract.java
diff --git a/base/src/org/eevolution/model/I_HR_Department.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Department.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Department.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Department.java
diff --git a/base/src/org/eevolution/model/I_HR_Employee.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Employee.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Employee.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Employee.java
diff --git a/base/src/org/eevolution/model/I_HR_Job.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Job.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Job.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Job.java
diff --git a/base/src/org/eevolution/model/I_HR_List.java b/org.adempiere.base/src/org/eevolution/model/I_HR_List.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_List.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_List.java
diff --git a/base/src/org/eevolution/model/I_HR_ListLine.java b/org.adempiere.base/src/org/eevolution/model/I_HR_ListLine.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_ListLine.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_ListLine.java
diff --git a/base/src/org/eevolution/model/I_HR_ListType.java b/org.adempiere.base/src/org/eevolution/model/I_HR_ListType.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_ListType.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_ListType.java
diff --git a/base/src/org/eevolution/model/I_HR_ListVersion.java b/org.adempiere.base/src/org/eevolution/model/I_HR_ListVersion.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_ListVersion.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_ListVersion.java
diff --git a/base/src/org/eevolution/model/I_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Movement.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Movement.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Movement.java
diff --git a/base/src/org/eevolution/model/I_HR_Payroll.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Payroll.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Payroll.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Payroll.java
diff --git a/base/src/org/eevolution/model/I_HR_PayrollConcept.java b/org.adempiere.base/src/org/eevolution/model/I_HR_PayrollConcept.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_PayrollConcept.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_PayrollConcept.java
diff --git a/base/src/org/eevolution/model/I_HR_Period.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Period.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Period.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Period.java
diff --git a/base/src/org/eevolution/model/I_HR_Process.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Process.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Process.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Process.java
diff --git a/base/src/org/eevolution/model/I_HR_Year.java b/org.adempiere.base/src/org/eevolution/model/I_HR_Year.java
similarity index 100%
rename from base/src/org/eevolution/model/I_HR_Year.java
rename to org.adempiere.base/src/org/eevolution/model/I_HR_Year.java
diff --git a/base/src/org/eevolution/model/I_I_Movement.java b/org.adempiere.base/src/org/eevolution/model/I_I_Movement.java
similarity index 100%
rename from base/src/org/eevolution/model/I_I_Movement.java
rename to org.adempiere.base/src/org/eevolution/model/I_I_Movement.java
diff --git a/base/src/org/eevolution/model/I_I_ProductPlanning.java b/org.adempiere.base/src/org/eevolution/model/I_I_ProductPlanning.java
similarity index 100%
rename from base/src/org/eevolution/model/I_I_ProductPlanning.java
rename to org.adempiere.base/src/org/eevolution/model/I_I_ProductPlanning.java
diff --git a/base/src/org/eevolution/model/I_PP_Cost_Collector.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_Collector.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Cost_Collector.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Cost_Collector.java
diff --git a/base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Cost_CollectorMA.java
diff --git a/base/src/org/eevolution/model/I_PP_MRP.java b/org.adempiere.base/src/org/eevolution/model/I_PP_MRP.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_MRP.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_MRP.java
diff --git a/base/src/org/eevolution/model/I_PP_Order.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_BOM.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOM.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_BOM.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOM.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOMLine.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_BOMLine.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_BOMLine.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_Cost.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Cost.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_Cost.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_Cost.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_Node.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_Node.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_NodeNext.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_NodeNext.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_NodeNext.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_NodeNext.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Asset.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_Node_Asset.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Asset.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Product.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_Node_Product.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_Node_Product.java
diff --git a/base/src/org/eevolution/model/I_PP_Order_Workflow.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Order_Workflow.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Order_Workflow.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Order_Workflow.java
diff --git a/base/src/org/eevolution/model/I_PP_Product_BOM.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOM.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Product_BOM.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOM.java
diff --git a/base/src/org/eevolution/model/I_PP_Product_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOMLine.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Product_BOMLine.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Product_BOMLine.java
diff --git a/base/src/org/eevolution/model/I_PP_Product_Planning.java b/org.adempiere.base/src/org/eevolution/model/I_PP_Product_Planning.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_Product_Planning.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_Product_Planning.java
diff --git a/base/src/org/eevolution/model/I_PP_WF_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Asset.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_WF_Node_Asset.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Asset.java
diff --git a/base/src/org/eevolution/model/I_PP_WF_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Product.java
similarity index 100%
rename from base/src/org/eevolution/model/I_PP_WF_Node_Product.java
rename to org.adempiere.base/src/org/eevolution/model/I_PP_WF_Node_Product.java
diff --git a/base/src/org/eevolution/model/I_QM_Specification.java b/org.adempiere.base/src/org/eevolution/model/I_QM_Specification.java
similarity index 100%
rename from base/src/org/eevolution/model/I_QM_Specification.java
rename to org.adempiere.base/src/org/eevolution/model/I_QM_Specification.java
diff --git a/base/src/org/eevolution/model/I_QM_SpecificationLine.java b/org.adempiere.base/src/org/eevolution/model/I_QM_SpecificationLine.java
similarity index 100%
rename from base/src/org/eevolution/model/I_QM_SpecificationLine.java
rename to org.adempiere.base/src/org/eevolution/model/I_QM_SpecificationLine.java
diff --git a/base/src/org/eevolution/model/I_T_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/I_T_BOMLine.java
similarity index 100%
rename from base/src/org/eevolution/model/I_T_BOMLine.java
rename to org.adempiere.base/src/org/eevolution/model/I_T_BOMLine.java
diff --git a/base/src/org/eevolution/model/I_T_MRP_CRP.java b/org.adempiere.base/src/org/eevolution/model/I_T_MRP_CRP.java
similarity index 100%
rename from base/src/org/eevolution/model/I_T_MRP_CRP.java
rename to org.adempiere.base/src/org/eevolution/model/I_T_MRP_CRP.java
diff --git a/base/src/org/eevolution/model/MDDOrder.java b/org.adempiere.base/src/org/eevolution/model/MDDOrder.java
similarity index 100%
rename from base/src/org/eevolution/model/MDDOrder.java
rename to org.adempiere.base/src/org/eevolution/model/MDDOrder.java
diff --git a/base/src/org/eevolution/model/MDDOrderLine.java b/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java
similarity index 100%
rename from base/src/org/eevolution/model/MDDOrderLine.java
rename to org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java
diff --git a/base/src/org/eevolution/model/MPPProductBOM.java b/org.adempiere.base/src/org/eevolution/model/MPPProductBOM.java
similarity index 100%
rename from base/src/org/eevolution/model/MPPProductBOM.java
rename to org.adempiere.base/src/org/eevolution/model/MPPProductBOM.java
diff --git a/base/src/org/eevolution/model/MPPProductBOMLine.java b/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java
similarity index 100%
rename from base/src/org/eevolution/model/MPPProductBOMLine.java
rename to org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java
diff --git a/base/src/org/eevolution/model/MPPProductPlanning.java b/org.adempiere.base/src/org/eevolution/model/MPPProductPlanning.java
similarity index 100%
rename from base/src/org/eevolution/model/MPPProductPlanning.java
rename to org.adempiere.base/src/org/eevolution/model/MPPProductPlanning.java
diff --git a/base/src/org/eevolution/model/X_C_TaxBase.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
similarity index 100%
rename from base/src/org/eevolution/model/X_C_TaxBase.java
rename to org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
diff --git a/base/src/org/eevolution/model/X_C_TaxDefinition.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
similarity index 100%
rename from base/src/org/eevolution/model/X_C_TaxDefinition.java
rename to org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
diff --git a/base/src/org/eevolution/model/X_C_TaxGroup.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
similarity index 100%
rename from base/src/org/eevolution/model/X_C_TaxGroup.java
rename to org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
diff --git a/base/src/org/eevolution/model/X_C_TaxType.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
similarity index 100%
rename from base/src/org/eevolution/model/X_C_TaxType.java
rename to org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
diff --git a/base/src/org/eevolution/model/X_DD_NetworkDistribution.java b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
similarity index 100%
rename from base/src/org/eevolution/model/X_DD_NetworkDistribution.java
rename to org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
diff --git a/base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
similarity index 100%
rename from base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
rename to org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
diff --git a/base/src/org/eevolution/model/X_DD_Order.java b/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
similarity index 100%
rename from base/src/org/eevolution/model/X_DD_Order.java
rename to org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
diff --git a/base/src/org/eevolution/model/X_DD_OrderLine.java b/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
similarity index 100%
rename from base/src/org/eevolution/model/X_DD_OrderLine.java
rename to org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
diff --git a/base/src/org/eevolution/model/X_HR_Attribute.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Attribute.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
diff --git a/base/src/org/eevolution/model/X_HR_Concept.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Concept.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
diff --git a/base/src/org/eevolution/model/X_HR_Concept_Acct.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Concept_Acct.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
diff --git a/base/src/org/eevolution/model/X_HR_Concept_Category.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Concept_Category.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
diff --git a/base/src/org/eevolution/model/X_HR_Contract.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Contract.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
diff --git a/base/src/org/eevolution/model/X_HR_Department.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Department.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
diff --git a/base/src/org/eevolution/model/X_HR_Employee.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Employee.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
diff --git a/base/src/org/eevolution/model/X_HR_Job.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Job.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
diff --git a/base/src/org/eevolution/model/X_HR_List.java b/org.adempiere.base/src/org/eevolution/model/X_HR_List.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_List.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_List.java
diff --git a/base/src/org/eevolution/model/X_HR_ListLine.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_ListLine.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
diff --git a/base/src/org/eevolution/model/X_HR_ListType.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_ListType.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
diff --git a/base/src/org/eevolution/model/X_HR_ListVersion.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_ListVersion.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
diff --git a/base/src/org/eevolution/model/X_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Movement.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
diff --git a/base/src/org/eevolution/model/X_HR_Payroll.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Payroll.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
diff --git a/base/src/org/eevolution/model/X_HR_PayrollConcept.java b/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_PayrollConcept.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
diff --git a/base/src/org/eevolution/model/X_HR_Period.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Period.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
diff --git a/base/src/org/eevolution/model/X_HR_Process.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Process.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
diff --git a/base/src/org/eevolution/model/X_HR_Year.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
similarity index 100%
rename from base/src/org/eevolution/model/X_HR_Year.java
rename to org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
diff --git a/base/src/org/eevolution/model/X_I_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
similarity index 100%
rename from base/src/org/eevolution/model/X_I_Movement.java
rename to org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
diff --git a/base/src/org/eevolution/model/X_I_ProductPlanning.java b/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
similarity index 100%
rename from base/src/org/eevolution/model/X_I_ProductPlanning.java
rename to org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
diff --git a/base/src/org/eevolution/model/X_PP_Cost_Collector.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Cost_Collector.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
diff --git a/base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
diff --git a/base/src/org/eevolution/model/X_PP_MRP.java b/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_MRP.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
diff --git a/base/src/org/eevolution/model/X_PP_Order.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_BOM.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_BOM.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_BOMLine.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_Cost.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_Cost.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_Node.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_Node.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_NodeNext.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_NodeNext.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_Node_Product.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
diff --git a/base/src/org/eevolution/model/X_PP_Order_Workflow.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Order_Workflow.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
diff --git a/base/src/org/eevolution/model/X_PP_Product_BOM.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Product_BOM.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
diff --git a/base/src/org/eevolution/model/X_PP_Product_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Product_BOMLine.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
diff --git a/base/src/org/eevolution/model/X_PP_Product_Planning.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_Product_Planning.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
diff --git a/base/src/org/eevolution/model/X_PP_WF_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
diff --git a/base/src/org/eevolution/model/X_PP_WF_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
similarity index 100%
rename from base/src/org/eevolution/model/X_PP_WF_Node_Product.java
rename to org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
diff --git a/base/src/org/eevolution/model/X_QM_Specification.java b/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
similarity index 100%
rename from base/src/org/eevolution/model/X_QM_Specification.java
rename to org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
diff --git a/base/src/org/eevolution/model/X_QM_SpecificationLine.java b/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
similarity index 100%
rename from base/src/org/eevolution/model/X_QM_SpecificationLine.java
rename to org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
diff --git a/base/src/org/eevolution/model/X_T_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
similarity index 100%
rename from base/src/org/eevolution/model/X_T_BOMLine.java
rename to org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
diff --git a/base/src/org/eevolution/model/X_T_MRP_CRP.java b/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
similarity index 100%
rename from base/src/org/eevolution/model/X_T_MRP_CRP.java
rename to org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
diff --git a/base/src/org/eevolution/process/BankTransfer.java b/org.adempiere.base/src/org/eevolution/process/BankTransfer.java
similarity index 100%
rename from base/src/org/eevolution/process/BankTransfer.java
rename to org.adempiere.base/src/org/eevolution/process/BankTransfer.java
diff --git a/base/src/org/eevolution/process/EnableNativeSequence.java b/org.adempiere.base/src/org/eevolution/process/EnableNativeSequence.java
similarity index 100%
rename from base/src/org/eevolution/process/EnableNativeSequence.java
rename to org.adempiere.base/src/org/eevolution/process/EnableNativeSequence.java
diff --git a/base/src/org/eevolution/process/ExportFormatGenerator.java b/org.adempiere.base/src/org/eevolution/process/ExportFormatGenerator.java
similarity index 100%
rename from base/src/org/eevolution/process/ExportFormatGenerator.java
rename to org.adempiere.base/src/org/eevolution/process/ExportFormatGenerator.java
diff --git a/base/src/org/eevolution/process/ImportInventoryMove.java b/org.adempiere.base/src/org/eevolution/process/ImportInventoryMove.java
similarity index 100%
rename from base/src/org/eevolution/process/ImportInventoryMove.java
rename to org.adempiere.base/src/org/eevolution/process/ImportInventoryMove.java
diff --git a/base/src/org/eevolution/process/InvoiceCalculateTax.java b/org.adempiere.base/src/org/eevolution/process/InvoiceCalculateTax.java
similarity index 100%
rename from base/src/org/eevolution/process/InvoiceCalculateTax.java
rename to org.adempiere.base/src/org/eevolution/process/InvoiceCalculateTax.java
diff --git a/extend/.classpath b/org.adempiere.extend/.classpath
similarity index 100%
rename from extend/.classpath
rename to org.adempiere.extend/.classpath
diff --git a/extend/.project b/org.adempiere.extend/.project
similarity index 95%
rename from extend/.project
rename to org.adempiere.extend/.project
index 5537584a19..61fec90a3f 100644
--- a/extend/.project
+++ b/org.adempiere.extend/.project
@@ -1,6 +1,6 @@
- extend
+ org.adempiere.extendbase
diff --git a/extend/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from extend/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
diff --git a/extend/.settings/org.eclipse.wst.common.component b/org.adempiere.extend/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from extend/.settings/org.eclipse.wst.common.component
rename to org.adempiere.extend/.settings/org.eclipse.wst.common.component
diff --git a/extend/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.extend/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from extend/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to org.adempiere.extend/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/extend/Extend.html b/org.adempiere.extend/Extend.html
similarity index 100%
rename from extend/Extend.html
rename to org.adempiere.extend/Extend.html
diff --git a/extend/FunctionalTestSuite.launch b/org.adempiere.extend/FunctionalTestSuite.launch
similarity index 85%
rename from extend/FunctionalTestSuite.launch
rename to org.adempiere.extend/FunctionalTestSuite.launch
index 168ce15ec1..85846de358 100644
--- a/extend/FunctionalTestSuite.launch
+++ b/org.adempiere.extend/FunctionalTestSuite.launch
@@ -1,19 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extend/InventoryTest.launch b/org.adempiere.extend/InventoryTest.launch
similarity index 98%
rename from extend/InventoryTest.launch
rename to org.adempiere.extend/InventoryTest.launch
index 6833622740..031e601848 100644
--- a/extend/InventoryTest.launch
+++ b/org.adempiere.extend/InventoryTest.launch
@@ -1,46 +1,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
similarity index 72%
rename from extend/META-INF/MANIFEST.MF
rename to org.adempiere.extend/META-INF/MANIFEST.MF
index f5c72f980d..d9d1f2054f 100644
--- a/extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-SymbolicName: org.adempiere.extend;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: extend.jar
Eclipse-RegisterBuddy: org.adempiere.tools
-Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100",
- org.adempiere.tools;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: compiere.model
+Export-Package: compiere.model,
+ test
Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
Eclipse-PatchFragment: true
+Import-Package: junit.framework;version="3.8.2"
diff --git a/extend/Profile-SingleMProductTest.launch b/org.adempiere.extend/Profile-SingleMProductTest.launch
similarity index 95%
rename from extend/Profile-SingleMProductTest.launch
rename to org.adempiere.extend/Profile-SingleMProductTest.launch
index 9f5d7519f6..b95340258d 100644
--- a/extend/Profile-SingleMProductTest.launch
+++ b/org.adempiere.extend/Profile-SingleMProductTest.launch
@@ -1,7 +1,7 @@
-
+
@@ -27,5 +27,5 @@
-
+
diff --git a/extend/RUN_build.bat b/org.adempiere.extend/RUN_build.bat
similarity index 100%
rename from extend/RUN_build.bat
rename to org.adempiere.extend/RUN_build.bat
diff --git a/extend/RUN_build.sh b/org.adempiere.extend/RUN_build.sh
similarity index 100%
rename from extend/RUN_build.sh
rename to org.adempiere.extend/RUN_build.sh
diff --git a/extend/build.properties b/org.adempiere.extend/build.properties
similarity index 100%
rename from extend/build.properties
rename to org.adempiere.extend/build.properties
diff --git a/extend/database/XX_View.sql b/org.adempiere.extend/database/XX_View.sql
similarity index 100%
rename from extend/database/XX_View.sql
rename to org.adempiere.extend/database/XX_View.sql
diff --git a/extend/database/XX_Visit.sql b/org.adempiere.extend/database/XX_Visit.sql
similarity index 100%
rename from extend/database/XX_Visit.sql
rename to org.adempiere.extend/database/XX_Visit.sql
diff --git a/client/documentation.bat b/org.adempiere.extend/documentation.bat
similarity index 100%
rename from client/documentation.bat
rename to org.adempiere.extend/documentation.bat
diff --git a/extend/src/compiere/model/CalloutUser.java b/org.adempiere.extend/src/compiere/model/CalloutUser.java
similarity index 100%
rename from extend/src/compiere/model/CalloutUser.java
rename to org.adempiere.extend/src/compiere/model/CalloutUser.java
diff --git a/extend/src/compiere/model/MVisit.java.txt b/org.adempiere.extend/src/compiere/model/MVisit.java.txt
similarity index 100%
rename from extend/src/compiere/model/MVisit.java.txt
rename to org.adempiere.extend/src/compiere/model/MVisit.java.txt
diff --git a/extend/src/compiere/model/MyModelExample.java b/org.adempiere.extend/src/compiere/model/MyModelExample.java
similarity index 100%
rename from extend/src/compiere/model/MyModelExample.java
rename to org.adempiere.extend/src/compiere/model/MyModelExample.java
diff --git a/extend/src/compiere/model/MyValidator.java b/org.adempiere.extend/src/compiere/model/MyValidator.java
similarity index 100%
rename from extend/src/compiere/model/MyValidator.java
rename to org.adempiere.extend/src/compiere/model/MyValidator.java
diff --git a/extend/src/compiere/model/XXVisitInvoice.java.txt b/org.adempiere.extend/src/compiere/model/XXVisitInvoice.java.txt
similarity index 100%
rename from extend/src/compiere/model/XXVisitInvoice.java.txt
rename to org.adempiere.extend/src/compiere/model/XXVisitInvoice.java.txt
diff --git a/extend/src/compiere/model/X_XX_Visit.java.txt b/org.adempiere.extend/src/compiere/model/X_XX_Visit.java.txt
similarity index 100%
rename from extend/src/compiere/model/X_XX_Visit.java.txt
rename to org.adempiere.extend/src/compiere/model/X_XX_Visit.java.txt
diff --git a/extend/src/org/compiere/test/OrderTest.java b/org.adempiere.extend/src/org/compiere/test/OrderTest.java
similarity index 100%
rename from extend/src/org/compiere/test/OrderTest.java
rename to org.adempiere.extend/src/org/compiere/test/OrderTest.java
diff --git a/extend/src/test/AdempiereTestCase.java b/org.adempiere.extend/src/test/AdempiereTestCase.java
similarity index 100%
rename from extend/src/test/AdempiereTestCase.java
rename to org.adempiere.extend/src/test/AdempiereTestCase.java
diff --git a/extend/src/test/functional/AlertTest.java b/org.adempiere.extend/src/test/functional/AlertTest.java
similarity index 100%
rename from extend/src/test/functional/AlertTest.java
rename to org.adempiere.extend/src/test/functional/AlertTest.java
diff --git a/extend/src/test/functional/DBTest.java b/org.adempiere.extend/src/test/functional/DBTest.java
similarity index 100%
rename from extend/src/test/functional/DBTest.java
rename to org.adempiere.extend/src/test/functional/DBTest.java
diff --git a/extend/src/test/functional/FunctionalTestSuite.java b/org.adempiere.extend/src/test/functional/FunctionalTestSuite.java
similarity index 100%
rename from extend/src/test/functional/FunctionalTestSuite.java
rename to org.adempiere.extend/src/test/functional/FunctionalTestSuite.java
diff --git a/extend/src/test/functional/MAssetTest.java b/org.adempiere.extend/src/test/functional/MAssetTest.java
similarity index 100%
rename from extend/src/test/functional/MAssetTest.java
rename to org.adempiere.extend/src/test/functional/MAssetTest.java
diff --git a/extend/src/test/functional/MAttributeTest.java b/org.adempiere.extend/src/test/functional/MAttributeTest.java
similarity index 100%
rename from extend/src/test/functional/MAttributeTest.java
rename to org.adempiere.extend/src/test/functional/MAttributeTest.java
diff --git a/extend/src/test/functional/MBPGroupTest.java b/org.adempiere.extend/src/test/functional/MBPGroupTest.java
similarity index 100%
rename from extend/src/test/functional/MBPGroupTest.java
rename to org.adempiere.extend/src/test/functional/MBPGroupTest.java
diff --git a/extend/src/test/functional/MBPartnerLocationTest.java b/org.adempiere.extend/src/test/functional/MBPartnerLocationTest.java
similarity index 100%
rename from extend/src/test/functional/MBPartnerLocationTest.java
rename to org.adempiere.extend/src/test/functional/MBPartnerLocationTest.java
diff --git a/extend/src/test/functional/MBPartnerTest.java b/org.adempiere.extend/src/test/functional/MBPartnerTest.java
similarity index 100%
rename from extend/src/test/functional/MBPartnerTest.java
rename to org.adempiere.extend/src/test/functional/MBPartnerTest.java
diff --git a/extend/src/test/functional/MCashBookTest.java b/org.adempiere.extend/src/test/functional/MCashBookTest.java
similarity index 100%
rename from extend/src/test/functional/MCashBookTest.java
rename to org.adempiere.extend/src/test/functional/MCashBookTest.java
diff --git a/extend/src/test/functional/MClientTest.java b/org.adempiere.extend/src/test/functional/MClientTest.java
similarity index 100%
rename from extend/src/test/functional/MClientTest.java
rename to org.adempiere.extend/src/test/functional/MClientTest.java
diff --git a/extend/src/test/functional/MColorTest.java b/org.adempiere.extend/src/test/functional/MColorTest.java
similarity index 100%
rename from extend/src/test/functional/MColorTest.java
rename to org.adempiere.extend/src/test/functional/MColorTest.java
diff --git a/extend/src/test/functional/MContactInterestTest.java b/org.adempiere.extend/src/test/functional/MContactInterestTest.java
similarity index 100%
rename from extend/src/test/functional/MContactInterestTest.java
rename to org.adempiere.extend/src/test/functional/MContactInterestTest.java
diff --git a/extend/src/test/functional/MCostDetailTest.java b/org.adempiere.extend/src/test/functional/MCostDetailTest.java
similarity index 100%
rename from extend/src/test/functional/MCostDetailTest.java
rename to org.adempiere.extend/src/test/functional/MCostDetailTest.java
diff --git a/extend/src/test/functional/MCostElementTest.java b/org.adempiere.extend/src/test/functional/MCostElementTest.java
similarity index 100%
rename from extend/src/test/functional/MCostElementTest.java
rename to org.adempiere.extend/src/test/functional/MCostElementTest.java
diff --git a/extend/src/test/functional/MCurrencyAcctTest.java b/org.adempiere.extend/src/test/functional/MCurrencyAcctTest.java
similarity index 100%
rename from extend/src/test/functional/MCurrencyAcctTest.java
rename to org.adempiere.extend/src/test/functional/MCurrencyAcctTest.java
diff --git a/extend/src/test/functional/MDistributionTest.java b/org.adempiere.extend/src/test/functional/MDistributionTest.java
similarity index 100%
rename from extend/src/test/functional/MDistributionTest.java
rename to org.adempiere.extend/src/test/functional/MDistributionTest.java
diff --git a/extend/src/test/functional/MInvoiceTest.java b/org.adempiere.extend/src/test/functional/MInvoiceTest.java
similarity index 100%
rename from extend/src/test/functional/MInvoiceTest.java
rename to org.adempiere.extend/src/test/functional/MInvoiceTest.java
diff --git a/extend/src/test/functional/MLocationTest.java b/org.adempiere.extend/src/test/functional/MLocationTest.java
similarity index 100%
rename from extend/src/test/functional/MLocationTest.java
rename to org.adempiere.extend/src/test/functional/MLocationTest.java
diff --git a/extend/src/test/functional/MLotTest.java b/org.adempiere.extend/src/test/functional/MLotTest.java
similarity index 100%
rename from extend/src/test/functional/MLotTest.java
rename to org.adempiere.extend/src/test/functional/MLotTest.java
diff --git a/extend/src/test/functional/MMatchInvTest.java b/org.adempiere.extend/src/test/functional/MMatchInvTest.java
similarity index 100%
rename from extend/src/test/functional/MMatchInvTest.java
rename to org.adempiere.extend/src/test/functional/MMatchInvTest.java
diff --git a/extend/src/test/functional/MMediaServerTest.java b/org.adempiere.extend/src/test/functional/MMediaServerTest.java
similarity index 100%
rename from extend/src/test/functional/MMediaServerTest.java
rename to org.adempiere.extend/src/test/functional/MMediaServerTest.java
diff --git a/extend/src/test/functional/MMenuTest.java b/org.adempiere.extend/src/test/functional/MMenuTest.java
similarity index 100%
rename from extend/src/test/functional/MMenuTest.java
rename to org.adempiere.extend/src/test/functional/MMenuTest.java
diff --git a/extend/src/test/functional/MPInstanceTest.java b/org.adempiere.extend/src/test/functional/MPInstanceTest.java
similarity index 100%
rename from extend/src/test/functional/MPInstanceTest.java
rename to org.adempiere.extend/src/test/functional/MPInstanceTest.java
diff --git a/extend/src/test/functional/MPaySelectionTest.java b/org.adempiere.extend/src/test/functional/MPaySelectionTest.java
similarity index 100%
rename from extend/src/test/functional/MPaySelectionTest.java
rename to org.adempiere.extend/src/test/functional/MPaySelectionTest.java
diff --git a/extend/src/test/functional/MPaymentTest.java b/org.adempiere.extend/src/test/functional/MPaymentTest.java
similarity index 100%
rename from extend/src/test/functional/MPaymentTest.java
rename to org.adempiere.extend/src/test/functional/MPaymentTest.java
diff --git a/extend/src/test/functional/MPriceListVersionTest.java b/org.adempiere.extend/src/test/functional/MPriceListVersionTest.java
similarity index 100%
rename from extend/src/test/functional/MPriceListVersionTest.java
rename to org.adempiere.extend/src/test/functional/MPriceListVersionTest.java
diff --git a/extend/src/test/functional/MProductBOMTest.java b/org.adempiere.extend/src/test/functional/MProductBOMTest.java
similarity index 100%
rename from extend/src/test/functional/MProductBOMTest.java
rename to org.adempiere.extend/src/test/functional/MProductBOMTest.java
diff --git a/extend/src/test/functional/MProductTest.java b/org.adempiere.extend/src/test/functional/MProductTest.java
similarity index 100%
rename from extend/src/test/functional/MProductTest.java
rename to org.adempiere.extend/src/test/functional/MProductTest.java
diff --git a/extend/src/test/functional/MProjectTest.java b/org.adempiere.extend/src/test/functional/MProjectTest.java
similarity index 100%
rename from extend/src/test/functional/MProjectTest.java
rename to org.adempiere.extend/src/test/functional/MProjectTest.java
diff --git a/extend/src/test/functional/MRefListTest.java b/org.adempiere.extend/src/test/functional/MRefListTest.java
similarity index 100%
rename from extend/src/test/functional/MRefListTest.java
rename to org.adempiere.extend/src/test/functional/MRefListTest.java
diff --git a/extend/src/test/functional/MRequestTypeTest.java b/org.adempiere.extend/src/test/functional/MRequestTypeTest.java
similarity index 100%
rename from extend/src/test/functional/MRequestTypeTest.java
rename to org.adempiere.extend/src/test/functional/MRequestTypeTest.java
diff --git a/extend/src/test/functional/MRuleTest.java b/org.adempiere.extend/src/test/functional/MRuleTest.java
similarity index 100%
rename from extend/src/test/functional/MRuleTest.java
rename to org.adempiere.extend/src/test/functional/MRuleTest.java
diff --git a/extend/src/test/functional/MSessionTest.java b/org.adempiere.extend/src/test/functional/MSessionTest.java
similarity index 100%
rename from extend/src/test/functional/MSessionTest.java
rename to org.adempiere.extend/src/test/functional/MSessionTest.java
diff --git a/extend/src/test/functional/MStorageTest.java b/org.adempiere.extend/src/test/functional/MStorageTest.java
similarity index 100%
rename from extend/src/test/functional/MStorageTest.java
rename to org.adempiere.extend/src/test/functional/MStorageTest.java
diff --git a/extend/src/test/functional/MSysConfigTest.java b/org.adempiere.extend/src/test/functional/MSysConfigTest.java
similarity index 100%
rename from extend/src/test/functional/MSysConfigTest.java
rename to org.adempiere.extend/src/test/functional/MSysConfigTest.java
diff --git a/extend/src/test/functional/MUOMTest.java b/org.adempiere.extend/src/test/functional/MUOMTest.java
similarity index 100%
rename from extend/src/test/functional/MUOMTest.java
rename to org.adempiere.extend/src/test/functional/MUOMTest.java
diff --git a/extend/src/test/functional/MUserTest.java b/org.adempiere.extend/src/test/functional/MUserTest.java
similarity index 100%
rename from extend/src/test/functional/MUserTest.java
rename to org.adempiere.extend/src/test/functional/MUserTest.java
diff --git a/extend/src/test/functional/POTest.java b/org.adempiere.extend/src/test/functional/POTest.java
similarity index 100%
rename from extend/src/test/functional/POTest.java
rename to org.adempiere.extend/src/test/functional/POTest.java
diff --git a/extend/src/test/functional/QueryTest.java b/org.adempiere.extend/src/test/functional/QueryTest.java
similarity index 100%
rename from extend/src/test/functional/QueryTest.java
rename to org.adempiere.extend/src/test/functional/QueryTest.java
diff --git a/extend/src/test/functional/TrifonTest.java b/org.adempiere.extend/src/test/functional/TrifonTest.java
similarity index 100%
rename from extend/src/test/functional/TrifonTest.java
rename to org.adempiere.extend/src/test/functional/TrifonTest.java
diff --git a/extend/src/test/functional/TrxTest.java b/org.adempiere.extend/src/test/functional/TrxTest.java
similarity index 100%
rename from extend/src/test/functional/TrxTest.java
rename to org.adempiere.extend/src/test/functional/TrxTest.java
diff --git a/extend/src/test/functional/WorkflowTest.java b/org.adempiere.extend/src/test/functional/WorkflowTest.java
similarity index 100%
rename from extend/src/test/functional/WorkflowTest.java
rename to org.adempiere.extend/src/test/functional/WorkflowTest.java
diff --git a/extend/src/test/functional/inventory/CSVFactory.java b/org.adempiere.extend/src/test/functional/inventory/CSVFactory.java
similarity index 100%
rename from extend/src/test/functional/inventory/CSVFactory.java
rename to org.adempiere.extend/src/test/functional/inventory/CSVFactory.java
diff --git a/extend/src/test/functional/inventory/InventoryTest.java b/org.adempiere.extend/src/test/functional/inventory/InventoryTest.java
similarity index 100%
rename from extend/src/test/functional/inventory/InventoryTest.java
rename to org.adempiere.extend/src/test/functional/inventory/InventoryTest.java
diff --git a/extend/src/test/functional/inventory/InventoryUtil.java b/org.adempiere.extend/src/test/functional/inventory/InventoryUtil.java
similarity index 100%
rename from extend/src/test/functional/inventory/InventoryUtil.java
rename to org.adempiere.extend/src/test/functional/inventory/InventoryUtil.java
diff --git a/extend/src/test/functional/inventory/MMDocument.java b/org.adempiere.extend/src/test/functional/inventory/MMDocument.java
similarity index 100%
rename from extend/src/test/functional/inventory/MMDocument.java
rename to org.adempiere.extend/src/test/functional/inventory/MMDocument.java
diff --git a/extend/src/test/functional/inventory/MMScenario.java b/org.adempiere.extend/src/test/functional/inventory/MMScenario.java
similarity index 100%
rename from extend/src/test/functional/inventory/MMScenario.java
rename to org.adempiere.extend/src/test/functional/inventory/MMScenario.java
diff --git a/extend/src/test/functional/rbtreetest.yap b/org.adempiere.extend/src/test/functional/rbtreetest.yap
similarity index 100%
rename from extend/src/test/functional/rbtreetest.yap
rename to org.adempiere.extend/src/test/functional/rbtreetest.yap
diff --git a/extend/src/test/functional/wcandtaskdata.yap b/org.adempiere.extend/src/test/functional/wcandtaskdata.yap
similarity index 100%
rename from extend/src/test/functional/wcandtaskdata.yap
rename to org.adempiere.extend/src/test/functional/wcandtaskdata.yap
diff --git a/extend/src/test/performance/MProductTest.java b/org.adempiere.extend/src/test/performance/MProductTest.java
similarity index 100%
rename from extend/src/test/performance/MProductTest.java
rename to org.adempiere.extend/src/test/performance/MProductTest.java
diff --git a/extend/src/test/performance/SingleMProductTest.java b/org.adempiere.extend/src/test/performance/SingleMProductTest.java
similarity index 100%
rename from extend/src/test/performance/SingleMProductTest.java
rename to org.adempiere.extend/src/test/performance/SingleMProductTest.java
diff --git a/extend/testTemplate.properties b/org.adempiere.extend/testTemplate.properties
similarity index 100%
rename from extend/testTemplate.properties
rename to org.adempiere.extend/testTemplate.properties
diff --git a/client/.classpath b/org.adempiere.install/.classpath
similarity index 80%
rename from client/.classpath
rename to org.adempiere.install/.classpath
index 8dec8f8698..5995863c3b 100644
--- a/client/.classpath
+++ b/org.adempiere.install/.classpath
@@ -1,7 +1,8 @@
-
+
+
diff --git a/install/.myumldata b/org.adempiere.install/.myumldata
similarity index 100%
rename from install/.myumldata
rename to org.adempiere.install/.myumldata
diff --git a/install/.project b/org.adempiere.install/.project
similarity index 96%
rename from install/.project
rename to org.adempiere.install/.project
index 3dca82a6da..45bf6cdc75 100644
--- a/install/.project
+++ b/org.adempiere.install/.project
@@ -1,6 +1,6 @@
- install
+ org.adempiere.installbase
diff --git a/install/.settings/org.eclipse.core.resources.prefs b/org.adempiere.install/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from install/.settings/org.eclipse.core.resources.prefs
rename to org.adempiere.install/.settings/org.eclipse.core.resources.prefs
diff --git a/install/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from install/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
diff --git a/install/Adempiere/AdempiereEnvTemplate.properties b/org.adempiere.install/Adempiere/AdempiereEnvTemplate.properties
similarity index 100%
rename from install/Adempiere/AdempiereEnvTemplate.properties
rename to org.adempiere.install/Adempiere/AdempiereEnvTemplate.properties
diff --git a/install/Adempiere/RUN_setup.bat b/org.adempiere.install/Adempiere/RUN_setup.bat
similarity index 100%
rename from install/Adempiere/RUN_setup.bat
rename to org.adempiere.install/Adempiere/RUN_setup.bat
diff --git a/install/Adempiere/RUN_setup.sh b/org.adempiere.install/Adempiere/RUN_setup.sh
similarity index 100%
rename from install/Adempiere/RUN_setup.sh
rename to org.adempiere.install/Adempiere/RUN_setup.sh
diff --git a/install/Adempiere/RUN_silentsetup.bat b/org.adempiere.install/Adempiere/RUN_silentsetup.bat
similarity index 100%
rename from install/Adempiere/RUN_silentsetup.bat
rename to org.adempiere.install/Adempiere/RUN_silentsetup.bat
diff --git a/install/Adempiere/RUN_silentsetup.sh b/org.adempiere.install/Adempiere/RUN_silentsetup.sh
similarity index 100%
rename from install/Adempiere/RUN_silentsetup.sh
rename to org.adempiere.install/Adempiere/RUN_silentsetup.sh
diff --git a/install/Adempiere/RUN_update.bat b/org.adempiere.install/Adempiere/RUN_update.bat
similarity index 100%
rename from install/Adempiere/RUN_update.bat
rename to org.adempiere.install/Adempiere/RUN_update.bat
diff --git a/install/Adempiere/RUN_update.sh b/org.adempiere.install/Adempiere/RUN_update.sh
similarity index 100%
rename from install/Adempiere/RUN_update.sh
rename to org.adempiere.install/Adempiere/RUN_update.sh
diff --git a/install/Adempiere/build.xml b/org.adempiere.install/Adempiere/build.xml
similarity index 100%
rename from install/Adempiere/build.xml
rename to org.adempiere.install/Adempiere/build.xml
diff --git a/install/Adempiere/images/InstallSteps.gif b/org.adempiere.install/Adempiere/images/InstallSteps.gif
similarity index 100%
rename from install/Adempiere/images/InstallSteps.gif
rename to org.adempiere.install/Adempiere/images/InstallSteps.gif
diff --git a/install/Adempiere/images/adempiere_5a.jpg b/org.adempiere.install/Adempiere/images/adempiere_5a.jpg
similarity index 100%
rename from install/Adempiere/images/adempiere_5a.jpg
rename to org.adempiere.install/Adempiere/images/adempiere_5a.jpg
diff --git a/install/Adempiere/images/adempiere_disc.css b/org.adempiere.install/Adempiere/images/adempiere_disc.css
similarity index 100%
rename from install/Adempiere/images/adempiere_disc.css
rename to org.adempiere.install/Adempiere/images/adempiere_disc.css
diff --git a/install/Adempiere/images/adempiere_print.css b/org.adempiere.install/Adempiere/images/adempiere_print.css
similarity index 100%
rename from install/Adempiere/images/adempiere_print.css
rename to org.adempiere.install/Adempiere/images/adempiere_print.css
diff --git a/install/Adempiere/images/hr.jpg b/org.adempiere.install/Adempiere/images/hr.jpg
similarity index 100%
rename from install/Adempiere/images/hr.jpg
rename to org.adempiere.install/Adempiere/images/hr.jpg
diff --git a/install/Adempiere/images/page_bkgd3.jpg b/org.adempiere.install/Adempiere/images/page_bkgd3.jpg
similarity index 100%
rename from install/Adempiere/images/page_bkgd3.jpg
rename to org.adempiere.install/Adempiere/images/page_bkgd3.jpg
diff --git a/install/Adempiere/index.html b/org.adempiere.install/Adempiere/index.html
similarity index 100%
rename from install/Adempiere/index.html
rename to org.adempiere.install/Adempiere/index.html
diff --git a/install/Adempiere/install.html b/org.adempiere.install/Adempiere/install.html
similarity index 100%
rename from install/Adempiere/install.html
rename to org.adempiere.install/Adempiere/install.html
diff --git a/install/Adempiere/license.html b/org.adempiere.install/Adempiere/license.html
similarity index 100%
rename from install/Adempiere/license.html
rename to org.adempiere.install/Adempiere/license.html
diff --git a/install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
similarity index 56%
rename from install/META-INF/MANIFEST.MF
rename to org.adempiere.install/META-INF/MANIFEST.MF
index 295290dacc..be1b1f11da 100644
--- a/install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -3,10 +3,13 @@ Bundle-ManifestVersion: 2
Bundle-Name: install
Bundle-SymbolicName: org.adempiere.install;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: install.jar
+Bundle-ClassPath: install.jar,
+ ant-contrib-1.0b3.jar
Export-Package: org.compiere.install
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.client;bundle-version="1.0.0",
- org.adempiere.tools;bundle-version="1.0.0"
+ org.adempiere.ui.swing;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.equinox.app
+Import-Package: javax.mail;version="1.4.1",
+ javax.mail.internet;version="1.4.1",
+ org.apache.tools.ant,
+ org.eclipse.equinox.app
diff --git a/install/RUN_build.bat b/org.adempiere.install/RUN_build.bat
similarity index 100%
rename from install/RUN_build.bat
rename to org.adempiere.install/RUN_build.bat
diff --git a/install/RUN_build.sh b/org.adempiere.install/RUN_build.sh
similarity index 100%
rename from install/RUN_build.sh
rename to org.adempiere.install/RUN_build.sh
diff --git a/install/Setup.launch b/org.adempiere.install/Setup.launch
similarity index 85%
rename from install/Setup.launch
rename to org.adempiere.install/Setup.launch
index a9994e7365..8f674bcea9 100644
--- a/install/Setup.launch
+++ b/org.adempiere.install/Setup.launch
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install/build.properties b/org.adempiere.install/build.properties
similarity index 62%
rename from install/build.properties
rename to org.adempiere.install/build.properties
index dfe14ae5b3..c77134375d 100644
--- a/install/build.properties
+++ b/org.adempiere.install/build.properties
@@ -2,4 +2,5 @@ source.install.jar = src/
output.install.jar = build/
bin.includes = META-INF/,\
install.jar,\
- plugin.xml
+ plugin.xml,\
+ ant-contrib-1.0b3.jar
diff --git a/install/build.xml b/org.adempiere.install/build.xml
similarity index 100%
rename from install/build.xml
rename to org.adempiere.install/build.xml
diff --git a/install/plugin.xml b/org.adempiere.install/plugin.xml
similarity index 100%
rename from install/plugin.xml
rename to org.adempiere.install/plugin.xml
diff --git a/install/src/org/compiere/install/Application.java b/org.adempiere.install/src/org/compiere/install/Application.java
similarity index 100%
rename from install/src/org/compiere/install/Application.java
rename to org.adempiere.install/src/org/compiere/install/Application.java
diff --git a/install/src/org/compiere/install/Config.java b/org.adempiere.install/src/org/compiere/install/Config.java
similarity index 100%
rename from install/src/org/compiere/install/Config.java
rename to org.adempiere.install/src/org/compiere/install/Config.java
diff --git a/install/src/org/compiere/install/ConfigAppServer.java b/org.adempiere.install/src/org/compiere/install/ConfigAppServer.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigAppServer.java
rename to org.adempiere.install/src/org/compiere/install/ConfigAppServer.java
diff --git a/install/src/org/compiere/install/ConfigOracle.java b/org.adempiere.install/src/org/compiere/install/ConfigOracle.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigOracle.java
rename to org.adempiere.install/src/org/compiere/install/ConfigOracle.java
diff --git a/install/src/org/compiere/install/ConfigPostgreSQL.java b/org.adempiere.install/src/org/compiere/install/ConfigPostgreSQL.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigPostgreSQL.java
rename to org.adempiere.install/src/org/compiere/install/ConfigPostgreSQL.java
diff --git a/install/src/org/compiere/install/ConfigVMMac.java b/org.adempiere.install/src/org/compiere/install/ConfigVMMac.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigVMMac.java
rename to org.adempiere.install/src/org/compiere/install/ConfigVMMac.java
diff --git a/install/src/org/compiere/install/ConfigVMOpenJDK.java b/org.adempiere.install/src/org/compiere/install/ConfigVMOpenJDK.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigVMOpenJDK.java
rename to org.adempiere.install/src/org/compiere/install/ConfigVMOpenJDK.java
diff --git a/install/src/org/compiere/install/ConfigVMSun.java b/org.adempiere.install/src/org/compiere/install/ConfigVMSun.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigVMSun.java
rename to org.adempiere.install/src/org/compiere/install/ConfigVMSun.java
diff --git a/install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigurationData.java
rename to org.adempiere.install/src/org/compiere/install/ConfigurationData.java
diff --git a/install/src/org/compiere/install/ConfigurationPanel.java b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
similarity index 100%
rename from install/src/org/compiere/install/ConfigurationPanel.java
rename to org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java
diff --git a/install/src/org/compiere/install/KeyStoreDialog.java b/org.adempiere.install/src/org/compiere/install/KeyStoreDialog.java
similarity index 100%
rename from install/src/org/compiere/install/KeyStoreDialog.java
rename to org.adempiere.install/src/org/compiere/install/KeyStoreDialog.java
diff --git a/install/src/org/compiere/install/KeyStoreMgt.java b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
similarity index 100%
rename from install/src/org/compiere/install/KeyStoreMgt.java
rename to org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
diff --git a/install/src/org/compiere/install/Setup.java b/org.adempiere.install/src/org/compiere/install/Setup.java
similarity index 100%
rename from install/src/org/compiere/install/Setup.java
rename to org.adempiere.install/src/org/compiere/install/Setup.java
diff --git a/install/src/org/compiere/install/SetupRes.java b/org.adempiere.install/src/org/compiere/install/SetupRes.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes.java
diff --git a/install/src/org/compiere/install/SetupRes_ar.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ar.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_ar.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_ar.java
diff --git a/install/src/org/compiere/install/SetupRes_ca.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ca.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_ca.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_ca.java
diff --git a/install/src/org/compiere/install/SetupRes_da.java b/org.adempiere.install/src/org/compiere/install/SetupRes_da.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_da.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_da.java
diff --git a/install/src/org/compiere/install/SetupRes_de.java b/org.adempiere.install/src/org/compiere/install/SetupRes_de.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_de.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_de.java
diff --git a/install/src/org/compiere/install/SetupRes_el.java b/org.adempiere.install/src/org/compiere/install/SetupRes_el.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_el.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_el.java
diff --git a/install/src/org/compiere/install/SetupRes_es.java b/org.adempiere.install/src/org/compiere/install/SetupRes_es.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_es.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_es.java
diff --git a/install/src/org/compiere/install/SetupRes_fa.java b/org.adempiere.install/src/org/compiere/install/SetupRes_fa.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_fa.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_fa.java
diff --git a/install/src/org/compiere/install/SetupRes_fr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_fr.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_fr.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_fr.java
diff --git a/install/src/org/compiere/install/SetupRes_hr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_hr.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_hr.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_hr.java
diff --git a/install/src/org/compiere/install/SetupRes_hu.java b/org.adempiere.install/src/org/compiere/install/SetupRes_hu.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_hu.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_hu.java
diff --git a/install/src/org/compiere/install/SetupRes_in.java b/org.adempiere.install/src/org/compiere/install/SetupRes_in.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_in.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_in.java
diff --git a/install/src/org/compiere/install/SetupRes_it.java b/org.adempiere.install/src/org/compiere/install/SetupRes_it.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_it.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_it.java
diff --git a/install/src/org/compiere/install/SetupRes_ja.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ja.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_ja.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_ja.java
diff --git a/install/src/org/compiere/install/SetupRes_my.java b/org.adempiere.install/src/org/compiere/install/SetupRes_my.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_my.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_my.java
diff --git a/install/src/org/compiere/install/SetupRes_no.java b/org.adempiere.install/src/org/compiere/install/SetupRes_no.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_no.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_no.java
diff --git a/install/src/org/compiere/install/SetupRes_pl.java b/org.adempiere.install/src/org/compiere/install/SetupRes_pl.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_pl.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_pl.java
diff --git a/install/src/org/compiere/install/SetupRes_ro.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ro.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_ro.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_ro.java
diff --git a/install/src/org/compiere/install/SetupRes_ru.java b/org.adempiere.install/src/org/compiere/install/SetupRes_ru.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_ru.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_ru.java
diff --git a/install/src/org/compiere/install/SetupRes_sl.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sl.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_sl.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_sl.java
diff --git a/install/src/org/compiere/install/SetupRes_sr.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sr.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_sr.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_sr.java
diff --git a/install/src/org/compiere/install/SetupRes_sv.java b/org.adempiere.install/src/org/compiere/install/SetupRes_sv.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_sv.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_sv.java
diff --git a/install/src/org/compiere/install/SetupRes_vi.java b/org.adempiere.install/src/org/compiere/install/SetupRes_vi.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_vi.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_vi.java
diff --git a/install/src/org/compiere/install/SetupRes_zh.java b/org.adempiere.install/src/org/compiere/install/SetupRes_zh.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_zh.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_zh.java
diff --git a/install/src/org/compiere/install/SetupRes_zh_CN.java b/org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java
similarity index 100%
rename from install/src/org/compiere/install/SetupRes_zh_CN.java
rename to org.adempiere.install/src/org/compiere/install/SetupRes_zh_CN.java
diff --git a/install/src/org/compiere/install/Setup_Help.java b/org.adempiere.install/src/org/compiere/install/Setup_Help.java
similarity index 100%
rename from install/src/org/compiere/install/Setup_Help.java
rename to org.adempiere.install/src/org/compiere/install/Setup_Help.java
diff --git a/install/src/org/compiere/install/SilentSetup.java b/org.adempiere.install/src/org/compiere/install/SilentSetup.java
similarity index 100%
rename from install/src/org/compiere/install/SilentSetup.java
rename to org.adempiere.install/src/org/compiere/install/SilentSetup.java
diff --git a/install/src/org/compiere/install/openFile.gif b/org.adempiere.install/src/org/compiere/install/openFile.gif
similarity index 100%
rename from install/src/org/compiere/install/openFile.gif
rename to org.adempiere.install/src/org/compiere/install/openFile.gif
diff --git a/org.adempiere.payment.processor-feature/.project b/org.adempiere.payment.processor-feature/.project
new file mode 100644
index 0000000000..8940d49380
--- /dev/null
+++ b/org.adempiere.payment.processor-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.payment.processor-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.payment.processor-feature/build.properties b/org.adempiere.payment.processor-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.payment.processor-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
new file mode 100644
index 0000000000..10a4df49aa
--- /dev/null
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
diff --git a/base/.classpath b/org.adempiere.payment.processor/.classpath
similarity index 54%
rename from base/.classpath
rename to org.adempiere.payment.processor/.classpath
index b06fc7f852..4e88dbaf95 100644
--- a/base/.classpath
+++ b/org.adempiere.payment.processor/.classpath
@@ -1,11 +1,10 @@
-
+
+
+
+
-
-
-
-
-
-
+
+
diff --git a/org.adempiere.payment.processor/.project b/org.adempiere.payment.processor/.project
new file mode 100644
index 0000000000..1d30ab0700
--- /dev/null
+++ b/org.adempiere.payment.processor/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.payment.processor
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..57e9da9f2f
--- /dev/null
+++ b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Sat Sep 25 06:49:38 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.payment.processor/.settings/org.eclipse.pde.core.prefs b/org.adempiere.payment.processor/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..67f6ac9e18
--- /dev/null
+++ b/org.adempiere.payment.processor/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Sat Sep 25 06:49:38 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..131e0047c9
--- /dev/null
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Processor
+Bundle-SymbolicName: org.adempiere.payment.processor
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Bundle-ClassPath: jpayment.jar,
+ payflow.jar,
+ Verisign.jar,
+ .
+Eclipse-RegisterBuddy: org.adempiere.base
diff --git a/org.adempiere.payment.processor/build.properties b/org.adempiere.payment.processor/build.properties
new file mode 100644
index 0000000000..bd5f976d98
--- /dev/null
+++ b/org.adempiere.payment.processor/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ jpayment.jar,\
+ payflow.jar,\
+ Verisign.jar
diff --git a/base/src/org/compiere/model/PP_Authorize.java b/org.adempiere.payment.processor/src/org/compiere/model/PP_Authorize.java
similarity index 100%
rename from base/src/org/compiere/model/PP_Authorize.java
rename to org.adempiere.payment.processor/src/org/compiere/model/PP_Authorize.java
diff --git a/base/src/org/compiere/model/PP_Optimal.java b/org.adempiere.payment.processor/src/org/compiere/model/PP_Optimal.java
similarity index 100%
rename from base/src/org/compiere/model/PP_Optimal.java
rename to org.adempiere.payment.processor/src/org/compiere/model/PP_Optimal.java
diff --git a/base/src/org/compiere/model/PP_PayFlowPro.java b/org.adempiere.payment.processor/src/org/compiere/model/PP_PayFlowPro.java
similarity index 100%
rename from base/src/org/compiere/model/PP_PayFlowPro.java
rename to org.adempiere.payment.processor/src/org/compiere/model/PP_PayFlowPro.java
diff --git a/base/src/org/compiere/model/PP_PayFlowPro4.java b/org.adempiere.payment.processor/src/org/compiere/model/PP_PayFlowPro4.java
similarity index 100%
rename from base/src/org/compiere/model/PP_PayFlowPro4.java
rename to org.adempiere.payment.processor/src/org/compiere/model/PP_PayFlowPro4.java
diff --git a/base/src/org/compiere/model/PP_PayPal.java b/org.adempiere.payment.processor/src/org/compiere/model/PP_PayPal.java
similarity index 100%
rename from base/src/org/compiere/model/PP_PayPal.java
rename to org.adempiere.payment.processor/src/org/compiere/model/PP_PayPal.java
diff --git a/org.adempiere.pipo-feature/.project b/org.adempiere.pipo-feature/.project
new file mode 100644
index 0000000000..7f39c6fac5
--- /dev/null
+++ b/org.adempiere.pipo-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.pipo-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.pipo-feature/build.properties b/org.adempiere.pipo-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.pipo-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
new file mode 100644
index 0000000000..2bb3c21d6c
--- /dev/null
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -0,0 +1,44 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/pluginList/.classpath b/org.adempiere.pipo.handlers/.classpath
similarity index 100%
rename from plugins/pluginList/.classpath
rename to org.adempiere.pipo.handlers/.classpath
diff --git a/org.adempiere.pipo.handlers/.project b/org.adempiere.pipo.handlers/.project
new file mode 100644
index 0000000000..67004fd3dd
--- /dev/null
+++ b/org.adempiere.pipo.handlers/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.pipo.handlers
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/pipoHandlers/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from pipoHandlers/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
diff --git a/pipoHandlers/.settings/org.eclipse.pde.core.prefs b/org.adempiere.pipo.handlers/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from pipoHandlers/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.pipo.handlers/.settings/org.eclipse.pde.core.prefs
diff --git a/pipoHandlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
similarity index 78%
rename from pipoHandlers/META-INF/MANIFEST.MF
rename to org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index 59e0b718be..520af55f6b 100644
--- a/pipoHandlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: PipoHandlers
-Bundle-SymbolicName: org.adempiere.pipo.defaultHandlers;singleton:=true
+Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.adempiere.pipo;bundle-version="1.0.0",
diff --git a/JasperReportsClient/build.properties b/org.adempiere.pipo.handlers/build.properties
similarity index 100%
rename from JasperReportsClient/build.properties
rename to org.adempiere.pipo.handlers/build.properties
diff --git a/pipoHandlers/plugin.xml b/org.adempiere.pipo.handlers/plugin.xml
similarity index 100%
rename from pipoHandlers/plugin.xml
rename to org.adempiere.pipo.handlers/plugin.xml
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/AdElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/AdElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/AdElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/AdElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/CodeSnippetElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/CodeSnippetElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/CodeSnippetElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/CodeSnippetElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/CommonTranslationHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/CommonTranslationHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/CommonTranslationHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/CommonTranslationHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/DistFileElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/DistFileElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/DistFileElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/DistFileElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/DynValRuleElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/DynValRuleElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/DynValRuleElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/DynValRuleElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/FieldElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FieldElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/FieldElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FieldElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/FieldGroupElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FieldGroupElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/FieldGroupElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FieldGroupElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/FileElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FileElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/FileElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FileElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/FormAccessElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FormAccessElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/FormAccessElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FormAccessElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/FormElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FormElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/FormElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/FormElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/GenericPOElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/GenericPOElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/GenericPOElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/GenericPOElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ImpFormatElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ImpFormatElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ImpFormatElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ImpFormatElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ImpFormatRowElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ImpFormatRowElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ImpFormatRowElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ImpFormatRowElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/MenuElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/MenuElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/MenuElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/MenuElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/MessageElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/MessageElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/MessageElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/MessageElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/OrgRoleElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/OrgRoleElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/OrgRoleElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/OrgRoleElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/PreferenceElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PreferenceElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/PreferenceElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PreferenceElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/PrintFormatElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PrintFormatElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/PrintFormatElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PrintFormatElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/PrintFormatItemElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PrintFormatItemElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/PrintFormatItemElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PrintFormatItemElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/PrintPaperElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PrintPaperElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/PrintPaperElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PrintPaperElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ProcessAccessElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ProcessAccessElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ProcessAccessElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ProcessAccessElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ProcessElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ProcessElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ProcessElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ProcessElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ProcessParaElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ProcessParaElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ProcessParaElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ProcessParaElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ReferenceElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReferenceElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ReferenceElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReferenceElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ReferenceListElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReferenceListElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ReferenceListElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReferenceListElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ReferenceTableElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReferenceTableElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ReferenceTableElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReferenceTableElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ReportViewColElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewColElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ReportViewColElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewColElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/RoleElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/RoleElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/RoleElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/RoleElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/TabElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TabElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/TabElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TabElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/TableElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TableElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/TableElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TableElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/TaskAccessElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TaskAccessElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/TaskAccessElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TaskAccessElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/TaskElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TaskElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/TaskElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TaskElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/UserRoleElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/UserRoleElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/UserRoleElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/UserRoleElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/WindowAccessElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WindowAccessElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/WindowAccessElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WindowAccessElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/WindowElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WindowElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/WindowElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WindowElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowAccessElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowAccessElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowAccessElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowAccessElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowNodeElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowNodeElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowNodeElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowNodeElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextConditionElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextConditionElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextConditionElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextConditionElementHandler.java
diff --git a/pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextElementHandler.java
similarity index 100%
rename from pipoHandlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextElementHandler.java
rename to org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowNodeNextElementHandler.java
diff --git a/plugins/pluginUtils/.classpath b/org.adempiere.pipo.legacy/.classpath
similarity index 100%
rename from plugins/pluginUtils/.classpath
rename to org.adempiere.pipo.legacy/.classpath
diff --git a/pipoHandlers/.project b/org.adempiere.pipo.legacy/.project
similarity index 93%
rename from pipoHandlers/.project
rename to org.adempiere.pipo.legacy/.project
index 77a4556959..0e5657c6fa 100644
--- a/pipoHandlers/.project
+++ b/org.adempiere.pipo.legacy/.project
@@ -1,6 +1,6 @@
- pipoHandlers
+ org.adempiere.pipo.legacy
diff --git a/org.adempiere.pipo.legacy/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo.legacy/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..ec76b55281
--- /dev/null
+++ b/org.adempiere.pipo.legacy/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Sep 27 13:03:25 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.pipo.legacy/.settings/org.eclipse.pde.core.prefs b/org.adempiere.pipo.legacy/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..e06c667360
--- /dev/null
+++ b/org.adempiere.pipo.legacy/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 27 13:03:25 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.pipo.legacy/META-INF/MANIFEST.MF b/org.adempiere.pipo.legacy/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..071977bcbe
--- /dev/null
+++ b/org.adempiere.pipo.legacy/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Old Pipo
+Bundle-SymbolicName: org.adempiere.pipo.legacy
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Export-Package: org.adempiere.pipo,
+ org.adempiere.pipo.exception,
+ org.adempiere.pipo.handler
+Import-Package: junit.framework;version="3.8.2",
+ org.apache.tools.ant,
+ org.apache.tools.ant.taskdefs
diff --git a/org.adempiere.pipo.legacy/build.properties b/org.adempiere.pipo.legacy/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/org.adempiere.pipo.legacy/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/base/src/org/adempiere/pipo/AbstractElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/AbstractElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/AbstractElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/AbstractElementHandler.java
diff --git a/base/src/org/adempiere/pipo/AttributeFiller.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/AttributeFiller.java
similarity index 100%
rename from base/src/org/adempiere/pipo/AttributeFiller.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/AttributeFiller.java
diff --git a/base/src/org/adempiere/pipo/CreateZipFile.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/CreateZipFile.java
similarity index 100%
rename from base/src/org/adempiere/pipo/CreateZipFile.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/CreateZipFile.java
diff --git a/base/src/org/adempiere/pipo/Element.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/Element.java
similarity index 100%
rename from base/src/org/adempiere/pipo/Element.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/Element.java
diff --git a/base/src/org/adempiere/pipo/ElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/ElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/ElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/ElementHandler.java
diff --git a/base/src/org/adempiere/pipo/IDFinder.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/IDFinder.java
similarity index 100%
rename from base/src/org/adempiere/pipo/IDFinder.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/IDFinder.java
diff --git a/base/src/org/adempiere/pipo/PackIn.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackIn.java
similarity index 100%
rename from base/src/org/adempiere/pipo/PackIn.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackIn.java
diff --git a/base/src/org/adempiere/pipo/PackInHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackInHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/PackInHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackInHandler.java
diff --git a/base/src/org/adempiere/pipo/PackOut.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackOut.java
similarity index 100%
rename from base/src/org/adempiere/pipo/PackOut.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackOut.java
diff --git a/base/src/org/adempiere/pipo/PackRoll.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackRoll.java
similarity index 100%
rename from base/src/org/adempiere/pipo/PackRoll.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackRoll.java
diff --git a/base/src/org/adempiere/pipo/PoFiller.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/PoFiller.java
similarity index 100%
rename from base/src/org/adempiere/pipo/PoFiller.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/PoFiller.java
diff --git a/base/src/org/adempiere/pipo/exception/DatabaseAccessException.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/exception/DatabaseAccessException.java
similarity index 100%
rename from base/src/org/adempiere/pipo/exception/DatabaseAccessException.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/exception/DatabaseAccessException.java
diff --git a/base/src/org/adempiere/pipo/exception/NonUniqueIDLookupException.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/exception/NonUniqueIDLookupException.java
similarity index 100%
rename from base/src/org/adempiere/pipo/exception/NonUniqueIDLookupException.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/exception/NonUniqueIDLookupException.java
diff --git a/base/src/org/adempiere/pipo/exception/POSaveFailedException.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/exception/POSaveFailedException.java
similarity index 100%
rename from base/src/org/adempiere/pipo/exception/POSaveFailedException.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/exception/POSaveFailedException.java
diff --git a/base/src/org/adempiere/pipo/handler/AdElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/AdElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/AdElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/AdElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ColumnElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ColumnElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ColumnElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ColumnElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/CommonTranslationHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/CommonTranslationHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/DataElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/DataElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/DataElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/DataElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/DistFileElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/DistFileElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/DistFileElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/DistFileElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/DynValRuleElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/DynValRuleElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/DynValRuleElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/DynValRuleElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/EntityTypeElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/EntityTypeElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/EntityTypeElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/EntityTypeElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/FieldElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FieldElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/FieldElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FieldElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/FieldGroupElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FieldGroupElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/FieldGroupElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FieldGroupElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/FormAccessElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FormAccessElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/FormAccessElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FormAccessElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/FormElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FormElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/FormElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/FormElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ImpFormatRowElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ImpFormatRowElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ImpFormatRowElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ImpFormatRowElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/MenuElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/MenuElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/MenuElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/MenuElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/MessageElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/MessageElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/MessageElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/MessageElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ModelValidatorElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ModelValidatorElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ModelValidatorElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ModelValidatorElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/OrgRoleElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/OrgRoleElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/OrgRoleElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/OrgRoleElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/PreferenceElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PreferenceElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/PreferenceElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PreferenceElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/PrintFormatItemElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PrintFormatItemElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/PrintFormatItemElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PrintFormatItemElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/PrintPaperElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PrintPaperElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/PrintPaperElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/PrintPaperElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ProcessAccessElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ProcessAccessElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ProcessAccessElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ProcessAccessElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ProcessElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ProcessElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ProcessElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ProcessParaElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ProcessParaElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ProcessParaElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ProcessParaElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ReferenceElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReferenceElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ReferenceElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReferenceElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ReferenceListElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReferenceListElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ReferenceListElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReferenceListElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ReferenceTableElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReferenceTableElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ReferenceTableElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReferenceTableElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ReportViewColElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReportViewColElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ReportViewColElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReportViewColElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/ReportViewElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReportViewElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/ReportViewElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/ReportViewElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/RoleElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/RoleElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/RoleElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/RoleElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/SQLStatementElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/SQLStatementElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/SQLStatementElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/SQLStatementElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/TabElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TabElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/TabElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TabElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/TableElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TableElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/TableElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TableElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/TaskAccessElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TaskAccessElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/TaskAccessElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TaskAccessElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/TaskElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TaskElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/TaskElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/TaskElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/UserRoleElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/UserRoleElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/UserRoleElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/UserRoleElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/WindowAccessElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WindowAccessElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/WindowAccessElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WindowAccessElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/WindowElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WindowElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/WindowElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WindowElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/WorkflowAccessElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowAccessElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/WorkflowAccessElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowAccessElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/WorkflowElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/WorkflowElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/WorkflowNodeElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowNodeElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/WorkflowNodeElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowNodeElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/WorkflowNodeNextConditionElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowNodeNextConditionElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/WorkflowNodeNextConditionElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowNodeNextConditionElementHandler.java
diff --git a/base/src/org/adempiere/pipo/handler/WorkflowNodeNextElementHandler.java b/org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowNodeNextElementHandler.java
similarity index 100%
rename from base/src/org/adempiere/pipo/handler/WorkflowNodeNextElementHandler.java
rename to org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/WorkflowNodeNextElementHandler.java
diff --git a/extend/src/test/functional/PackOutTest.java b/org.adempiere.pipo.legacy/src/test/functional/PackOutTest.java
similarity index 100%
rename from extend/src/test/functional/PackOutTest.java
rename to org.adempiere.pipo.legacy/src/test/functional/PackOutTest.java
diff --git a/tomcatConfig/.classpath b/org.adempiere.pipo/.classpath
similarity index 100%
rename from tomcatConfig/.classpath
rename to org.adempiere.pipo/.classpath
diff --git a/plugins/pluginList/.project b/org.adempiere.pipo/.project
similarity index 94%
rename from plugins/pluginList/.project
rename to org.adempiere.pipo/.project
index 9a8e142dee..f59bcd9621 100644
--- a/plugins/pluginList/.project
+++ b/org.adempiere.pipo/.project
@@ -1,6 +1,6 @@
- pluginList
+ org.adempiere.pipo
diff --git a/pipo/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from pipo/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
diff --git a/pipo/.settings/org.eclipse.pde.core.prefs b/org.adempiere.pipo/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from pipo/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.pipo/.settings/org.eclipse.pde.core.prefs
diff --git a/pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
similarity index 66%
rename from pipo/META-INF/MANIFEST.MF
rename to org.adempiere.pipo/META-INF/MANIFEST.MF
index c182e44326..039b94f1b5 100644
--- a/pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -4,9 +4,10 @@ Bundle-Name: PiPo
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework
+Import-Package: org.apache.tools.ant,
+ org.apache.tools.ant.taskdefs,
+ org.osgi.framework
Export-Package: org.adempiere.pipo.srv,
org.adempiere.pipo2,
org.adempiere.pipo2.exception
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.tools;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
diff --git a/pipo/build.properties b/org.adempiere.pipo/build.properties
similarity index 100%
rename from pipo/build.properties
rename to org.adempiere.pipo/build.properties
diff --git a/pipo/plugin.xml b/org.adempiere.pipo/plugin.xml
similarity index 100%
rename from pipo/plugin.xml
rename to org.adempiere.pipo/plugin.xml
diff --git a/pipo/schema/org.adempiere.pipo.Handlers.exsd b/org.adempiere.pipo/schema/org.adempiere.pipo.Handlers.exsd
similarity index 100%
rename from pipo/schema/org.adempiere.pipo.Handlers.exsd
rename to org.adempiere.pipo/schema/org.adempiere.pipo.Handlers.exsd
diff --git a/pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java b/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
rename to org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
diff --git a/pipo/src/org/adempiere/pipo2/AbstractElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
diff --git a/pipo/src/org/adempiere/pipo2/Element.java b/org.adempiere.pipo/src/org/adempiere/pipo2/Element.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/Element.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/Element.java
diff --git a/pipo/src/org/adempiere/pipo2/ElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/ElementHandler.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/ElementHandler.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/ElementHandler.java
diff --git a/pipo/src/org/adempiere/pipo2/IDFinder.java b/org.adempiere.pipo/src/org/adempiere/pipo2/IDFinder.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/IDFinder.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/IDFinder.java
diff --git a/pipo/src/org/adempiere/pipo2/IHandlerRegistry.java b/org.adempiere.pipo/src/org/adempiere/pipo2/IHandlerRegistry.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/IHandlerRegistry.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/IHandlerRegistry.java
diff --git a/pipo/src/org/adempiere/pipo2/OSGiHandlerRegistry.java b/org.adempiere.pipo/src/org/adempiere/pipo2/OSGiHandlerRegistry.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/OSGiHandlerRegistry.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/OSGiHandlerRegistry.java
diff --git a/pipo/src/org/adempiere/pipo2/PackIn.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackIn.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/PackIn.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/PackIn.java
diff --git a/pipo/src/org/adempiere/pipo2/PackInHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/PackInHandler.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
diff --git a/pipo/src/org/adempiere/pipo2/PackOut.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/PackOut.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java
diff --git a/pipo/src/org/adempiere/pipo2/PackRoll.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackRoll.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/PackRoll.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/PackRoll.java
diff --git a/pipo/src/org/adempiere/pipo2/PoExporter.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/PoExporter.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java
diff --git a/pipo/src/org/adempiere/pipo2/PoFiller.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/PoFiller.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
diff --git a/pipo/src/org/adempiere/pipo2/ReferenceUtils.java b/org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/ReferenceUtils.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java
diff --git a/pipo/src/org/adempiere/pipo2/Zipper.java b/org.adempiere.pipo/src/org/adempiere/pipo2/Zipper.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/Zipper.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/Zipper.java
diff --git a/pipo/src/org/adempiere/pipo2/exception/DatabaseAccessException.java b/org.adempiere.pipo/src/org/adempiere/pipo2/exception/DatabaseAccessException.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/exception/DatabaseAccessException.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/exception/DatabaseAccessException.java
diff --git a/pipo/src/org/adempiere/pipo2/exception/POSaveFailedException.java b/org.adempiere.pipo/src/org/adempiere/pipo2/exception/POSaveFailedException.java
similarity index 100%
rename from pipo/src/org/adempiere/pipo2/exception/POSaveFailedException.java
rename to org.adempiere.pipo/src/org/adempiere/pipo2/exception/POSaveFailedException.java
diff --git a/oracleProvider/.classpath b/org.adempiere.plugin.utils/.classpath
similarity index 85%
rename from oracleProvider/.classpath
rename to org.adempiere.plugin.utils/.classpath
index 6c75e8d041..ad32c83a78 100644
--- a/oracleProvider/.classpath
+++ b/org.adempiere.plugin.utils/.classpath
@@ -1,6 +1,5 @@
-
diff --git a/org.adempiere.plugin.utils/.project b/org.adempiere.plugin.utils/.project
new file mode 100644
index 0000000000..6b1caf79b4
--- /dev/null
+++ b/org.adempiere.plugin.utils/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.plugin.utils
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/plugins/pluginUtils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/pluginUtils/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/pluginUtils/.settings/org.eclipse.pde.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from plugins/pluginUtils/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.plugin.utils/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/pluginUtils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
similarity index 78%
rename from plugins/pluginUtils/META-INF/MANIFEST.MF
rename to org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index b2e9d65818..b8e6093783 100644
--- a/plugins/pluginUtils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: PluginUtils
-Bundle-SymbolicName: org.adempiere.pluginUtils
+Bundle-Name: Plugin Utils
+Bundle-SymbolicName: org.adempiere.plugin.utils
Bundle-Version: 0.0.0.1
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.adempiere.base,
diff --git a/org.adempiere.plugin.utils/build.properties b/org.adempiere.plugin.utils/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/org.adempiere.plugin.utils/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/plugins/pluginUtils/src/org/adempiere/plugin/utils/AdempiereActivator.java b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java
similarity index 100%
rename from plugins/pluginUtils/src/org/adempiere/plugin/utils/AdempiereActivator.java
rename to org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java
diff --git a/org.adempiere.replication-feature/.project b/org.adempiere.replication-feature/.project
new file mode 100644
index 0000000000..1ab582a4b0
--- /dev/null
+++ b/org.adempiere.replication-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.replication-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.replication-feature/build.properties b/org.adempiere.replication-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.replication-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
new file mode 100644
index 0000000000..7a3860a117
--- /dev/null
+++ b/org.adempiere.replication-feature/feature.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.replication.server-feature/.project b/org.adempiere.replication.server-feature/.project
new file mode 100644
index 0000000000..7f06806662
--- /dev/null
+++ b/org.adempiere.replication.server-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.replication.server-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.replication.server-feature/build.properties b/org.adempiere.replication.server-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.replication.server-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
new file mode 100644
index 0000000000..39b5d11d8e
--- /dev/null
+++ b/org.adempiere.replication.server-feature/feature.xml
@@ -0,0 +1,32 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install/.classpath b/org.adempiere.replication.server/.classpath
similarity index 65%
rename from install/.classpath
rename to org.adempiere.replication.server/.classpath
index 9c82aa466f..ad32c83a78 100644
--- a/install/.classpath
+++ b/org.adempiere.replication.server/.classpath
@@ -1,7 +1,7 @@
+
-
-
+
diff --git a/org.adempiere.replication.server/.project b/org.adempiere.replication.server/.project
new file mode 100644
index 0000000000..e12c8f29f1
--- /dev/null
+++ b/org.adempiere.replication.server/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.replication.server
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..6f33eef4d2
--- /dev/null
+++ b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Sep 27 18:13:48 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.replication.server/.settings/org.eclipse.pde.core.prefs b/org.adempiere.replication.server/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..8f0ef36e3c
--- /dev/null
+++ b/org.adempiere.replication.server/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 27 18:13:48 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..0516746e69
--- /dev/null
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Server
+Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.server;bundle-version="1.0.0",
+ org.adempiere.replication;bundle-version="1.0.0",
+ org.adempiere.base;bundle-version="1.0.0"
+Import-Package: javax.jms;version="1.1.0",
+ org.apache.activemq
diff --git a/pipoHandlers/build.properties b/org.adempiere.replication.server/build.properties
similarity index 100%
rename from pipoHandlers/build.properties
rename to org.adempiere.replication.server/build.properties
diff --git a/org.adempiere.replication.server/plugin.xml b/org.adempiere.replication.server/plugin.xml
new file mode 100644
index 0000000000..8164b0a212
--- /dev/null
+++ b/org.adempiere.replication.server/plugin.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/IImportProcessor.java b/org.adempiere.replication.server/src/org/adempiere/server/rpl/IImportProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/adempiere/server/rpl/IImportProcessor.java
rename to org.adempiere.replication.server/src/org/adempiere/server/rpl/IImportProcessor.java
diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/FileImportProcessor.java b/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/FileImportProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/adempiere/server/rpl/imp/FileImportProcessor.java
rename to org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/FileImportProcessor.java
diff --git a/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/ReplicationServerFactory.java b/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/ReplicationServerFactory.java
new file mode 100644
index 0000000000..9a29c4ee09
--- /dev/null
+++ b/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/ReplicationServerFactory.java
@@ -0,0 +1,44 @@
+/**
+ *
+ */
+package org.adempiere.server.rpl.imp;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.adempiere.server.IServerFactory;
+import org.compiere.model.MIMPProcessor;
+import org.compiere.server.AdempiereServer;
+import org.compiere.server.ReplicationProcessor;
+
+/**
+ * @author hengsin
+ *
+ */
+public class ReplicationServerFactory implements IServerFactory {
+
+ /**
+ * default constructor
+ */
+ public ReplicationServerFactory() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.adempiere.server.IServerFactory#create()
+ */
+ @Override
+ public AdempiereServer[] create(Properties ctx) {
+ List list = new ArrayList();
+ MIMPProcessor[] importModels = MIMPProcessor.getActive(ctx);
+ for (int i = 0; i < importModels.length; i++)
+ {
+ MIMPProcessor lp = importModels[i];
+ AdempiereServer server = new ReplicationProcessor(lp);
+ list.add(server);
+ }
+ AdempiereServer[] servers = list.toArray(new AdempiereServer[0]);
+ return servers;
+ }
+
+}
diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicImportProcessor.java b/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicImportProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicImportProcessor.java
rename to org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicImportProcessor.java
diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java b/org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicListener.java
similarity index 100%
rename from serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java
rename to org.adempiere.replication.server/src/org/adempiere/server/rpl/imp/TopicListener.java
diff --git a/serverRoot/src/main/server/org/compiere/server/ReplicationProcessor.java b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
similarity index 95%
rename from serverRoot/src/main/server/org/compiere/server/ReplicationProcessor.java
rename to org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
index fed57b86c7..126dd5a7ec 100644
--- a/serverRoot/src/main/server/org/compiere/server/ReplicationProcessor.java
+++ b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
@@ -72,12 +72,12 @@ public class ReplicationProcessor extends AdempiereServer {
m_client = MClient.get(mImportProcessor.getCtx(), mImportProcessor.getAD_Client_ID());
}*/
- protected ReplicationProcessor(AdempiereProcessor model, int initialNap) {
+ public ReplicationProcessor(AdempiereProcessor model, int initialNap) {
super (model, initialNap);
mImportProcessor = (MIMPProcessor)model;
m_client = MClient.get(mImportProcessor.getCtx(), mImportProcessor.getAD_Client_ID());
}
- protected ReplicationProcessor(AdempiereProcessor model) {
+ public ReplicationProcessor(AdempiereProcessor model) {
super (model, 30);
mImportProcessor =(MIMPProcessor)model;
m_client = MClient.get(mImportProcessor.getCtx(), mImportProcessor.getAD_Client_ID());
diff --git a/org.adempiere.replication/.classpath b/org.adempiere.replication/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/org.adempiere.replication/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/org.adempiere.replication/.project b/org.adempiere.replication/.project
new file mode 100644
index 0000000000..57dae8d50e
--- /dev/null
+++ b/org.adempiere.replication/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.replication
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..1b7e71d034
--- /dev/null
+++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Sep 27 13:20:21 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.replication/.settings/org.eclipse.pde.core.prefs b/org.adempiere.replication/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..d0ebcd6c50
--- /dev/null
+++ b/org.adempiere.replication/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 27 13:47:39 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=true
+resolve.requirebundle=false
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..3352fc232b
--- /dev/null
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Replication
+Bundle-SymbolicName: org.adempiere.replication;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Export-Package: org.adempiere.process.rpl,
+ org.adempiere.process.rpl.exp,
+ org.adempiere.process.rpl.imp
+Import-Package: javax.jms;version="1.1.0",
+ org.apache.activemq;version="5.3.0"
+Eclipse-RegisterBuddy: org.adempiere.base
diff --git a/plugins/pluginList/build.properties b/org.adempiere.replication/build.properties
similarity index 100%
rename from plugins/pluginList/build.properties
rename to org.adempiere.replication/build.properties
diff --git a/base/src/org/adempiere/model/ExportModelValidator.java b/org.adempiere.replication/src/org/adempiere/model/ExportModelValidator.java
similarity index 100%
rename from base/src/org/adempiere/model/ExportModelValidator.java
rename to org.adempiere.replication/src/org/adempiere/model/ExportModelValidator.java
diff --git a/base/src/org/adempiere/process/rpl/IExportProcessor.java b/org.adempiere.replication/src/org/adempiere/process/rpl/IExportProcessor.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/IExportProcessor.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/IExportProcessor.java
diff --git a/base/src/org/adempiere/process/rpl/XMLHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/XMLHelper.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/XMLHelper.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/XMLHelper.java
diff --git a/base/src/org/adempiere/process/rpl/exp/ExportHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/exp/ExportHelper.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java
diff --git a/base/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java
diff --git a/base/src/org/adempiere/process/rpl/exp/ModelExporter.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ModelExporter.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/exp/ModelExporter.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/exp/ModelExporter.java
diff --git a/base/src/org/adempiere/process/rpl/exp/MultiplePublisher.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/MultiplePublisher.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/exp/MultiplePublisher.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/exp/MultiplePublisher.java
diff --git a/base/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
diff --git a/base/src/org/adempiere/process/rpl/imp/ImportHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/imp/ImportHelper.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java
diff --git a/base/src/org/adempiere/process/rpl/imp/ModelImporter.java b/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ModelImporter.java
similarity index 100%
rename from base/src/org/adempiere/process/rpl/imp/ModelImporter.java
rename to org.adempiere.replication/src/org/adempiere/process/rpl/imp/ModelImporter.java
diff --git a/org.adempiere.report.jasper-feature/.project b/org.adempiere.report.jasper-feature/.project
new file mode 100644
index 0000000000..e09a690a3a
--- /dev/null
+++ b/org.adempiere.report.jasper-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.report.jasper-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.report.jasper-feature/build.properties b/org.adempiere.report.jasper-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.report.jasper-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
new file mode 100644
index 0000000000..631abe5c8c
--- /dev/null
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JasperReportsTools/.classpath b/org.adempiere.report.jasper.library/.classpath
similarity index 100%
rename from JasperReportsTools/.classpath
rename to org.adempiere.report.jasper.library/.classpath
diff --git a/JasperReportsTools/.project b/org.adempiere.report.jasper.library/.project
similarity index 94%
rename from JasperReportsTools/.project
rename to org.adempiere.report.jasper.library/.project
index 57efd16f3c..f318b073b7 100644
--- a/JasperReportsTools/.project
+++ b/org.adempiere.report.jasper.library/.project
@@ -1,6 +1,6 @@
- JasperReportsTools
+ org.adempiere.report.jasper.library
diff --git a/JasperReportsTools/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from JasperReportsTools/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..d0fc9a58ad
--- /dev/null
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/JasperReportsTools/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from JasperReportsTools/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/JasperReportsTools/JasperReportsTools.jardesc b/org.adempiere.report.jasper.library/JasperReportsTools.jardesc
similarity index 100%
rename from JasperReportsTools/JasperReportsTools.jardesc
rename to org.adempiere.report.jasper.library/JasperReportsTools.jardesc
diff --git a/JasperReportsTools/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
similarity index 98%
rename from JasperReportsTools/META-INF/MANIFEST.MF
rename to org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 50745064c1..2d8e9fc30b 100644
--- a/JasperReportsTools/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: JasperReportsTools
-Bundle-SymbolicName: org.adempiere.JasperReportsTools
+Bundle-Name: JasperReports Dependency
+Bundle-SymbolicName: org.adempiere.report.jasper.library
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: lib/commons-beanutils-1.7.jar,
lib/commons-digester-1.7.jar,
diff --git a/JasperReportsTools/bin/.cvsignore b/org.adempiere.report.jasper.library/bin/.cvsignore
similarity index 100%
rename from JasperReportsTools/bin/.cvsignore
rename to org.adempiere.report.jasper.library/bin/.cvsignore
diff --git a/JasperReportsTools/build.properties b/org.adempiere.report.jasper.library/build.properties
similarity index 100%
rename from JasperReportsTools/build.properties
rename to org.adempiere.report.jasper.library/build.properties
diff --git a/org.adempiere.report.jasper.swing/.classpath b/org.adempiere.report.jasper.swing/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/org.adempiere.report.jasper.swing/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/org.adempiere.report.jasper.swing/.project b/org.adempiere.report.jasper.swing/.project
new file mode 100644
index 0000000000..7879cc72a8
--- /dev/null
+++ b/org.adempiere.report.jasper.swing/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.report.jasper.swing
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/JasperReportsClient/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from JasperReportsClient/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
diff --git a/JasperReportsClient/.settings/org.eclipse.pde.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from JasperReportsClient/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.report.jasper.swing/.settings/org.eclipse.pde.core.prefs
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..b8ed2d3089
--- /dev/null
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JasperReports Swing Client
+Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
+ org.adempiere.ui.swing;bundle-version="1.0.0",
+ org.adempiere.report.jasper;bundle-version="1.0.0",
+ org.adempiere.report.jasper.library;bundle-version="1.0.0"
+Import-Package: org.osgi.framework
diff --git a/postgresqlProvider/build.properties b/org.adempiere.report.jasper.swing/build.properties
similarity index 68%
rename from postgresqlProvider/build.properties
rename to org.adempiere.report.jasper.swing/build.properties
index 7cb5e4b96b..e9863e281e 100644
--- a/postgresqlProvider/build.properties
+++ b/org.adempiere.report.jasper.swing/build.properties
@@ -2,6 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- postgresql.jar,\
plugin.xml
-source.. = src/
diff --git a/JasperReportsClient/build.xml b/org.adempiere.report.jasper.swing/build.xml
similarity index 100%
rename from JasperReportsClient/build.xml
rename to org.adempiere.report.jasper.swing/build.xml
diff --git a/JasperReportsClient/plugin.xml b/org.adempiere.report.jasper.swing/plugin.xml
similarity index 100%
rename from JasperReportsClient/plugin.xml
rename to org.adempiere.report.jasper.swing/plugin.xml
diff --git a/JasperReportsClient/src/org/compiere/report/JasperReportViewer.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java
similarity index 100%
rename from JasperReportsClient/src/org/compiere/report/JasperReportViewer.java
rename to org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java
diff --git a/JasperReportsClient/src/org/compiere/report/JasperReportsClientActivator.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportsClientActivator.java
similarity index 100%
rename from JasperReportsClient/src/org/compiere/report/JasperReportsClientActivator.java
rename to org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportsClientActivator.java
diff --git a/JasperReportsClient/src/org/compiere/report/JasperViewer.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperViewer.java
similarity index 100%
rename from JasperReportsClient/src/org/compiere/report/JasperViewer.java
rename to org.adempiere.report.jasper.swing/src/org/compiere/report/JasperViewer.java
diff --git a/JasperReportsClient/src/org/compiere/report/SwingJRViewerProvider.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
similarity index 100%
rename from JasperReportsClient/src/org/compiere/report/SwingJRViewerProvider.java
rename to org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
diff --git a/JasperReportsWebApp/.classpath b/org.adempiere.report.jasper.webapp/.classpath
similarity index 100%
rename from JasperReportsWebApp/.classpath
rename to org.adempiere.report.jasper.webapp/.classpath
diff --git a/org.adempiere.report.jasper.webapp/.project b/org.adempiere.report.jasper.webapp/.project
new file mode 100644
index 0000000000..ea5954c3a0
--- /dev/null
+++ b/org.adempiere.report.jasper.webapp/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.report.jasper.webapp
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.pde.PluginNature
+
+
diff --git a/JasperReportsWebApp/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from JasperReportsWebApp/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..d004e5f070
--- /dev/null
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jasper Report Web App
+Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Web-ContextPath: webApp
+Bundle-ClassPath: .
+Import-Package: javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
+ javax.servlet.jsp;version="2.1.0",
+ org.apache.commons.codec;version="1.4.0",
+ org.apache.commons.codec.binary;version="1.4.0"
diff --git a/JasperReportsWebApp/RUN_build.bat b/org.adempiere.report.jasper.webapp/RUN_build.bat
similarity index 100%
rename from JasperReportsWebApp/RUN_build.bat
rename to org.adempiere.report.jasper.webapp/RUN_build.bat
diff --git a/JasperReportsWebApp/RUN_build.sh b/org.adempiere.report.jasper.webapp/RUN_build.sh
similarity index 100%
rename from JasperReportsWebApp/RUN_build.sh
rename to org.adempiere.report.jasper.webapp/RUN_build.sh
diff --git a/JasperReportsWebApp/WEB-INF/jboss-web.xml b/org.adempiere.report.jasper.webapp/WEB-INF/jboss-web.xml
similarity index 100%
rename from JasperReportsWebApp/WEB-INF/jboss-web.xml
rename to org.adempiere.report.jasper.webapp/WEB-INF/jboss-web.xml
diff --git a/JasperReportsWebApp/WEB-INF/web.xml b/org.adempiere.report.jasper.webapp/WEB-INF/web.xml
similarity index 100%
rename from JasperReportsWebApp/WEB-INF/web.xml
rename to org.adempiere.report.jasper.webapp/WEB-INF/web.xml
diff --git a/JasperReportsWebApp/build.properties b/org.adempiere.report.jasper.webapp/build.properties
similarity index 100%
rename from JasperReportsWebApp/build.properties
rename to org.adempiere.report.jasper.webapp/build.properties
diff --git a/JasperReportsWebApp/packaging-build.xml b/org.adempiere.report.jasper.webapp/packaging-build.xml
similarity index 100%
rename from JasperReportsWebApp/packaging-build.xml
rename to org.adempiere.report.jasper.webapp/packaging-build.xml
diff --git a/JasperReportsWebApp/src/org/compiere/utils/DigestOfFile.java b/org.adempiere.report.jasper.webapp/src/org/compiere/utils/DigestOfFile.java
similarity index 100%
rename from JasperReportsWebApp/src/org/compiere/utils/DigestOfFile.java
rename to org.adempiere.report.jasper.webapp/src/org/compiere/utils/DigestOfFile.java
diff --git a/JasperReportsWebApp/src/org/compiere/utils/MD5Impl.java b/org.adempiere.report.jasper.webapp/src/org/compiere/utils/MD5Impl.java
similarity index 100%
rename from JasperReportsWebApp/src/org/compiere/utils/MD5Impl.java
rename to org.adempiere.report.jasper.webapp/src/org/compiere/utils/MD5Impl.java
diff --git a/JasperReportsWebApp/src/org/compiere/web/GetMD5FileServlet.java b/org.adempiere.report.jasper.webapp/src/org/compiere/web/GetMD5FileServlet.java
similarity index 100%
rename from JasperReportsWebApp/src/org/compiere/web/GetMD5FileServlet.java
rename to org.adempiere.report.jasper.webapp/src/org/compiere/web/GetMD5FileServlet.java
diff --git a/JasperReportsWebApp/src/org/compiere/web/MD5Filter.java b/org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5Filter.java
similarity index 100%
rename from JasperReportsWebApp/src/org/compiere/web/MD5Filter.java
rename to org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5Filter.java
diff --git a/JasperReportsWebApp/src/org/compiere/web/MD5OutputStream.java b/org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5OutputStream.java
similarity index 100%
rename from JasperReportsWebApp/src/org/compiere/web/MD5OutputStream.java
rename to org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5OutputStream.java
diff --git a/JasperReportsWebApp/src/org/compiere/web/MD5ResponseWrapper.java b/org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5ResponseWrapper.java
similarity index 100%
rename from JasperReportsWebApp/src/org/compiere/web/MD5ResponseWrapper.java
rename to org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5ResponseWrapper.java
diff --git a/JasperReportsWebApp/standalone.jrxml b/org.adempiere.report.jasper.webapp/standalone.jrxml
similarity index 100%
rename from JasperReportsWebApp/standalone.jrxml
rename to org.adempiere.report.jasper.webapp/standalone.jrxml
diff --git a/JasperReports/.classpath b/org.adempiere.report.jasper/.classpath
similarity index 100%
rename from JasperReports/.classpath
rename to org.adempiere.report.jasper/.classpath
diff --git a/JasperReports/.project b/org.adempiere.report.jasper/.project
similarity index 96%
rename from JasperReports/.project
rename to org.adempiere.report.jasper/.project
index 9ccde536cc..49157670a6 100644
--- a/JasperReports/.project
+++ b/org.adempiere.report.jasper/.project
@@ -1,6 +1,6 @@
- JasperReports
+ org.adempiere.report.jasperbase
diff --git a/JasperReports/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from JasperReports/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
diff --git a/base/.settings/org.eclipse.wst.common.component b/org.adempiere.report.jasper/.settings/org.eclipse.wst.common.component
similarity index 76%
rename from base/.settings/org.eclipse.wst.common.component
rename to org.adempiere.report.jasper/.settings/org.eclipse.wst.common.component
index 6091bf6d13..c9e776045f 100644
--- a/base/.settings/org.eclipse.wst.common.component
+++ b/org.adempiere.report.jasper/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,6 @@
-
+
diff --git a/base/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.report.jasper/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from base/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to org.adempiere.report.jasper/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/JasperReports/JasperReports.jardesc b/org.adempiere.report.jasper/JasperReports.jardesc
similarity index 100%
rename from JasperReports/JasperReports.jardesc
rename to org.adempiere.report.jasper/JasperReports.jardesc
diff --git a/JasperReports/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
similarity index 51%
rename from JasperReports/META-INF/MANIFEST.MF
rename to org.adempiere.report.jasper/META-INF/MANIFEST.MF
index a85703028b..719eccade1 100644
--- a/JasperReports/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -1,12 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: JasperReports
-Bundle-SymbolicName: org.adempiere.JasperReports;singleton:=true
+Bundle-Name: JasperReport integration
+Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: JasperReports.jar
Export-Package: org.compiere.report,
org.compiere.utils
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.JasperReportsTools;bundle-version="1.0.0",
- org.adempiere.tools;bundle-version="1.0.0"
+ org.adempiere.report.jasper.library;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.apache.commons.codec;version="1.4.0",
+ org.apache.commons.codec.binary;version="1.4.0"
diff --git a/JasperReports/RUN_build.bat b/org.adempiere.report.jasper/RUN_build.bat
similarity index 100%
rename from JasperReports/RUN_build.bat
rename to org.adempiere.report.jasper/RUN_build.bat
diff --git a/JasperReports/RUN_build.sh b/org.adempiere.report.jasper/RUN_build.sh
similarity index 100%
rename from JasperReports/RUN_build.sh
rename to org.adempiere.report.jasper/RUN_build.sh
diff --git a/JasperReports/build.properties b/org.adempiere.report.jasper/build.properties
similarity index 100%
rename from JasperReports/build.properties
rename to org.adempiere.report.jasper/build.properties
diff --git a/JasperReports/doc/Compiere with JasperReports.doc b/org.adempiere.report.jasper/doc/Compiere with JasperReports.doc
similarity index 100%
rename from JasperReports/doc/Compiere with JasperReports.doc
rename to org.adempiere.report.jasper/doc/Compiere with JasperReports.doc
diff --git a/JasperReports/doc/Compiere_with_JasperReports.pdf b/org.adempiere.report.jasper/doc/Compiere_with_JasperReports.pdf
similarity index 100%
rename from JasperReports/doc/Compiere_with_JasperReports.pdf
rename to org.adempiere.report.jasper/doc/Compiere_with_JasperReports.pdf
diff --git a/JasperReports/doc/allclasses-frame.html b/org.adempiere.report.jasper/doc/allclasses-frame.html
similarity index 100%
rename from JasperReports/doc/allclasses-frame.html
rename to org.adempiere.report.jasper/doc/allclasses-frame.html
diff --git a/JasperReports/doc/allclasses-noframe.html b/org.adempiere.report.jasper/doc/allclasses-noframe.html
similarity index 100%
rename from JasperReports/doc/allclasses-noframe.html
rename to org.adempiere.report.jasper/doc/allclasses-noframe.html
diff --git a/JasperReports/doc/constant-values.html b/org.adempiere.report.jasper/doc/constant-values.html
similarity index 100%
rename from JasperReports/doc/constant-values.html
rename to org.adempiere.report.jasper/doc/constant-values.html
diff --git a/JasperReports/doc/deprecated-list.html b/org.adempiere.report.jasper/doc/deprecated-list.html
similarity index 100%
rename from JasperReports/doc/deprecated-list.html
rename to org.adempiere.report.jasper/doc/deprecated-list.html
diff --git a/JasperReports/doc/help-doc.html b/org.adempiere.report.jasper/doc/help-doc.html
similarity index 100%
rename from JasperReports/doc/help-doc.html
rename to org.adempiere.report.jasper/doc/help-doc.html
diff --git a/JasperReports/doc/index-files/index-1.html b/org.adempiere.report.jasper/doc/index-files/index-1.html
similarity index 100%
rename from JasperReports/doc/index-files/index-1.html
rename to org.adempiere.report.jasper/doc/index-files/index-1.html
diff --git a/JasperReports/doc/index-files/index-10.html b/org.adempiere.report.jasper/doc/index-files/index-10.html
similarity index 100%
rename from JasperReports/doc/index-files/index-10.html
rename to org.adempiere.report.jasper/doc/index-files/index-10.html
diff --git a/JasperReports/doc/index-files/index-11.html b/org.adempiere.report.jasper/doc/index-files/index-11.html
similarity index 100%
rename from JasperReports/doc/index-files/index-11.html
rename to org.adempiere.report.jasper/doc/index-files/index-11.html
diff --git a/JasperReports/doc/index-files/index-12.html b/org.adempiere.report.jasper/doc/index-files/index-12.html
similarity index 100%
rename from JasperReports/doc/index-files/index-12.html
rename to org.adempiere.report.jasper/doc/index-files/index-12.html
diff --git a/JasperReports/doc/index-files/index-13.html b/org.adempiere.report.jasper/doc/index-files/index-13.html
similarity index 100%
rename from JasperReports/doc/index-files/index-13.html
rename to org.adempiere.report.jasper/doc/index-files/index-13.html
diff --git a/JasperReports/doc/index-files/index-14.html b/org.adempiere.report.jasper/doc/index-files/index-14.html
similarity index 100%
rename from JasperReports/doc/index-files/index-14.html
rename to org.adempiere.report.jasper/doc/index-files/index-14.html
diff --git a/JasperReports/doc/index-files/index-15.html b/org.adempiere.report.jasper/doc/index-files/index-15.html
similarity index 100%
rename from JasperReports/doc/index-files/index-15.html
rename to org.adempiere.report.jasper/doc/index-files/index-15.html
diff --git a/JasperReports/doc/index-files/index-16.html b/org.adempiere.report.jasper/doc/index-files/index-16.html
similarity index 100%
rename from JasperReports/doc/index-files/index-16.html
rename to org.adempiere.report.jasper/doc/index-files/index-16.html
diff --git a/JasperReports/doc/index-files/index-17.html b/org.adempiere.report.jasper/doc/index-files/index-17.html
similarity index 100%
rename from JasperReports/doc/index-files/index-17.html
rename to org.adempiere.report.jasper/doc/index-files/index-17.html
diff --git a/JasperReports/doc/index-files/index-2.html b/org.adempiere.report.jasper/doc/index-files/index-2.html
similarity index 100%
rename from JasperReports/doc/index-files/index-2.html
rename to org.adempiere.report.jasper/doc/index-files/index-2.html
diff --git a/JasperReports/doc/index-files/index-3.html b/org.adempiere.report.jasper/doc/index-files/index-3.html
similarity index 100%
rename from JasperReports/doc/index-files/index-3.html
rename to org.adempiere.report.jasper/doc/index-files/index-3.html
diff --git a/JasperReports/doc/index-files/index-4.html b/org.adempiere.report.jasper/doc/index-files/index-4.html
similarity index 100%
rename from JasperReports/doc/index-files/index-4.html
rename to org.adempiere.report.jasper/doc/index-files/index-4.html
diff --git a/JasperReports/doc/index-files/index-5.html b/org.adempiere.report.jasper/doc/index-files/index-5.html
similarity index 100%
rename from JasperReports/doc/index-files/index-5.html
rename to org.adempiere.report.jasper/doc/index-files/index-5.html
diff --git a/JasperReports/doc/index-files/index-6.html b/org.adempiere.report.jasper/doc/index-files/index-6.html
similarity index 100%
rename from JasperReports/doc/index-files/index-6.html
rename to org.adempiere.report.jasper/doc/index-files/index-6.html
diff --git a/JasperReports/doc/index-files/index-7.html b/org.adempiere.report.jasper/doc/index-files/index-7.html
similarity index 100%
rename from JasperReports/doc/index-files/index-7.html
rename to org.adempiere.report.jasper/doc/index-files/index-7.html
diff --git a/JasperReports/doc/index-files/index-8.html b/org.adempiere.report.jasper/doc/index-files/index-8.html
similarity index 100%
rename from JasperReports/doc/index-files/index-8.html
rename to org.adempiere.report.jasper/doc/index-files/index-8.html
diff --git a/JasperReports/doc/index-files/index-9.html b/org.adempiere.report.jasper/doc/index-files/index-9.html
similarity index 100%
rename from JasperReports/doc/index-files/index-9.html
rename to org.adempiere.report.jasper/doc/index-files/index-9.html
diff --git a/JasperReports/doc/index.html b/org.adempiere.report.jasper/doc/index.html
similarity index 100%
rename from JasperReports/doc/index.html
rename to org.adempiere.report.jasper/doc/index.html
diff --git a/JasperReports/doc/org/compiere/ejb/MD5Bean.html b/org.adempiere.report.jasper/doc/org/compiere/ejb/MD5Bean.html
similarity index 100%
rename from JasperReports/doc/org/compiere/ejb/MD5Bean.html
rename to org.adempiere.report.jasper/doc/org/compiere/ejb/MD5Bean.html
diff --git a/JasperReports/doc/org/compiere/ejb/class-use/MD5Bean.html b/org.adempiere.report.jasper/doc/org/compiere/ejb/class-use/MD5Bean.html
similarity index 100%
rename from JasperReports/doc/org/compiere/ejb/class-use/MD5Bean.html
rename to org.adempiere.report.jasper/doc/org/compiere/ejb/class-use/MD5Bean.html
diff --git a/JasperReports/doc/org/compiere/ejb/package-frame.html b/org.adempiere.report.jasper/doc/org/compiere/ejb/package-frame.html
similarity index 100%
rename from JasperReports/doc/org/compiere/ejb/package-frame.html
rename to org.adempiere.report.jasper/doc/org/compiere/ejb/package-frame.html
diff --git a/JasperReports/doc/org/compiere/ejb/package-summary.html b/org.adempiere.report.jasper/doc/org/compiere/ejb/package-summary.html
similarity index 100%
rename from JasperReports/doc/org/compiere/ejb/package-summary.html
rename to org.adempiere.report.jasper/doc/org/compiere/ejb/package-summary.html
diff --git a/JasperReports/doc/org/compiere/ejb/package-tree.html b/org.adempiere.report.jasper/doc/org/compiere/ejb/package-tree.html
similarity index 100%
rename from JasperReports/doc/org/compiere/ejb/package-tree.html
rename to org.adempiere.report.jasper/doc/org/compiere/ejb/package-tree.html
diff --git a/JasperReports/doc/org/compiere/ejb/package-use.html b/org.adempiere.report.jasper/doc/org/compiere/ejb/package-use.html
similarity index 100%
rename from JasperReports/doc/org/compiere/ejb/package-use.html
rename to org.adempiere.report.jasper/doc/org/compiere/ejb/package-use.html
diff --git a/JasperReports/doc/org/compiere/interfaces/MD5.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/MD5.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/MD5.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/MD5.html
diff --git a/JasperReports/doc/org/compiere/interfaces/MD5Home.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/MD5Home.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/MD5Home.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/MD5Home.html
diff --git a/JasperReports/doc/org/compiere/interfaces/class-use/MD5.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/class-use/MD5.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/class-use/MD5.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/class-use/MD5.html
diff --git a/JasperReports/doc/org/compiere/interfaces/class-use/MD5Home.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/class-use/MD5Home.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/class-use/MD5Home.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/class-use/MD5Home.html
diff --git a/JasperReports/doc/org/compiere/interfaces/package-frame.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/package-frame.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/package-frame.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/package-frame.html
diff --git a/JasperReports/doc/org/compiere/interfaces/package-summary.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/package-summary.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/package-summary.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/package-summary.html
diff --git a/JasperReports/doc/org/compiere/interfaces/package-tree.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/package-tree.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/package-tree.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/package-tree.html
diff --git a/JasperReports/doc/org/compiere/interfaces/package-use.html b/org.adempiere.report.jasper/doc/org/compiere/interfaces/package-use.html
similarity index 100%
rename from JasperReports/doc/org/compiere/interfaces/package-use.html
rename to org.adempiere.report.jasper/doc/org/compiere/interfaces/package-use.html
diff --git a/JasperReports/doc/org/compiere/report/Barbecue.html b/org.adempiere.report.jasper/doc/org/compiere/report/Barbecue.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/Barbecue.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/Barbecue.html
diff --git a/JasperReports/doc/org/compiere/report/ExportListener.html b/org.adempiere.report.jasper/doc/org/compiere/report/ExportListener.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/ExportListener.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/ExportListener.html
diff --git a/JasperReports/doc/org/compiere/report/JasperReportViewer.html b/org.adempiere.report.jasper/doc/org/compiere/report/JasperReportViewer.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/JasperReportViewer.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/JasperReportViewer.html
diff --git a/JasperReports/doc/org/compiere/report/JasperViewer.html b/org.adempiere.report.jasper/doc/org/compiere/report/JasperViewer.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/JasperViewer.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/JasperViewer.html
diff --git a/JasperReports/doc/org/compiere/report/ReportStarter.FileFilter.html b/org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.FileFilter.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/ReportStarter.FileFilter.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.FileFilter.html
diff --git a/JasperReports/doc/org/compiere/report/ReportStarter.JasperData.html b/org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.JasperData.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/ReportStarter.JasperData.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.JasperData.html
diff --git a/JasperReports/doc/org/compiere/report/ReportStarter.ReportData.html b/org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.ReportData.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/ReportStarter.ReportData.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.ReportData.html
diff --git a/JasperReports/doc/org/compiere/report/ReportStarter.html b/org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/ReportStarter.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/ReportStarter.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/Barbecue.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/Barbecue.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/Barbecue.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/Barbecue.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/ExportListener.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/ExportListener.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/ExportListener.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/ExportListener.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/JasperReportViewer.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/JasperReportViewer.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/JasperReportViewer.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/JasperReportViewer.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/JasperViewer.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/JasperViewer.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/JasperViewer.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/JasperViewer.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/ReportStarter.FileFilter.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.FileFilter.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/ReportStarter.FileFilter.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.FileFilter.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/ReportStarter.JasperData.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.JasperData.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/ReportStarter.JasperData.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.JasperData.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/ReportStarter.ReportData.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.ReportData.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/ReportStarter.ReportData.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.ReportData.html
diff --git a/JasperReports/doc/org/compiere/report/class-use/ReportStarter.html b/org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/class-use/ReportStarter.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/class-use/ReportStarter.html
diff --git a/JasperReports/doc/org/compiere/report/package-frame.html b/org.adempiere.report.jasper/doc/org/compiere/report/package-frame.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/package-frame.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/package-frame.html
diff --git a/JasperReports/doc/org/compiere/report/package-summary.html b/org.adempiere.report.jasper/doc/org/compiere/report/package-summary.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/package-summary.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/package-summary.html
diff --git a/JasperReports/doc/org/compiere/report/package-tree.html b/org.adempiere.report.jasper/doc/org/compiere/report/package-tree.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/package-tree.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/package-tree.html
diff --git a/JasperReports/doc/org/compiere/report/package-use.html b/org.adempiere.report.jasper/doc/org/compiere/report/package-use.html
similarity index 100%
rename from JasperReports/doc/org/compiere/report/package-use.html
rename to org.adempiere.report.jasper/doc/org/compiere/report/package-use.html
diff --git a/JasperReports/doc/org/compiere/utils/DBUtils.html b/org.adempiere.report.jasper/doc/org/compiere/utils/DBUtils.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/DBUtils.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/DBUtils.html
diff --git a/JasperReports/doc/org/compiere/utils/DigestOfFile.html b/org.adempiere.report.jasper/doc/org/compiere/utils/DigestOfFile.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/DigestOfFile.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/DigestOfFile.html
diff --git a/JasperReports/doc/org/compiere/utils/MD5EjbTest.html b/org.adempiere.report.jasper/doc/org/compiere/utils/MD5EjbTest.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/MD5EjbTest.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/MD5EjbTest.html
diff --git a/JasperReports/doc/org/compiere/utils/class-use/DBUtils.html b/org.adempiere.report.jasper/doc/org/compiere/utils/class-use/DBUtils.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/class-use/DBUtils.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/class-use/DBUtils.html
diff --git a/JasperReports/doc/org/compiere/utils/class-use/DigestOfFile.html b/org.adempiere.report.jasper/doc/org/compiere/utils/class-use/DigestOfFile.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/class-use/DigestOfFile.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/class-use/DigestOfFile.html
diff --git a/JasperReports/doc/org/compiere/utils/class-use/MD5EjbTest.html b/org.adempiere.report.jasper/doc/org/compiere/utils/class-use/MD5EjbTest.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/class-use/MD5EjbTest.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/class-use/MD5EjbTest.html
diff --git a/JasperReports/doc/org/compiere/utils/package-frame.html b/org.adempiere.report.jasper/doc/org/compiere/utils/package-frame.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/package-frame.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/package-frame.html
diff --git a/JasperReports/doc/org/compiere/utils/package-summary.html b/org.adempiere.report.jasper/doc/org/compiere/utils/package-summary.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/package-summary.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/package-summary.html
diff --git a/JasperReports/doc/org/compiere/utils/package-tree.html b/org.adempiere.report.jasper/doc/org/compiere/utils/package-tree.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/package-tree.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/package-tree.html
diff --git a/JasperReports/doc/org/compiere/utils/package-use.html b/org.adempiere.report.jasper/doc/org/compiere/utils/package-use.html
similarity index 100%
rename from JasperReports/doc/org/compiere/utils/package-use.html
rename to org.adempiere.report.jasper/doc/org/compiere/utils/package-use.html
diff --git a/JasperReports/doc/org/compiere/web/GetMD5FileServlet.html b/org.adempiere.report.jasper/doc/org/compiere/web/GetMD5FileServlet.html
similarity index 100%
rename from JasperReports/doc/org/compiere/web/GetMD5FileServlet.html
rename to org.adempiere.report.jasper/doc/org/compiere/web/GetMD5FileServlet.html
diff --git a/JasperReports/doc/org/compiere/web/class-use/GetMD5FileServlet.html b/org.adempiere.report.jasper/doc/org/compiere/web/class-use/GetMD5FileServlet.html
similarity index 100%
rename from JasperReports/doc/org/compiere/web/class-use/GetMD5FileServlet.html
rename to org.adempiere.report.jasper/doc/org/compiere/web/class-use/GetMD5FileServlet.html
diff --git a/JasperReports/doc/org/compiere/web/package-frame.html b/org.adempiere.report.jasper/doc/org/compiere/web/package-frame.html
similarity index 100%
rename from JasperReports/doc/org/compiere/web/package-frame.html
rename to org.adempiere.report.jasper/doc/org/compiere/web/package-frame.html
diff --git a/JasperReports/doc/org/compiere/web/package-summary.html b/org.adempiere.report.jasper/doc/org/compiere/web/package-summary.html
similarity index 100%
rename from JasperReports/doc/org/compiere/web/package-summary.html
rename to org.adempiere.report.jasper/doc/org/compiere/web/package-summary.html
diff --git a/JasperReports/doc/org/compiere/web/package-tree.html b/org.adempiere.report.jasper/doc/org/compiere/web/package-tree.html
similarity index 100%
rename from JasperReports/doc/org/compiere/web/package-tree.html
rename to org.adempiere.report.jasper/doc/org/compiere/web/package-tree.html
diff --git a/JasperReports/doc/org/compiere/web/package-use.html b/org.adempiere.report.jasper/doc/org/compiere/web/package-use.html
similarity index 100%
rename from JasperReports/doc/org/compiere/web/package-use.html
rename to org.adempiere.report.jasper/doc/org/compiere/web/package-use.html
diff --git a/JasperReports/doc/overview-frame.html b/org.adempiere.report.jasper/doc/overview-frame.html
similarity index 100%
rename from JasperReports/doc/overview-frame.html
rename to org.adempiere.report.jasper/doc/overview-frame.html
diff --git a/JasperReports/doc/overview-summary.html b/org.adempiere.report.jasper/doc/overview-summary.html
similarity index 100%
rename from JasperReports/doc/overview-summary.html
rename to org.adempiere.report.jasper/doc/overview-summary.html
diff --git a/JasperReports/doc/overview-tree.html b/org.adempiere.report.jasper/doc/overview-tree.html
similarity index 100%
rename from JasperReports/doc/overview-tree.html
rename to org.adempiere.report.jasper/doc/overview-tree.html
diff --git a/JasperReports/doc/package-list b/org.adempiere.report.jasper/doc/package-list
similarity index 100%
rename from JasperReports/doc/package-list
rename to org.adempiere.report.jasper/doc/package-list
diff --git a/JasperReports/doc/packages.html b/org.adempiere.report.jasper/doc/packages.html
similarity index 100%
rename from JasperReports/doc/packages.html
rename to org.adempiere.report.jasper/doc/packages.html
diff --git a/JasperReports/doc/resources/inherit.gif b/org.adempiere.report.jasper/doc/resources/inherit.gif
similarity index 100%
rename from JasperReports/doc/resources/inherit.gif
rename to org.adempiere.report.jasper/doc/resources/inherit.gif
diff --git a/JasperReports/doc/serialized-form.html b/org.adempiere.report.jasper/doc/serialized-form.html
similarity index 100%
rename from JasperReports/doc/serialized-form.html
rename to org.adempiere.report.jasper/doc/serialized-form.html
diff --git a/JasperReports/doc/stylesheet.css b/org.adempiere.report.jasper/doc/stylesheet.css
similarity index 100%
rename from JasperReports/doc/stylesheet.css
rename to org.adempiere.report.jasper/doc/stylesheet.css
diff --git a/JasperReports/plugin.xml b/org.adempiere.report.jasper/plugin.xml
similarity index 100%
rename from JasperReports/plugin.xml
rename to org.adempiere.report.jasper/plugin.xml
diff --git a/JasperReports/schema/org.compiere.report.JRViewerProvider.exsd b/org.adempiere.report.jasper/schema/org.compiere.report.JRViewerProvider.exsd
similarity index 100%
rename from JasperReports/schema/org.compiere.report.JRViewerProvider.exsd
rename to org.adempiere.report.jasper/schema/org.compiere.report.JRViewerProvider.exsd
diff --git a/JasperReports/scripts/Makefile b/org.adempiere.report.jasper/scripts/Makefile
similarity index 100%
rename from JasperReports/scripts/Makefile
rename to org.adempiere.report.jasper/scripts/Makefile
diff --git a/JasperReports/scripts/Version.java b/org.adempiere.report.jasper/scripts/Version.java
similarity index 100%
rename from JasperReports/scripts/Version.java
rename to org.adempiere.report.jasper/scripts/Version.java
diff --git a/JasperReports/src/org/compiere/report/Barbecue.java b/org.adempiere.report.jasper/src/org/compiere/report/Barbecue.java
similarity index 100%
rename from JasperReports/src/org/compiere/report/Barbecue.java
rename to org.adempiere.report.jasper/src/org/compiere/report/Barbecue.java
diff --git a/JasperReports/src/org/compiere/report/JRViewerProvider.java b/org.adempiere.report.jasper/src/org/compiere/report/JRViewerProvider.java
similarity index 100%
rename from JasperReports/src/org/compiere/report/JRViewerProvider.java
rename to org.adempiere.report.jasper/src/org/compiere/report/JRViewerProvider.java
diff --git a/JasperReports/src/org/compiere/report/ReportStarter.java b/org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
similarity index 100%
rename from JasperReports/src/org/compiere/report/ReportStarter.java
rename to org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
diff --git a/JasperReports/src/org/compiere/utils/DigestOfFile.java b/org.adempiere.report.jasper/src/org/compiere/utils/DigestOfFile.java
similarity index 100%
rename from JasperReports/src/org/compiere/utils/DigestOfFile.java
rename to org.adempiere.report.jasper/src/org/compiere/utils/DigestOfFile.java
diff --git a/org.adempiere.server-feature/.project b/org.adempiere.server-feature/.project
new file mode 100644
index 0000000000..66e5ec7451
--- /dev/null
+++ b/org.adempiere.server-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.server-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.server-feature/build.properties b/org.adempiere.server-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.server-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
new file mode 100644
index 0000000000..12ae593d19
--- /dev/null
+++ b/org.adempiere.server-feature/feature.xml
@@ -0,0 +1,283 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
new file mode 100644
index 0000000000..cb86ebae4e
--- /dev/null
+++ b/org.adempiere.server-feature/server.product
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+ -console
+ -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -DPropertyFile=/media/W/Workspace/hengsin/trunk-local.properties
+ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/serverRoot/.classpath b/org.adempiere.server/.classpath
similarity index 100%
rename from serverRoot/.classpath
rename to org.adempiere.server/.classpath
diff --git a/serverRoot/.project b/org.adempiere.server/.project
similarity index 92%
rename from serverRoot/.project
rename to org.adempiere.server/.project
index 18191035d0..d3da222bb3 100644
--- a/serverRoot/.project
+++ b/org.adempiere.server/.project
@@ -1,33 +1,33 @@
-
-
- serverRoot
-
-
- base
- dbPort
- looks
- server
- tools
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.PluginNature
-
-
+
+
+ org.adempiere.server
+
+
+ base
+ dbPort
+ looks
+ server
+ tools
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.pde.PluginNature
+
+
diff --git a/serverRoot/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from serverRoot/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
diff --git a/client/src/org/compiere/images/AdemPiere150x50.gif b/org.adempiere.server/AdemPiere150x50.gif
similarity index 100%
rename from client/src/org/compiere/images/AdemPiere150x50.gif
rename to org.adempiere.server/AdemPiere150x50.gif
diff --git a/client/src/org/compiere/images/Adempiere120x60.gif b/org.adempiere.server/Adempiere120x60.gif
similarity index 100%
rename from client/src/org/compiere/images/Adempiere120x60.gif
rename to org.adempiere.server/Adempiere120x60.gif
diff --git a/serverRoot/Background.gif b/org.adempiere.server/Background.gif
similarity index 100%
rename from serverRoot/Background.gif
rename to org.adempiere.server/Background.gif
diff --git a/client/src/org/compiere/images/C32.gif b/org.adempiere.server/C32.gif
similarity index 100%
rename from client/src/org/compiere/images/C32.gif
rename to org.adempiere.server/C32.gif
diff --git a/serverRoot/Logo.gif b/org.adempiere.server/Logo.gif
similarity index 100%
rename from serverRoot/Logo.gif
rename to org.adempiere.server/Logo.gif
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..64026c5e60
--- /dev/null
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.adempiere.server
+Bundle-SymbolicName: org.adempiere.server;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
+ org.eclipse.equinox.app;bundle-version="1.3.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Web-ContextPath: admin
+Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
+ WEB-INF/lib/jnlp-servlet.jar,
+ .
+Import-Package: javax.jms;version="1.1.0",
+ javax.mail;version="1.4.1",
+ javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
+ org.apache.activemq;version="5.3.0",
+ org.apache.commons.codec;version="1.4.0",
+ org.apache.commons.codec.binary;version="1.4.0",
+ org.apache.ecs,
+ org.apache.ecs.xhtml,
+ org.restlet,
+ org.restlet.data,
+ org.restlet.ext.servlet,
+ org.restlet.representation,
+ org.restlet.resource,
+ org.restlet.routing,
+ org.restlet.security,
+ org.restlet.service,
+ org.restlet.util
+Export-Package: org.adempiere.server,
+ org.compiere.server
diff --git a/serverRoot/WEB-INF/web.xml b/org.adempiere.server/WEB-INF/web.xml
similarity index 100%
rename from serverRoot/WEB-INF/web.xml
rename to org.adempiere.server/WEB-INF/web.xml
diff --git a/serverRoot/adempiere.html b/org.adempiere.server/adempiere.html
similarity index 100%
rename from serverRoot/adempiere.html
rename to org.adempiere.server/adempiere.html
diff --git a/serverRoot/adempiere.jnlp b/org.adempiere.server/adempiere.jnlp
similarity index 100%
rename from serverRoot/adempiere.jnlp
rename to org.adempiere.server/adempiere.jnlp
diff --git a/serverRoot/adempiere_logo.gif b/org.adempiere.server/adempiere_logo.gif
similarity index 100%
rename from serverRoot/adempiere_logo.gif
rename to org.adempiere.server/adempiere_logo.gif
diff --git a/serverRoot/adempiere_logo.png b/org.adempiere.server/adempiere_logo.png
similarity index 100%
rename from serverRoot/adempiere_logo.png
rename to org.adempiere.server/adempiere_logo.png
diff --git a/serverRoot/adempiere_logo2.gif b/org.adempiere.server/adempiere_logo2.gif
similarity index 100%
rename from serverRoot/adempiere_logo2.gif
rename to org.adempiere.server/adempiere_logo2.gif
diff --git a/serverRoot/adempiere_logo3.png b/org.adempiere.server/adempiere_logo3.png
similarity index 100%
rename from serverRoot/adempiere_logo3.png
rename to org.adempiere.server/adempiere_logo3.png
diff --git a/serverRoot/applet.html b/org.adempiere.server/applet.html
similarity index 100%
rename from serverRoot/applet.html
rename to org.adempiere.server/applet.html
diff --git a/serverRoot/build.properties b/org.adempiere.server/build.properties
similarity index 95%
rename from serverRoot/build.properties
rename to org.adempiere.server/build.properties
index 714fa2790d..360c1b2a6c 100644
--- a/serverRoot/build.properties
+++ b/org.adempiere.server/build.properties
@@ -25,7 +25,8 @@ bin.includes = META-INF/,\
standard.css,\
webstart.jpg,\
webstart_s.jpg,\
- zip.gif
+ zip.gif,\
+ plugin.xml
bin.excludes = src/**,\
.settings/**,\
.classpath,\
diff --git a/serverRoot/error.html b/org.adempiere.server/error.html
similarity index 100%
rename from serverRoot/error.html
rename to org.adempiere.server/error.html
diff --git a/serverRoot/favicon.ico b/org.adempiere.server/favicon.ico
similarity index 100%
rename from serverRoot/favicon.ico
rename to org.adempiere.server/favicon.ico
diff --git a/serverRoot/footer_bar.gif b/org.adempiere.server/footer_bar.gif
similarity index 100%
rename from serverRoot/footer_bar.gif
rename to org.adempiere.server/footer_bar.gif
diff --git a/serverRoot/header_banner.jpg b/org.adempiere.server/header_banner.jpg
similarity index 100%
rename from serverRoot/header_banner.jpg
rename to org.adempiere.server/header_banner.jpg
diff --git a/serverRoot/header_banner.png b/org.adempiere.server/header_banner.png
similarity index 100%
rename from serverRoot/header_banner.png
rename to org.adempiere.server/header_banner.png
diff --git a/serverRoot/header_bar.jpg b/org.adempiere.server/header_bar.jpg
similarity index 100%
rename from serverRoot/header_bar.jpg
rename to org.adempiere.server/header_bar.jpg
diff --git a/serverRoot/index.html b/org.adempiere.server/index.html
similarity index 100%
rename from serverRoot/index.html
rename to org.adempiere.server/index.html
diff --git a/org.adempiere.server/plugin.xml b/org.adempiere.server/plugin.xml
new file mode 100644
index 0000000000..c64a74dbd7
--- /dev/null
+++ b/org.adempiere.server/plugin.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/serverRoot/robots.txt b/org.adempiere.server/robots.txt
similarity index 100%
rename from serverRoot/robots.txt
rename to org.adempiere.server/robots.txt
diff --git a/org.adempiere.server/schema/org.adempiere.server.IServerFactory.exsd b/org.adempiere.server/schema/org.adempiere.server.IServerFactory.exsd
new file mode 100644
index 0000000000..7efcd2bfb4
--- /dev/null
+++ b/org.adempiere.server/schema/org.adempiere.server.IServerFactory.exsd
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+ [Enter description of this extension point.]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [Enter the first release in which this extension point appears.]
+
+
+
+
+
+
+
+
+ [Enter extension point usage example here.]
+
+
+
+
+
+
+
+
+ [Enter API information here.]
+
+
+
+
+
+
+
+
+ [Enter information about supplied implementation of this extension point.]
+
+
+
+
+
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
new file mode 100644
index 0000000000..dcb707998e
--- /dev/null
+++ b/org.adempiere.server/src/main/server/org/adempiere/server/Application.java
@@ -0,0 +1,47 @@
+/**
+ *
+ */
+package org.adempiere.server;
+
+import java.util.Properties;
+
+import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.util.ServerContext;
+import org.compiere.Adempiere;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+
+/**
+ * @author hengsin
+ *
+ */
+public class Application implements IApplication {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
+ */
+ @Override
+ public Object start(IApplicationContext context) throws Exception {
+ /** Initialise context for the current thread*/
+ Properties serverContext = new Properties();
+ ServerContext.setCurrentInstance(serverContext);
+ if (!Adempiere.isStarted())
+ {
+ boolean started = Adempiere.startup(false);
+ if(!started)
+ {
+ throw new AdempiereException("Could not start ADempiere");
+ }
+ }
+
+ return IApplication.EXIT_OK;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.equinox.app.IApplication#stop()
+ */
+ @Override
+ public void stop() {
+ }
+
+}
diff --git a/org.adempiere.server/src/main/server/org/adempiere/server/IServerFactory.java b/org.adempiere.server/src/main/server/org/adempiere/server/IServerFactory.java
new file mode 100644
index 0000000000..3cd08db39e
--- /dev/null
+++ b/org.adempiere.server/src/main/server/org/adempiere/server/IServerFactory.java
@@ -0,0 +1,9 @@
+package org.adempiere.server;
+
+import java.util.Properties;
+
+import org.compiere.server.AdempiereServer;
+
+public interface IServerFactory {
+ public AdempiereServer[] create (Properties ctx);
+}
diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapConnectionHandler.java b/org.adempiere.server/src/main/server/org/compiere/ldap/LdapConnectionHandler.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/ldap/LdapConnectionHandler.java
rename to org.adempiere.server/src/main/server/org/compiere/ldap/LdapConnectionHandler.java
diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapMessage.java b/org.adempiere.server/src/main/server/org/compiere/ldap/LdapMessage.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/ldap/LdapMessage.java
rename to org.adempiere.server/src/main/server/org/compiere/ldap/LdapMessage.java
diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapProcessor.java b/org.adempiere.server/src/main/server/org/compiere/ldap/LdapProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/ldap/LdapProcessor.java
rename to org.adempiere.server/src/main/server/org/compiere/ldap/LdapProcessor.java
diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapResult.java b/org.adempiere.server/src/main/server/org/compiere/ldap/LdapResult.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/ldap/LdapResult.java
rename to org.adempiere.server/src/main/server/org/compiere/ldap/LdapResult.java
diff --git a/serverRoot/src/main/server/org/compiere/server/AcctProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/AcctProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/server/AcctProcessor.java
rename to org.adempiere.server/src/main/server/org/compiere/server/AcctProcessor.java
diff --git a/serverRoot/src/main/server/org/compiere/server/AdempiereServer.java b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServer.java
similarity index 97%
rename from serverRoot/src/main/server/org/compiere/server/AdempiereServer.java
rename to org.adempiere.server/src/main/server/org/compiere/server/AdempiereServer.java
index d15467d74a..5d8bfa534b 100644
--- a/serverRoot/src/main/server/org/compiere/server/AdempiereServer.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServer.java
@@ -27,7 +27,6 @@ import org.compiere.model.AdempiereProcessorLog;
import org.compiere.model.MAcctProcessor;
import org.compiere.model.MAlertProcessor;
import org.compiere.model.MClient;
-import org.compiere.model.MIMPProcessor;
import org.compiere.model.MLdapProcessor;
import org.compiere.model.MRequestProcessor;
import org.compiere.model.MScheduler;
@@ -64,8 +63,6 @@ public abstract class AdempiereServer extends Thread
return new Scheduler ((MScheduler)model);
if (model instanceof MLdapProcessor)
return new LdapProcessor((MLdapProcessor)model);
- if (model instanceof MIMPProcessor) // @Trifon
- return new ReplicationProcessor((MIMPProcessor)model);
//
throw new IllegalArgumentException("Unknown Processor");
} // create
diff --git a/serverRoot/src/main/server/org/compiere/server/AdempiereServerGroup.java b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerGroup.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/server/AdempiereServerGroup.java
rename to org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerGroup.java
diff --git a/serverRoot/src/main/server/org/compiere/server/AdempiereServerMgr.java b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
similarity index 91%
rename from serverRoot/src/main/server/org/compiere/server/AdempiereServerMgr.java
rename to org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
index 9c3ce4b6a1..1dfd409f85 100644
--- a/serverRoot/src/main/server/org/compiere/server/AdempiereServerMgr.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
@@ -18,13 +18,15 @@ package org.compiere.server;
import java.sql.Timestamp;
import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
+import org.adempiere.base.Service;
+import org.adempiere.server.IServerFactory;
import org.compiere.Adempiere;
import org.compiere.model.MAcctProcessor;
import org.compiere.model.MAlertProcessor;
-import org.compiere.model.MIMPProcessor;
import org.compiere.model.MLdapProcessor;
import org.compiere.model.MRequestProcessor;
import org.compiere.model.MScheduler;
@@ -165,15 +167,24 @@ public class AdempiereServerMgr
server.setPriority(Thread.NORM_PRIORITY-1);
m_servers.add(server);
}
- // ImportProcessor - @Trifon
- MIMPProcessor[] importModels = MIMPProcessor.getActive(m_ctx);
- for (int i = 0; i < importModels.length; i++)
+
+ //osgi server
+ List serverFactoryList = Service.list(IServerFactory.class);
+ if (serverFactoryList != null && !serverFactoryList.isEmpty())
{
- MIMPProcessor lp = importModels[i];
- AdempiereServer server = AdempiereServer.create(lp);
- server.start();
- server.setPriority(Thread.NORM_PRIORITY-1);
- m_servers.add(server);
+ for(IServerFactory factory : serverFactoryList )
+ {
+ AdempiereServer[] servers = factory.create(m_ctx);
+ if (servers != null && servers.length > 0)
+ {
+ for (AdempiereServer server : servers)
+ {
+ server.start();
+ server.setPriority(Thread.NORM_PRIORITY-1);
+ m_servers.add(server);
+ }
+ }
+ }
}
log.fine("#" + noServers);
diff --git a/serverRoot/src/main/server/org/compiere/server/AlertProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/server/AlertProcessor.java
rename to org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java
diff --git a/serverRoot/src/main/server/org/compiere/server/EMailProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/EMailProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/server/EMailProcessor.java
rename to org.adempiere.server/src/main/server/org/compiere/server/EMailProcessor.java
diff --git a/serverRoot/src/main/server/org/compiere/server/RequestProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/RequestProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/server/RequestProcessor.java
rename to org.adempiere.server/src/main/server/org/compiere/server/RequestProcessor.java
diff --git a/serverRoot/src/main/server/org/compiere/server/Scheduler.java b/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/server/Scheduler.java
rename to org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java
diff --git a/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java
similarity index 100%
rename from serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java
rename to org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/BasicVerifier.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/BasicVerifier.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/BasicVerifier.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/BasicVerifier.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/ServerApplication.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/ServerApplication.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/ServerApplication.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/ServerApplication.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/command/ExecuteProcessCommand.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ExecuteProcessCommand.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/command/ExecuteProcessCommand.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ExecuteProcessCommand.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/command/ExecuteTaskCommand.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ExecuteTaskCommand.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/command/ExecuteTaskCommand.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ExecuteTaskCommand.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/command/ExecuteWorkflowCommand.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ExecuteWorkflowCommand.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/command/ExecuteWorkflowCommand.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ExecuteWorkflowCommand.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/command/PostDocumentCommand.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/PostDocumentCommand.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/command/PostDocumentCommand.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/PostDocumentCommand.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/command/ResetCacheCommand.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ResetCacheCommand.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/command/ResetCacheCommand.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/ResetCacheCommand.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/command/SendEmailCommand.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/SendEmailCommand.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/command/SendEmailCommand.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/command/SendEmailCommand.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/status/DatabaseResource.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/status/DatabaseResource.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/status/DatabaseResource.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/status/DatabaseResource.java
diff --git a/serverRoot/src/main/servlet/org/adempiere/web/server/status/VersionResource.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/status/VersionResource.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/adempiere/web/server/status/VersionResource.java
rename to org.adempiere.server/src/main/servlet/org/adempiere/web/server/status/VersionResource.java
diff --git a/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitor.java b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitor.java
rename to org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
diff --git a/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
rename to org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
diff --git a/serverRoot/src/main/servlet/org/compiere/web/ServerStatus.java b/org.adempiere.server/src/main/servlet/org/compiere/web/ServerStatus.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/compiere/web/ServerStatus.java
rename to org.adempiere.server/src/main/servlet/org/compiere/web/ServerStatus.java
diff --git a/serverRoot/src/main/servlet/org/compiere/web/StatusInfo.java b/org.adempiere.server/src/main/servlet/org/compiere/web/StatusInfo.java
similarity index 100%
rename from serverRoot/src/main/servlet/org/compiere/web/StatusInfo.java
rename to org.adempiere.server/src/main/servlet/org/compiere/web/StatusInfo.java
diff --git a/serverRoot/standard.css b/org.adempiere.server/standard.css
similarity index 100%
rename from serverRoot/standard.css
rename to org.adempiere.server/standard.css
diff --git a/serverRoot/webstart.jpg b/org.adempiere.server/webstart.jpg
similarity index 100%
rename from serverRoot/webstart.jpg
rename to org.adempiere.server/webstart.jpg
diff --git a/serverRoot/webstart_s.jpg b/org.adempiere.server/webstart_s.jpg
similarity index 100%
rename from serverRoot/webstart_s.jpg
rename to org.adempiere.server/webstart_s.jpg
diff --git a/serverRoot/zip.gif b/org.adempiere.server/zip.gif
similarity index 100%
rename from serverRoot/zip.gif
rename to org.adempiere.server/zip.gif
diff --git a/org.adempiere.tomcat.config/.classpath b/org.adempiere.tomcat.config/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/org.adempiere.tomcat.config/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/org.adempiere.tomcat.config/.project b/org.adempiere.tomcat.config/.project
new file mode 100644
index 0000000000..42d41b6fc4
--- /dev/null
+++ b/org.adempiere.tomcat.config/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.tomcat.config
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/tomcatConfig/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.tomcat.config/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tomcatConfig/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.tomcat.config/.settings/org.eclipse.jdt.core.prefs
diff --git a/tomcatConfig/.settings/org.eclipse.pde.core.prefs b/org.adempiere.tomcat.config/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from tomcatConfig/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.tomcat.config/.settings/org.eclipse.pde.core.prefs
diff --git a/tomcatConfig/META-INF/MANIFEST.MF b/org.adempiere.tomcat.config/META-INF/MANIFEST.MF
similarity index 100%
rename from tomcatConfig/META-INF/MANIFEST.MF
rename to org.adempiere.tomcat.config/META-INF/MANIFEST.MF
diff --git a/tomcatConfig/META-INF/tomcat/dev.readme.txt b/org.adempiere.tomcat.config/META-INF/tomcat/dev.readme.txt
similarity index 100%
rename from tomcatConfig/META-INF/tomcat/dev.readme.txt
rename to org.adempiere.tomcat.config/META-INF/tomcat/dev.readme.txt
diff --git a/tomcatConfig/META-INF/tomcat/server.dev.xml b/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml
similarity index 100%
rename from tomcatConfig/META-INF/tomcat/server.dev.xml
rename to org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml
diff --git a/org.adempiere.tomcat.config/META-INF/tomcat/server.xml b/org.adempiere.tomcat.config/META-INF/tomcat/server.xml
new file mode 100644
index 0000000000..701deb65fd
--- /dev/null
+++ b/org.adempiere.tomcat.config/META-INF/tomcat/server.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tomcatConfig/META-INF/tomcat/serverTemplate.xml b/org.adempiere.tomcat.config/META-INF/tomcat/serverTemplate.xml
similarity index 100%
rename from tomcatConfig/META-INF/tomcat/serverTemplate.xml
rename to org.adempiere.tomcat.config/META-INF/tomcat/serverTemplate.xml
diff --git a/tomcatConfig/src/.hgignore b/org.adempiere.tomcat.config/bin/.hgignore
similarity index 100%
rename from tomcatConfig/src/.hgignore
rename to org.adempiere.tomcat.config/bin/.hgignore
diff --git a/org.adempiere.tomcat.config/build.properties b/org.adempiere.tomcat.config/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/org.adempiere.tomcat.config/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/webStore/src/.hgignore b/org.adempiere.tomcat.config/src/.hgignore
similarity index 100%
rename from webStore/src/.hgignore
rename to org.adempiere.tomcat.config/src/.hgignore
diff --git a/org.adempiere.ui.swing-feature/.project b/org.adempiere.ui.swing-feature/.project
new file mode 100644
index 0000000000..832ebb34b0
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.ui.swing-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.ui.swing-feature/build.properties b/org.adempiere.ui.swing-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
new file mode 100644
index 0000000000..ed4c9cb3e8
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -0,0 +1,43 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
new file mode 100644
index 0000000000..b1620e99d6
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+ -console
+ -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -DPropertyFile=/media/W/Workspace/hengsin/trunk-local.properties
+ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.ui.swing.pluginlist/.classpath b/org.adempiere.ui.swing.pluginlist/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/org.adempiere.ui.swing.pluginlist/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/org.adempiere.ui.swing.pluginlist/.project b/org.adempiere.ui.swing.pluginlist/.project
new file mode 100644
index 0000000000..4daab55d00
--- /dev/null
+++ b/org.adempiere.ui.swing.pluginlist/.project
@@ -0,0 +1,28 @@
+
+
+ org.adempiere.ui.swing.pluginlist
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/plugins/pluginList/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.swing.pluginlist/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/pluginList/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.ui.swing.pluginlist/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/pluginList/.settings/org.eclipse.pde.core.prefs b/org.adempiere.ui.swing.pluginlist/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from plugins/pluginList/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.ui.swing.pluginlist/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/pluginList/META-INF/MANIFEST.MF b/org.adempiere.ui.swing.pluginlist/META-INF/MANIFEST.MF
similarity index 51%
rename from plugins/pluginList/META-INF/MANIFEST.MF
rename to org.adempiere.ui.swing.pluginlist/META-INF/MANIFEST.MF
index 0153c951bb..c7df576550 100644
--- a/plugins/pluginList/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing.pluginlist/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: PluginList
-Bundle-SymbolicName: org.adempiere.plugin.list;singleton:=true
-Bundle-Version: 0.0.0.2
+Bundle-SymbolicName: org.adempiere.ui.swing.pluginlist;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.adempiere.plugin.list.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-LazyStart: true
Import-Package: org.osgi.framework;version="1.3.0"
-Require-Bundle: org.adempiere.pluginUtils;bundle-version="0.0.0",
- org.adempiere.base;bundle-version="0.0.0",
- org.adempiere.client;bundle-version="0.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.ui.swing;bundle-version="0.0.0",
+ org.adempiere.plugin.utils;bundle-version="0.0.0"
diff --git a/plugins/pluginList/META-INF/PackOut.xml b/org.adempiere.ui.swing.pluginlist/META-INF/PackOut.xml
similarity index 100%
rename from plugins/pluginList/META-INF/PackOut.xml
rename to org.adempiere.ui.swing.pluginlist/META-INF/PackOut.xml
diff --git a/org.adempiere.ui.swing.pluginlist/build.properties b/org.adempiere.ui.swing.pluginlist/build.properties
new file mode 100644
index 0000000000..e9863e281e
--- /dev/null
+++ b/org.adempiere.ui.swing.pluginlist/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml
diff --git a/plugins/pluginList/plugin.xml b/org.adempiere.ui.swing.pluginlist/plugin.xml
similarity index 100%
rename from plugins/pluginList/plugin.xml
rename to org.adempiere.ui.swing.pluginlist/plugin.xml
diff --git a/plugins/pluginList/src/org/adempiere/plugin/list/Activator.java b/org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/Activator.java
similarity index 100%
rename from plugins/pluginList/src/org/adempiere/plugin/list/Activator.java
rename to org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/Activator.java
diff --git a/plugins/pluginList/src/org/adempiere/plugin/list/PluginList.java b/org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/PluginList.java
similarity index 100%
rename from plugins/pluginList/src/org/adempiere/plugin/list/PluginList.java
rename to org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/PluginList.java
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
new file mode 100644
index 0000000000..8822724374
--- /dev/null
+++ b/org.adempiere.ui.swing/.classpath
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/.project b/org.adempiere.ui.swing/.project
similarity index 97%
rename from client/.project
rename to org.adempiere.ui.swing/.project
index 6340049334..ee739ca30a 100644
--- a/client/.project
+++ b/org.adempiere.ui.swing/.project
@@ -1,6 +1,6 @@
- client
+ org.adempiere.ui.swingbase
diff --git a/client/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from client/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
diff --git a/client/.settings/org.eclipse.wst.common.component b/org.adempiere.ui.swing/.settings/org.eclipse.wst.common.component
similarity index 78%
rename from client/.settings/org.eclipse.wst.common.component
rename to org.adempiere.ui.swing/.settings/org.eclipse.wst.common.component
index 03c215bda0..f1cf94193c 100644
--- a/client/.settings/org.eclipse.wst.common.component
+++ b/org.adempiere.ui.swing/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,6 @@
-
+
diff --git a/client/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.ui.swing/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from client/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to org.adempiere.ui.swing/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..ce0771dae1
--- /dev/null
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -0,0 +1,84 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Swing Client
+Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: client.jar,
+ swingx-1.6.jar,
+ looks-2.0.4.jar,
+ miglayout-3.7.1-swing.jar,
+ jpedal.jar
+Export-Package: de.schaeffer.compiere.tools,
+ net.miginfocom.layout,
+ net.miginfocom.swing,
+ org.adempiere.apps.graph,
+ org.adempiere.osgi,
+ org.adempiere.pdf.viewer,
+ org.adempiere.plaf,
+ org.compiere,
+ org.compiere.acct,
+ org.compiere.apps,
+ org.compiere.apps.form,
+ org.compiere.apps.search,
+ org.compiere.apps.wf,
+ org.compiere.grid,
+ org.compiere.grid.ed,
+ org.compiere.grid.tree,
+ org.compiere.images,
+ org.compiere.install,
+ org.compiere.minigrid,
+ org.compiere.plaf,
+ org.compiere.pos,
+ org.compiere.print,
+ org.compiere.swing,
+ org.eevolution.form,
+ org.jdesktop.beans,
+ org.jdesktop.swingx,
+ org.jdesktop.swingx.action,
+ org.jdesktop.swingx.auth,
+ org.jdesktop.swingx.autocomplete,
+ org.jdesktop.swingx.border,
+ org.jdesktop.swingx.calendar,
+ org.jdesktop.swingx.color,
+ org.jdesktop.swingx.combobox,
+ org.jdesktop.swingx.decorator,
+ org.jdesktop.swingx.error,
+ org.jdesktop.swingx.event,
+ org.jdesktop.swingx.geom,
+ org.jdesktop.swingx.graphics,
+ org.jdesktop.swingx.hyperlink,
+ org.jdesktop.swingx.icon,
+ org.jdesktop.swingx.image,
+ org.jdesktop.swingx.multislider,
+ org.jdesktop.swingx.multisplitpane,
+ org.jdesktop.swingx.painter,
+ org.jdesktop.swingx.painter.effects,
+ org.jdesktop.swingx.renderer,
+ org.jdesktop.swingx.rollover,
+ org.jdesktop.swingx.search,
+ org.jdesktop.swingx.sort,
+ org.jdesktop.swingx.table,
+ org.jdesktop.swingx.tips,
+ org.jdesktop.swingx.tree,
+ org.jdesktop.swingx.treetable,
+ org.jdesktop.swingx.util
+Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
+ org.adempiere.ui;bundle-version="1.0.0"
+Eclipse-ExtensibleAPI: true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: javax.net.ssl,
+ org.apache.ecs,
+ org.apache.ecs.xhtml,
+ org.eclipse.core.runtime;version="3.4.0",
+ org.eclipse.equinox.app,
+ org.osgi.framework;version="1.5.0",
+ org.restlet,
+ org.restlet.data,
+ org.restlet.engine,
+ org.restlet.engine.security,
+ org.restlet.ext.net,
+ org.restlet.representation,
+ org.restlet.resource,
+ org.restlet.security,
+ org.restlet.service,
+ org.restlet.util
diff --git a/client/RUN_build.bat b/org.adempiere.ui.swing/RUN_build.bat
similarity index 100%
rename from client/RUN_build.bat
rename to org.adempiere.ui.swing/RUN_build.bat
diff --git a/client/RUN_build.sh b/org.adempiere.ui.swing/RUN_build.sh
similarity index 100%
rename from client/RUN_build.sh
rename to org.adempiere.ui.swing/RUN_build.sh
diff --git a/client/Swingset.bat b/org.adempiere.ui.swing/Swingset.bat
similarity index 100%
rename from client/Swingset.bat
rename to org.adempiere.ui.swing/Swingset.bat
diff --git a/org.adempiere.ui.swing/build.properties b/org.adempiere.ui.swing/build.properties
new file mode 100644
index 0000000000..e93a381bfc
--- /dev/null
+++ b/org.adempiere.ui.swing/build.properties
@@ -0,0 +1,10 @@
+bin.includes = META-INF/,\
+ client.jar,\
+ plugin.xml,\
+ component.xml,\
+ swingx-1.6.jar,\
+ looks-2.0.4.jar,\
+ miglayout-3.7.1-swing.jar,\
+ jpedal.jar
+source.client.jar = src/
+output.client.jar = build/
diff --git a/client/build.xml b/org.adempiere.ui.swing/build.xml
similarity index 100%
rename from client/build.xml
rename to org.adempiere.ui.swing/build.xml
diff --git a/extend/documentation.bat b/org.adempiere.ui.swing/documentation.bat
similarity index 100%
rename from extend/documentation.bat
rename to org.adempiere.ui.swing/documentation.bat
diff --git a/client/packages.txt b/org.adempiere.ui.swing/packages.txt
similarity index 100%
rename from client/packages.txt
rename to org.adempiere.ui.swing/packages.txt
diff --git a/client/plugin.xml b/org.adempiere.ui.swing/plugin.xml
similarity index 93%
rename from client/plugin.xml
rename to org.adempiere.ui.swing/plugin.xml
index a444401f4c..6a458c8500 100644
--- a/client/plugin.xml
+++ b/org.adempiere.ui.swing/plugin.xml
@@ -12,7 +12,8 @@
diff --git a/client/schema/org.adempiere.apps.Form.exsd b/org.adempiere.ui.swing/schema/org.adempiere.apps.Form.exsd
similarity index 100%
rename from client/schema/org.adempiere.apps.Form.exsd
rename to org.adempiere.ui.swing/schema/org.adempiere.apps.Form.exsd
diff --git a/client/schema/org.adempiere.osgi.IMenuAction.exsd b/org.adempiere.ui.swing/schema/org.adempiere.osgi.IMenuAction.exsd
similarity index 100%
rename from client/schema/org.adempiere.osgi.IMenuAction.exsd
rename to org.adempiere.ui.swing/schema/org.adempiere.osgi.IMenuAction.exsd
diff --git a/client/src/de/schaeffer/compiere/tools/DocumentSearch.java b/org.adempiere.ui.swing/src/de/schaeffer/compiere/tools/DocumentSearch.java
similarity index 100%
rename from client/src/de/schaeffer/compiere/tools/DocumentSearch.java
rename to org.adempiere.ui.swing/src/de/schaeffer/compiere/tools/DocumentSearch.java
diff --git a/client/src/org/adempiere/apps/graph/FCHtmlEditorKit.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/FCHtmlEditorKit.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/FCHtmlEditorKit.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/FCHtmlEditorKit.java
diff --git a/client/src/org/adempiere/apps/graph/Graph.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/Graph.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/Graph.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/Graph.java
diff --git a/client/src/org/adempiere/apps/graph/GraphUtil.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/GraphUtil.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/GraphUtil.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/GraphUtil.java
diff --git a/client/src/org/adempiere/apps/graph/HtmlDashboard.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/HtmlDashboard.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java
diff --git a/client/src/org/adempiere/apps/graph/PAPanel.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PAPanel.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/PAPanel.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/PAPanel.java
diff --git a/client/src/org/adempiere/apps/graph/PerformanceDetail.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceDetail.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/PerformanceDetail.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceDetail.java
diff --git a/client/src/org/adempiere/apps/graph/PerformanceIndicator.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/PerformanceIndicator.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java
diff --git a/client/src/org/adempiere/apps/graph/ViewPI.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/ViewPI.java
similarity index 100%
rename from client/src/org/adempiere/apps/graph/ViewPI.java
rename to org.adempiere.ui.swing/src/org/adempiere/apps/graph/ViewPI.java
diff --git a/client/src/org/adempiere/client/Application.java b/org.adempiere.ui.swing/src/org/adempiere/client/Application.java
similarity index 100%
rename from client/src/org/adempiere/client/Application.java
rename to org.adempiere.ui.swing/src/org/adempiere/client/Application.java
diff --git a/client/src/org/adempiere/client/Client.java b/org.adempiere.ui.swing/src/org/adempiere/client/Client.java
similarity index 100%
rename from client/src/org/adempiere/client/Client.java
rename to org.adempiere.ui.swing/src/org/adempiere/client/Client.java
diff --git a/client/src/org/adempiere/client/ClientCredentialDialog.java b/org.adempiere.ui.swing/src/org/adempiere/client/ClientCredentialDialog.java
similarity index 100%
rename from client/src/org/adempiere/client/ClientCredentialDialog.java
rename to org.adempiere.ui.swing/src/org/adempiere/client/ClientCredentialDialog.java
diff --git a/client/src/org/adempiere/client/ClientSSLContextFactory.java b/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
similarity index 100%
rename from client/src/org/adempiere/client/ClientSSLContextFactory.java
rename to org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
diff --git a/client/src/org/adempiere/client/ServerInterface.java b/org.adempiere.ui.swing/src/org/adempiere/client/ServerInterface.java
similarity index 100%
rename from client/src/org/adempiere/client/ServerInterface.java
rename to org.adempiere.ui.swing/src/org/adempiere/client/ServerInterface.java
diff --git a/client/src/org/adempiere/client/StatusInterface.java b/org.adempiere.ui.swing/src/org/adempiere/client/StatusInterface.java
similarity index 100%
rename from client/src/org/adempiere/client/StatusInterface.java
rename to org.adempiere.ui.swing/src/org/adempiere/client/StatusInterface.java
diff --git a/client/src/org/adempiere/osgi/AbstractMenuAction.java b/org.adempiere.ui.swing/src/org/adempiere/osgi/AbstractMenuAction.java
similarity index 100%
rename from client/src/org/adempiere/osgi/AbstractMenuAction.java
rename to org.adempiere.ui.swing/src/org/adempiere/osgi/AbstractMenuAction.java
diff --git a/client/src/org/adempiere/osgi/IMenuAction.java b/org.adempiere.ui.swing/src/org/adempiere/osgi/IMenuAction.java
similarity index 100%
rename from client/src/org/adempiere/osgi/IMenuAction.java
rename to org.adempiere.ui.swing/src/org/adempiere/osgi/IMenuAction.java
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/document-print.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/document-print.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/document-print.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/document-print.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/document-save.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/document-save.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/document-save.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/document-save.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/go-first.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-first.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/go-first.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-first.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/go-last.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-last.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/go-last.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-last.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/go-next.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-next.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/go-next.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-next.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/go-previous.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-previous.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/go-previous.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/go-previous.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/rotate-cclock.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/rotate-cclock.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/rotate-cclock.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/rotate-cclock.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/rotate-clock.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/rotate-clock.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/rotate-clock.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/rotate-clock.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/rotate.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/rotate.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/rotate.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/rotate.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/system-search.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/system-search.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/system-search.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/system-search.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/zoom-in.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/zoom-in.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/zoom-in.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/zoom-in.png
diff --git a/base/src/org/adempiere/pdf/viewer/22x22/zoom-out.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/zoom-out.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/22x22/zoom-out.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/22x22/zoom-out.png
diff --git a/base/src/org/adempiere/pdf/viewer/48x48/document-print.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/document-print.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/48x48/document-print.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/document-print.png
diff --git a/base/src/org/adempiere/pdf/viewer/48x48/document-save.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/document-save.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/48x48/document-save.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/document-save.png
diff --git a/base/src/org/adempiere/pdf/viewer/48x48/go-first.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-first.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/48x48/go-first.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-first.png
diff --git a/base/src/org/adempiere/pdf/viewer/48x48/go-last.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-last.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/48x48/go-last.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-last.png
diff --git a/base/src/org/adempiere/pdf/viewer/48x48/go-next.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-next.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/48x48/go-next.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-next.png
diff --git a/base/src/org/adempiere/pdf/viewer/48x48/go-previous.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-previous.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/48x48/go-previous.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/go-previous.png
diff --git a/base/src/org/adempiere/pdf/viewer/48x48/system-search.png b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/system-search.png
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/48x48/system-search.png
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/48x48/system-search.png
diff --git a/base/src/org/adempiere/pdf/viewer/PDFViewerBean.java b/org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/PDFViewerBean.java
similarity index 100%
rename from base/src/org/adempiere/pdf/viewer/PDFViewerBean.java
rename to org.adempiere.ui.swing/src/org/adempiere/pdf/viewer/PDFViewerBean.java
diff --git a/client/src/org/adempiere/plaf/AdempiereButtonListener.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereButtonListener.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java
diff --git a/client/src/org/adempiere/plaf/AdempiereComboBoxUI.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboBoxUI.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereComboBoxUI.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboBoxUI.java
diff --git a/client/src/org/adempiere/plaf/AdempiereComboPopup.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereComboPopup.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
diff --git a/client/src/org/adempiere/plaf/AdempiereLabelUI.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereLabelUI.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereLabelUI.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereLabelUI.java
diff --git a/client/src/org/adempiere/plaf/AdempiereLookAndFeel.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereLookAndFeel.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereLookAndFeel.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereLookAndFeel.java
diff --git a/client/src/org/adempiere/plaf/AdempiereLookAndFeelAddons.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereLookAndFeelAddons.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereLookAndFeelAddons.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereLookAndFeelAddons.java
diff --git a/client/src/org/adempiere/plaf/AdempierePLAF.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempierePLAF.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempierePLAF.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempierePLAF.java
diff --git a/client/src/org/adempiere/plaf/AdempiereTabbedPaneUI.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTabbedPaneUI.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereTabbedPaneUI.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTabbedPaneUI.java
diff --git a/client/src/org/adempiere/plaf/AdempiereTaskPaneUI.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
diff --git a/client/src/org/adempiere/plaf/AdempiereTheme.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereTheme.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java
diff --git a/client/src/org/adempiere/plaf/AdempiereThemeInnova.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereThemeInnova.java
similarity index 100%
rename from client/src/org/adempiere/plaf/AdempiereThemeInnova.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereThemeInnova.java
diff --git a/client/src/org/adempiere/plaf/PLAFEditor.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/PLAFEditor.java
similarity index 100%
rename from client/src/org/adempiere/plaf/PLAFEditor.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/PLAFEditor.java
diff --git a/client/src/org/adempiere/plaf/PLAFEditorPanel.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/PLAFEditorPanel.java
similarity index 100%
rename from client/src/org/adempiere/plaf/PLAFEditorPanel.java
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/PLAFEditorPanel.java
diff --git a/client/src/org/adempiere/plaf/icons/CL16.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/CL16.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/CL16.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/CL16.gif
diff --git a/client/src/org/adempiere/plaf/icons/CL32.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/CL32.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/CL32.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/CL32.gif
diff --git a/client/src/org/adempiere/plaf/icons/Cancel24.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Cancel24.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/Cancel24.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Cancel24.gif
diff --git a/client/src/org/adempiere/plaf/icons/Computer.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Computer.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/Computer.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Computer.gif
diff --git a/client/src/org/adempiere/plaf/icons/Error.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Error.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/Error.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Error.gif
diff --git a/client/src/org/adempiere/plaf/icons/File.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/File.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/File.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/File.gif
diff --git a/client/src/org/adempiere/plaf/icons/FloppyDrive.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/FloppyDrive.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/FloppyDrive.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/FloppyDrive.gif
diff --git a/client/src/org/adempiere/plaf/icons/HardDrive.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/HardDrive.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/HardDrive.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/HardDrive.gif
diff --git a/client/src/org/adempiere/plaf/icons/HomeFolder.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/HomeFolder.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/HomeFolder.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/HomeFolder.gif
diff --git a/client/src/org/adempiere/plaf/icons/Inform.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Inform.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/Inform.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Inform.gif
diff --git a/client/src/org/adempiere/plaf/icons/NewFolder.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/NewFolder.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/NewFolder.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/NewFolder.gif
diff --git a/client/src/org/adempiere/plaf/icons/Ok24.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Ok24.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/Ok24.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Ok24.gif
diff --git a/client/src/org/adempiere/plaf/icons/Question.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Question.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/Question.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Question.gif
diff --git a/client/src/org/adempiere/plaf/icons/TreeClosed.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/TreeClosed.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/TreeClosed.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/TreeClosed.gif
diff --git a/client/src/org/adempiere/plaf/icons/TreeLeaf.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/TreeLeaf.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/TreeLeaf.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/TreeLeaf.gif
diff --git a/client/src/org/adempiere/plaf/icons/TreeOpen.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/TreeOpen.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/TreeOpen.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/TreeOpen.gif
diff --git a/client/src/org/adempiere/plaf/icons/UpFolder.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/UpFolder.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/UpFolder.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/UpFolder.gif
diff --git a/client/src/org/adempiere/plaf/icons/Warn.gif b/org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Warn.gif
similarity index 100%
rename from client/src/org/adempiere/plaf/icons/Warn.gif
rename to org.adempiere.ui.swing/src/org/adempiere/plaf/icons/Warn.gif
diff --git a/client/src/org/compiere/AdempiereClient.java b/org.adempiere.ui.swing/src/org/compiere/AdempiereClient.java
similarity index 91%
rename from client/src/org/compiere/AdempiereClient.java
rename to org.adempiere.ui.swing/src/org/compiere/AdempiereClient.java
index 03f0e33d57..36c2481bc5 100644
--- a/client/src/org/compiere/AdempiereClient.java
+++ b/org.adempiere.ui.swing/src/org/compiere/AdempiereClient.java
@@ -16,20 +16,8 @@
*****************************************************************************/
package org.compiere;
-import java.awt.Image;
-import java.awt.Toolkit;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
import java.util.logging.Level;
-import javax.jnlp.BasicService;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
-import javax.swing.ImageIcon;
-
import org.compiere.db.CConnection;
import org.compiere.model.MClient;
import org.compiere.model.MSystem;
@@ -44,7 +32,6 @@ import org.compiere.util.Login;
import org.compiere.util.SecureEngine;
import org.compiere.util.SecureInterface;
import org.compiere.util.Splash;
-import org.compiere.util.Util;
/**
* Adempiere Control Class
diff --git a/client/src/org/compiere/acct/AcctViewer.java b/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewer.java
similarity index 100%
rename from client/src/org/compiere/acct/AcctViewer.java
rename to org.adempiere.ui.swing/src/org/compiere/acct/AcctViewer.java
diff --git a/client/src/org/compiere/acct/AcctViewerData.java b/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java
similarity index 100%
rename from client/src/org/compiere/acct/AcctViewerData.java
rename to org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java
diff --git a/client/src/org/compiere/acct/package.html b/org.adempiere.ui.swing/src/org/compiere/acct/package.html
similarity index 100%
rename from client/src/org/compiere/acct/package.html
rename to org.adempiere.ui.swing/src/org/compiere/acct/package.html
diff --git a/client/src/org/compiere/apps/AApplet.java b/org.adempiere.ui.swing/src/org/compiere/apps/AApplet.java
similarity index 100%
rename from client/src/org/compiere/apps/AApplet.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AApplet.java
diff --git a/client/src/org/compiere/apps/AArchive.java b/org.adempiere.ui.swing/src/org/compiere/apps/AArchive.java
similarity index 100%
rename from client/src/org/compiere/apps/AArchive.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AArchive.java
diff --git a/client/src/org/compiere/apps/AChat.java b/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
similarity index 100%
rename from client/src/org/compiere/apps/AChat.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
diff --git a/client/src/org/compiere/apps/ADialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ADialog.java
similarity index 100%
rename from client/src/org/compiere/apps/ADialog.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ADialog.java
diff --git a/client/src/org/compiere/apps/ADialogDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java
similarity index 100%
rename from client/src/org/compiere/apps/ADialogDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java
diff --git a/client/src/org/compiere/apps/AEnv.java b/org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java
similarity index 100%
rename from client/src/org/compiere/apps/AEnv.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java
diff --git a/client/src/org/compiere/apps/AExport.java b/org.adempiere.ui.swing/src/org/compiere/apps/AExport.java
similarity index 100%
rename from client/src/org/compiere/apps/AExport.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AExport.java
diff --git a/client/src/org/compiere/apps/AFocusTraversalPolicy.java b/org.adempiere.ui.swing/src/org/compiere/apps/AFocusTraversalPolicy.java
similarity index 100%
rename from client/src/org/compiere/apps/AFocusTraversalPolicy.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AFocusTraversalPolicy.java
diff --git a/client/src/org/compiere/apps/AGlassPane.java b/org.adempiere.ui.swing/src/org/compiere/apps/AGlassPane.java
similarity index 100%
rename from client/src/org/compiere/apps/AGlassPane.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AGlassPane.java
diff --git a/client/src/org/compiere/apps/AKeyboardFocusManager.java b/org.adempiere.ui.swing/src/org/compiere/apps/AKeyboardFocusManager.java
similarity index 100%
rename from client/src/org/compiere/apps/AKeyboardFocusManager.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AKeyboardFocusManager.java
diff --git a/client/src/org/compiere/apps/ALayout.java b/org.adempiere.ui.swing/src/org/compiere/apps/ALayout.java
similarity index 100%
rename from client/src/org/compiere/apps/ALayout.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ALayout.java
diff --git a/client/src/org/compiere/apps/ALayoutCollection.java b/org.adempiere.ui.swing/src/org/compiere/apps/ALayoutCollection.java
similarity index 100%
rename from client/src/org/compiere/apps/ALayoutCollection.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ALayoutCollection.java
diff --git a/client/src/org/compiere/apps/ALayoutConstraint.java b/org.adempiere.ui.swing/src/org/compiere/apps/ALayoutConstraint.java
similarity index 100%
rename from client/src/org/compiere/apps/ALayoutConstraint.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ALayoutConstraint.java
diff --git a/client/src/org/compiere/apps/ALogin.java b/org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
similarity index 100%
rename from client/src/org/compiere/apps/ALogin.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
diff --git a/client/src/org/compiere/apps/ALoginTest.java b/org.adempiere.ui.swing/src/org/compiere/apps/ALoginTest.java
similarity index 100%
rename from client/src/org/compiere/apps/ALoginTest.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ALoginTest.java
diff --git a/client/src/org/compiere/apps/AMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
similarity index 100%
rename from client/src/org/compiere/apps/AMenu.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
diff --git a/client/src/org/compiere/apps/AMenuStartItem.java b/org.adempiere.ui.swing/src/org/compiere/apps/AMenuStartItem.java
similarity index 100%
rename from client/src/org/compiere/apps/AMenuStartItem.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AMenuStartItem.java
diff --git a/client/src/org/compiere/apps/APanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
similarity index 100%
rename from client/src/org/compiere/apps/APanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
diff --git a/client/src/org/compiere/apps/ARequest.java b/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java
similarity index 100%
rename from client/src/org/compiere/apps/ARequest.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java
diff --git a/client/src/org/compiere/apps/AStart.html b/org.adempiere.ui.swing/src/org/compiere/apps/AStart.html
similarity index 100%
rename from client/src/org/compiere/apps/AStart.html
rename to org.adempiere.ui.swing/src/org/compiere/apps/AStart.html
diff --git a/client/src/org/compiere/apps/AStart.java b/org.adempiere.ui.swing/src/org/compiere/apps/AStart.java
similarity index 100%
rename from client/src/org/compiere/apps/AStart.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AStart.java
diff --git a/client/src/org/compiere/apps/ASyncProcessBase.java b/org.adempiere.ui.swing/src/org/compiere/apps/ASyncProcessBase.java
similarity index 100%
rename from client/src/org/compiere/apps/ASyncProcessBase.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ASyncProcessBase.java
diff --git a/client/src/org/compiere/apps/ATask.java b/org.adempiere.ui.swing/src/org/compiere/apps/ATask.java
similarity index 100%
rename from client/src/org/compiere/apps/ATask.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ATask.java
diff --git a/client/src/org/compiere/apps/AWindow.java b/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
similarity index 100%
rename from client/src/org/compiere/apps/AWindow.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
diff --git a/client/src/org/compiere/apps/AWindowListener.java b/org.adempiere.ui.swing/src/org/compiere/apps/AWindowListener.java
similarity index 100%
rename from client/src/org/compiere/apps/AWindowListener.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AWindowListener.java
diff --git a/client/src/org/compiere/apps/AZoomAcross.java b/org.adempiere.ui.swing/src/org/compiere/apps/AZoomAcross.java
similarity index 100%
rename from client/src/org/compiere/apps/AZoomAcross.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AZoomAcross.java
diff --git a/client/src/org/compiere/apps/AboutBox.java b/org.adempiere.ui.swing/src/org/compiere/apps/AboutBox.java
similarity index 100%
rename from client/src/org/compiere/apps/AboutBox.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AboutBox.java
diff --git a/client/src/org/compiere/apps/AppsAction.java b/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java
similarity index 100%
rename from client/src/org/compiere/apps/AppsAction.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java
diff --git a/client/src/org/compiere/apps/Attachment.java b/org.adempiere.ui.swing/src/org/compiere/apps/Attachment.java
similarity index 95%
rename from client/src/org/compiere/apps/Attachment.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/Attachment.java
index c440f63641..f534f109b8 100644
--- a/client/src/org/compiere/apps/Attachment.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/Attachment.java
@@ -35,7 +35,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
-import org.adempiere.pdf.Document;
import org.adempiere.pdf.viewer.PDFViewerBean;
import org.adempiere.plaf.AdempierePLAF;
import org.compiere.model.MAttachment;
@@ -136,7 +135,7 @@ public final class Attachment extends CDialog
private CPanel graphPanel = new CPanel(new BorderLayout());
private GImage gifPanel = new GImage();
private JScrollPane gifScroll = new JScrollPane (gifPanel);
- private PDFViewerBean pdfViewer = Document.getViewer();
+ private PDFViewerBean pdfViewer = new PDFViewerBean();
private CTextArea info = new CTextArea();
/**
diff --git a/client/src/org/compiere/apps/BeanShellEditor.java b/org.adempiere.ui.swing/src/org/compiere/apps/BeanShellEditor.java
similarity index 100%
rename from client/src/org/compiere/apps/BeanShellEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/BeanShellEditor.java
diff --git a/client/src/org/compiere/apps/ClientProcessCtrl.java b/org.adempiere.ui.swing/src/org/compiere/apps/ClientProcessCtrl.java
similarity index 100%
rename from client/src/org/compiere/apps/ClientProcessCtrl.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ClientProcessCtrl.java
diff --git a/client/src/org/compiere/apps/ConfirmPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java
similarity index 100%
rename from client/src/org/compiere/apps/ConfirmPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java
diff --git a/client/src/org/compiere/apps/EMailDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/EMailDialog.java
similarity index 100%
rename from client/src/org/compiere/apps/EMailDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/EMailDialog.java
diff --git a/client/src/org/compiere/apps/FieldRecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
similarity index 100%
rename from client/src/org/compiere/apps/FieldRecordInfo.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java
diff --git a/client/src/org/compiere/apps/GroovyEditor.java b/org.adempiere.ui.swing/src/org/compiere/apps/GroovyEditor.java
similarity index 100%
rename from client/src/org/compiere/apps/GroovyEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/GroovyEditor.java
diff --git a/client/src/org/compiere/apps/Help.java b/org.adempiere.ui.swing/src/org/compiere/apps/Help.java
similarity index 100%
rename from client/src/org/compiere/apps/Help.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/Help.java
diff --git a/client/src/org/compiere/apps/OnlineHelp.java b/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java
similarity index 100%
rename from client/src/org/compiere/apps/OnlineHelp.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java
diff --git a/client/src/org/compiere/apps/Preference.java b/org.adempiere.ui.swing/src/org/compiere/apps/Preference.java
similarity index 100%
rename from client/src/org/compiere/apps/Preference.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/Preference.java
diff --git a/client/src/org/compiere/apps/PrintScreenPainter.java b/org.adempiere.ui.swing/src/org/compiere/apps/PrintScreenPainter.java
similarity index 100%
rename from client/src/org/compiere/apps/PrintScreenPainter.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/PrintScreenPainter.java
diff --git a/client/src/org/compiere/apps/ProcessCtl.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessCtl.java
similarity index 100%
rename from client/src/org/compiere/apps/ProcessCtl.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ProcessCtl.java
diff --git a/client/src/org/compiere/apps/ProcessDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
similarity index 100%
rename from client/src/org/compiere/apps/ProcessDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
diff --git a/client/src/org/compiere/apps/ProcessModalDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessModalDialog.java
similarity index 100%
rename from client/src/org/compiere/apps/ProcessModalDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ProcessModalDialog.java
diff --git a/client/src/org/compiere/apps/ProcessParameter.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameter.java
similarity index 100%
rename from client/src/org/compiere/apps/ProcessParameter.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameter.java
diff --git a/client/src/org/compiere/apps/ProcessParameterPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameterPanel.java
similarity index 100%
rename from client/src/org/compiere/apps/ProcessParameterPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameterPanel.java
diff --git a/client/src/org/compiere/apps/RecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
similarity index 100%
rename from client/src/org/compiere/apps/RecordInfo.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java
diff --git a/client/src/org/compiere/apps/ScreenShot.java b/org.adempiere.ui.swing/src/org/compiere/apps/ScreenShot.java
similarity index 100%
rename from client/src/org/compiere/apps/ScreenShot.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ScreenShot.java
diff --git a/client/src/org/compiere/apps/Script.html b/org.adempiere.ui.swing/src/org/compiere/apps/Script.html
similarity index 100%
rename from client/src/org/compiere/apps/Script.html
rename to org.adempiere.ui.swing/src/org/compiere/apps/Script.html
diff --git a/client/src/org/compiere/apps/ScriptEditor.java b/org.adempiere.ui.swing/src/org/compiere/apps/ScriptEditor.java
similarity index 100%
rename from client/src/org/compiere/apps/ScriptEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/ScriptEditor.java
diff --git a/client/src/org/compiere/apps/StatusBar.java b/org.adempiere.ui.swing/src/org/compiere/apps/StatusBar.java
similarity index 100%
rename from client/src/org/compiere/apps/StatusBar.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/StatusBar.java
diff --git a/client/src/org/compiere/apps/SwingWorker.java b/org.adempiere.ui.swing/src/org/compiere/apps/SwingWorker.java
similarity index 100%
rename from client/src/org/compiere/apps/SwingWorker.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/SwingWorker.java
diff --git a/client/src/org/compiere/apps/TabSwitcher.java b/org.adempiere.ui.swing/src/org/compiere/apps/TabSwitcher.java
similarity index 100%
rename from client/src/org/compiere/apps/TabSwitcher.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/TabSwitcher.java
diff --git a/client/src/org/compiere/apps/Waiting.java b/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java
similarity index 100%
rename from client/src/org/compiere/apps/Waiting.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java
diff --git a/client/src/org/compiere/apps/WindowManager.java b/org.adempiere.ui.swing/src/org/compiere/apps/WindowManager.java
similarity index 100%
rename from client/src/org/compiere/apps/WindowManager.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/WindowManager.java
diff --git a/client/src/org/compiere/apps/WindowMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java
similarity index 100%
rename from client/src/org/compiere/apps/WindowMenu.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java
diff --git a/client/src/org/compiere/apps/form/ArchiveViewer.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/ArchiveViewer.java
similarity index 96%
rename from client/src/org/compiere/apps/form/ArchiveViewer.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/ArchiveViewer.java
index 70a13ea77e..2def02eb95 100644
--- a/client/src/org/compiere/apps/form/ArchiveViewer.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/ArchiveViewer.java
@@ -32,7 +32,6 @@ import java.util.logging.Level;
import javax.swing.JSplitPane;
-import org.adempiere.pdf.Document;
import org.adempiere.pdf.viewer.PDFViewerBean;
import org.compiere.apps.ConfirmPanel;
import org.compiere.grid.ed.VDate;
@@ -125,7 +124,7 @@ public class ArchiveViewer extends Archive
//
private CPanel viewPanel = new CPanel(new BorderLayout(5,5));
private JSplitPane viewPanelSplit = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
- private PDFViewerBean pdfViewer = Document.getViewer();
+ private PDFViewerBean pdfViewer = new PDFViewerBean();
private CPanel viewEnterPanel = new CPanel(new GridBagLayout());
private CButton bBack = new CButton(Env.getImageIcon("wfBack24.gif"));
private CButton bNext = new CButton(Env.getImageIcon("wfNext24.gif"));
diff --git a/client/src/org/compiere/apps/form/FormFrame.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java
similarity index 100%
rename from client/src/org/compiere/apps/form/FormFrame.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java
diff --git a/client/src/org/compiere/apps/form/FormPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormPanel.java
similarity index 100%
rename from client/src/org/compiere/apps/form/FormPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/FormPanel.java
diff --git a/client/src/org/compiere/apps/form/VAllocation.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VAllocation.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java
diff --git a/client/src/org/compiere/apps/form/VAttributeGrid.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAttributeGrid.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VAttributeGrid.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VAttributeGrid.java
diff --git a/client/src/org/compiere/apps/form/VBOMDrop.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VBOMDrop.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java
diff --git a/client/src/org/compiere/apps/form/VCharge.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VCharge.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VCharge.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VCharge.java
diff --git a/client/src/org/compiere/apps/form/VFileImport.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VFileImport.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VFileImport.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VFileImport.java
diff --git a/client/src/org/compiere/apps/form/VGenPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VGenPanel.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VGenPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VGenPanel.java
diff --git a/client/src/org/compiere/apps/form/VInOutGen.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VInOutGen.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VInOutGen.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VInOutGen.java
diff --git a/client/src/org/compiere/apps/form/VInvoiceGen.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VInvoiceGen.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VInvoiceGen.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VInvoiceGen.java
diff --git a/client/src/org/compiere/apps/form/VMatch.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VMatch.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VMatch.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VMatch.java
diff --git a/client/src/org/compiere/apps/form/VMerge.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VMerge.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VMerge.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VMerge.java
diff --git a/client/src/org/compiere/apps/form/VPayPrint.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VPayPrint.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java
diff --git a/client/src/org/compiere/apps/form/VPaySelect.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VPaySelect.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java
diff --git a/client/src/org/compiere/apps/form/VSQLProcess.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VSQLProcess.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VSQLProcess.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VSQLProcess.java
diff --git a/client/src/org/compiere/apps/form/VSetup.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VSetup.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VSetup.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VSetup.java
diff --git a/client/src/org/compiere/apps/form/VTreeMaintenance.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeMaintenance.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VTreeMaintenance.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeMaintenance.java
diff --git a/client/src/org/compiere/apps/form/VTrxMaterial.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTrxMaterial.java
similarity index 100%
rename from client/src/org/compiere/apps/form/VTrxMaterial.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/VTrxMaterial.java
diff --git a/client/src/org/compiere/apps/form/package.html b/org.adempiere.ui.swing/src/org/compiere/apps/form/package.html
similarity index 100%
rename from client/src/org/compiere/apps/form/package.html
rename to org.adempiere.ui.swing/src/org/compiere/apps/form/package.html
diff --git a/client/src/org/compiere/apps/package.html b/org.adempiere.ui.swing/src/org/compiere/apps/package.html
similarity index 100%
rename from client/src/org/compiere/apps/package.html
rename to org.adempiere.ui.swing/src/org/compiere/apps/package.html
diff --git a/client/src/org/compiere/apps/search/Find.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
similarity index 100%
rename from client/src/org/compiere/apps/search/Find.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
diff --git a/client/src/org/compiere/apps/search/FindCellEditor.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/FindCellEditor.java
similarity index 100%
rename from client/src/org/compiere/apps/search/FindCellEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/FindCellEditor.java
diff --git a/client/src/org/compiere/apps/search/FindValueEditor.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/FindValueEditor.java
similarity index 100%
rename from client/src/org/compiere/apps/search/FindValueEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/FindValueEditor.java
diff --git a/client/src/org/compiere/apps/search/FindValueRenderer.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/FindValueRenderer.java
similarity index 100%
rename from client/src/org/compiere/apps/search/FindValueRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/FindValueRenderer.java
diff --git a/client/src/org/compiere/apps/search/Info.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
similarity index 100%
rename from client/src/org/compiere/apps/search/Info.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
diff --git a/client/src/org/compiere/apps/search/InfoAsset.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoAsset.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoAsset.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoAsset.java
diff --git a/client/src/org/compiere/apps/search/InfoAssignment.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoAssignment.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoAssignment.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoAssignment.java
diff --git a/client/src/org/compiere/apps/search/InfoBPartner.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoBPartner.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoBPartner.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoBPartner.java
diff --git a/client/src/org/compiere/apps/search/InfoCashLine.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoCashLine.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoCashLine.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoCashLine.java
diff --git a/client/src/org/compiere/apps/search/InfoFactory.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoFactory.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoFactory.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoFactory.java
diff --git a/client/src/org/compiere/apps/search/InfoGeneral.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoGeneral.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoGeneral.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoGeneral.java
diff --git a/client/src/org/compiere/apps/search/InfoInOut.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoInOut.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java
diff --git a/client/src/org/compiere/apps/search/InfoInvoice.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoInvoice.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java
diff --git a/client/src/org/compiere/apps/search/InfoOrder.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoOrder.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java
diff --git a/client/src/org/compiere/apps/search/InfoPAttribute.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPAttribute.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoPAttribute.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPAttribute.java
diff --git a/client/src/org/compiere/apps/search/InfoPayment.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoPayment.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java
diff --git a/client/src/org/compiere/apps/search/InfoProduct.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoProduct.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java
diff --git a/client/src/org/compiere/apps/search/InfoSchedule.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoSchedule.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InfoSchedule.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InfoSchedule.java
diff --git a/client/src/org/compiere/apps/search/Info_Column.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info_Column.java
similarity index 100%
rename from client/src/org/compiere/apps/search/Info_Column.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/Info_Column.java
diff --git a/client/src/org/compiere/apps/search/InvoiceHistory.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java
similarity index 100%
rename from client/src/org/compiere/apps/search/InvoiceHistory.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java
diff --git a/client/src/org/compiere/apps/search/PAttributeInstance.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/PAttributeInstance.java
similarity index 100%
rename from client/src/org/compiere/apps/search/PAttributeInstance.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/PAttributeInstance.java
diff --git a/client/src/org/compiere/apps/search/VSchedule.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/VSchedule.java
similarity index 100%
rename from client/src/org/compiere/apps/search/VSchedule.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/VSchedule.java
diff --git a/client/src/org/compiere/apps/search/VSchedulePanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/VSchedulePanel.java
similarity index 100%
rename from client/src/org/compiere/apps/search/VSchedulePanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/VSchedulePanel.java
diff --git a/client/src/org/compiere/apps/search/VScheduleTimePanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/VScheduleTimePanel.java
similarity index 100%
rename from client/src/org/compiere/apps/search/VScheduleTimePanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/VScheduleTimePanel.java
diff --git a/client/src/org/compiere/apps/search/package.html b/org.adempiere.ui.swing/src/org/compiere/apps/search/package.html
similarity index 100%
rename from client/src/org/compiere/apps/search/package.html
rename to org.adempiere.ui.swing/src/org/compiere/apps/search/package.html
diff --git a/client/src/org/compiere/apps/wf/NodeMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/NodeMenu.java
similarity index 100%
rename from client/src/org/compiere/apps/wf/NodeMenu.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/NodeMenu.java
diff --git a/client/src/org/compiere/apps/wf/SceneMainMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/SceneMainMenu.java
similarity index 100%
rename from client/src/org/compiere/apps/wf/SceneMainMenu.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/SceneMainMenu.java
diff --git a/client/src/org/compiere/apps/wf/WFActivity.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFActivity.java
similarity index 100%
rename from client/src/org/compiere/apps/wf/WFActivity.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/WFActivity.java
diff --git a/client/src/org/compiere/apps/wf/WFContentPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFContentPanel.java
similarity index 100%
rename from client/src/org/compiere/apps/wf/WFContentPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/WFContentPanel.java
diff --git a/client/src/org/compiere/apps/wf/WFNodeMoveStrategy.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFNodeMoveStrategy.java
similarity index 100%
rename from client/src/org/compiere/apps/wf/WFNodeMoveStrategy.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/WFNodeMoveStrategy.java
diff --git a/client/src/org/compiere/apps/wf/WFPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPanel.java
similarity index 100%
rename from client/src/org/compiere/apps/wf/WFPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPanel.java
diff --git a/client/src/org/compiere/apps/wf/WFPopupItem.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPopupItem.java
similarity index 100%
rename from client/src/org/compiere/apps/wf/WFPopupItem.java
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPopupItem.java
diff --git a/client/src/org/compiere/apps/wf/package.html b/org.adempiere.ui.swing/src/org/compiere/apps/wf/package.html
similarity index 100%
rename from client/src/org/compiere/apps/wf/package.html
rename to org.adempiere.ui.swing/src/org/compiere/apps/wf/package.html
diff --git a/client/src/org/compiere/db/CConnectionDialog.java b/org.adempiere.ui.swing/src/org/compiere/db/CConnectionDialog.java
similarity index 100%
rename from client/src/org/compiere/db/CConnectionDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/db/CConnectionDialog.java
diff --git a/client/src/org/compiere/db/CConnectionEditor.java b/org.adempiere.ui.swing/src/org/compiere/db/CConnectionEditor.java
similarity index 100%
rename from client/src/org/compiere/db/CConnectionEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/db/CConnectionEditor.java
diff --git a/client/src/org/compiere/dbPort/ConvertDialog.java b/org.adempiere.ui.swing/src/org/compiere/dbPort/ConvertDialog.java
similarity index 100%
rename from client/src/org/compiere/dbPort/ConvertDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/dbPort/ConvertDialog.java
diff --git a/client/src/org/compiere/grid/APanelTab.java b/org.adempiere.ui.swing/src/org/compiere/grid/APanelTab.java
similarity index 100%
rename from client/src/org/compiere/grid/APanelTab.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/APanelTab.java
diff --git a/client/src/org/compiere/grid/GridController.java b/org.adempiere.ui.swing/src/org/compiere/grid/GridController.java
similarity index 100%
rename from client/src/org/compiere/grid/GridController.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/GridController.java
diff --git a/client/src/org/compiere/grid/GridSynchronizer.java b/org.adempiere.ui.swing/src/org/compiere/grid/GridSynchronizer.java
similarity index 100%
rename from client/src/org/compiere/grid/GridSynchronizer.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/GridSynchronizer.java
diff --git a/client/src/org/compiere/grid/RecordAccessDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/RecordAccessDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/RecordAccessDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/RecordAccessDialog.java
diff --git a/client/src/org/compiere/grid/VCreateFromDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/VCreateFromDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDialog.java
diff --git a/client/src/org/compiere/grid/VCreateFromFactory.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromFactory.java
similarity index 100%
rename from client/src/org/compiere/grid/VCreateFromFactory.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromFactory.java
diff --git a/client/src/org/compiere/grid/VCreateFromInvoiceUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
similarity index 100%
rename from client/src/org/compiere/grid/VCreateFromInvoiceUI.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
diff --git a/client/src/org/compiere/grid/VCreateFromRMAUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
similarity index 100%
rename from client/src/org/compiere/grid/VCreateFromRMAUI.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
diff --git a/client/src/org/compiere/grid/VCreateFromShipmentUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
similarity index 100%
rename from client/src/org/compiere/grid/VCreateFromShipmentUI.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
diff --git a/client/src/org/compiere/grid/VCreateFromStatementUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
similarity index 100%
rename from client/src/org/compiere/grid/VCreateFromStatementUI.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
diff --git a/client/src/org/compiere/grid/VOnlyCurrentDays.java b/org.adempiere.ui.swing/src/org/compiere/grid/VOnlyCurrentDays.java
similarity index 100%
rename from client/src/org/compiere/grid/VOnlyCurrentDays.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VOnlyCurrentDays.java
diff --git a/client/src/org/compiere/grid/VPanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
similarity index 100%
rename from client/src/org/compiere/grid/VPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
diff --git a/client/src/org/compiere/grid/VPayment.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPayment.java
similarity index 100%
rename from client/src/org/compiere/grid/VPayment.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VPayment.java
diff --git a/client/src/org/compiere/grid/VSortTab.java b/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java
similarity index 100%
rename from client/src/org/compiere/grid/VSortTab.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java
diff --git a/client/src/org/compiere/grid/VTabbedPane.java b/org.adempiere.ui.swing/src/org/compiere/grid/VTabbedPane.java
similarity index 100%
rename from client/src/org/compiere/grid/VTabbedPane.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VTabbedPane.java
diff --git a/client/src/org/compiere/grid/VTable.java b/org.adempiere.ui.swing/src/org/compiere/grid/VTable.java
similarity index 100%
rename from client/src/org/compiere/grid/VTable.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VTable.java
diff --git a/client/src/org/compiere/grid/VTableExcelAdapter.java b/org.adempiere.ui.swing/src/org/compiere/grid/VTableExcelAdapter.java
similarity index 100%
rename from client/src/org/compiere/grid/VTableExcelAdapter.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/VTableExcelAdapter.java
diff --git a/client/src/org/compiere/grid/XLookup.java b/org.adempiere.ui.swing/src/org/compiere/grid/XLookup.java
similarity index 100%
rename from client/src/org/compiere/grid/XLookup.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/XLookup.java
diff --git a/client/src/org/compiere/grid/ed/ADempiereAutoCompleteDecorator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/ADempiereAutoCompleteDecorator.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/ADempiereAutoCompleteDecorator.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/ADempiereAutoCompleteDecorator.java
diff --git a/client/src/org/compiere/grid/ed/AutoCompleter.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/AutoCompleter.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/AutoCompleter.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/AutoCompleter.java
diff --git a/client/src/org/compiere/grid/ed/AutoCompletion.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/AutoCompletion.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/AutoCompletion.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/AutoCompletion.java
diff --git a/client/src/org/compiere/grid/ed/Calculator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/Calculator.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java
diff --git a/client/src/org/compiere/grid/ed/Calendar.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/Calendar.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java
diff --git a/client/src/org/compiere/grid/ed/CityAutoCompleter.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/CityAutoCompleter.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/CityAutoCompleter.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/CityAutoCompleter.java
diff --git a/client/src/org/compiere/grid/ed/ComboSelectionManager.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/ComboSelectionManager.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/ComboSelectionManager.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/ComboSelectionManager.java
diff --git a/client/src/org/compiere/grid/ed/Editor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Editor.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/Editor.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/Editor.java
diff --git a/client/src/org/compiere/grid/ed/HTMLEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/HTMLEditor.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/HTMLEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/HTMLEditor.java
diff --git a/client/src/org/compiere/grid/ed/MDocDate.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocDate.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/MDocDate.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocDate.java
diff --git a/client/src/org/compiere/grid/ed/MDocNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/MDocNumber.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java
diff --git a/client/src/org/compiere/grid/ed/MDocString.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocString.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/MDocString.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocString.java
diff --git a/client/src/org/compiere/grid/ed/MDocTime.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocTime.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/MDocTime.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocTime.java
diff --git a/client/src/org/compiere/grid/ed/VAccount.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VAccount.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java
diff --git a/client/src/org/compiere/grid/ed/VAccountDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VAccountDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
diff --git a/client/src/org/compiere/grid/ed/VAssignment.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VAssignment.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java
diff --git a/client/src/org/compiere/grid/ed/VAssignmentDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignmentDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VAssignmentDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignmentDialog.java
diff --git a/client/src/org/compiere/grid/ed/VBPartner.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VBPartner.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java
diff --git a/client/src/org/compiere/grid/ed/VBinary.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBinary.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VBinary.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VBinary.java
diff --git a/client/src/org/compiere/grid/ed/VButton.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VButton.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VButton.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VButton.java
diff --git a/client/src/org/compiere/grid/ed/VCellEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellEditor.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VCellEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellEditor.java
diff --git a/client/src/org/compiere/grid/ed/VCellRenderer.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellRenderer.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VCellRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VCellRenderer.java
diff --git a/client/src/org/compiere/grid/ed/VCheckBox.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VCheckBox.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java
diff --git a/client/src/org/compiere/grid/ed/VColor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VColor.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VColor.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VColor.java
diff --git a/client/src/org/compiere/grid/ed/VComboBox.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VComboBox.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java
diff --git a/client/src/org/compiere/grid/ed/VDate.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VDate.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java
diff --git a/client/src/org/compiere/grid/ed/VDocAction.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDocAction.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VDocAction.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VDocAction.java
diff --git a/client/src/org/compiere/grid/ed/VEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VEditor.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VEditor.java
diff --git a/client/src/org/compiere/grid/ed/VEditorFactory.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VEditorFactory.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VEditorFactory.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VEditorFactory.java
diff --git a/client/src/org/compiere/grid/ed/VFile.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VFile.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VFile.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VFile.java
diff --git a/client/src/org/compiere/grid/ed/VHeaderRenderer.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VHeaderRenderer.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VHeaderRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VHeaderRenderer.java
diff --git a/client/src/org/compiere/grid/ed/VImage.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VImage.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java
diff --git a/client/src/org/compiere/grid/ed/VImageDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImageDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VImageDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VImageDialog.java
diff --git a/client/src/org/compiere/grid/ed/VLine.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLine.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VLine.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VLine.java
diff --git a/client/src/org/compiere/grid/ed/VLocation.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VLocation.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java
diff --git a/client/src/org/compiere/grid/ed/VLocationDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VLocationDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java
diff --git a/client/src/org/compiere/grid/ed/VLocator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VLocator.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
diff --git a/client/src/org/compiere/grid/ed/VLocatorDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VLocatorDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java
diff --git a/client/src/org/compiere/grid/ed/VLookup.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VLookup.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
diff --git a/client/src/org/compiere/grid/ed/VManagedEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VManagedEditor.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VManagedEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VManagedEditor.java
diff --git a/client/src/org/compiere/grid/ed/VMemo.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VMemo.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VMemo.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VMemo.java
diff --git a/client/src/org/compiere/grid/ed/VNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VNumber.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java
diff --git a/client/src/org/compiere/grid/ed/VOvrCaret.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VOvrCaret.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VOvrCaret.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VOvrCaret.java
diff --git a/client/src/org/compiere/grid/ed/VPAttribute.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VPAttribute.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
diff --git a/client/src/org/compiere/grid/ed/VPAttributeDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VPAttributeDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java
diff --git a/client/src/org/compiere/grid/ed/VPassword.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPassword.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VPassword.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VPassword.java
diff --git a/client/src/org/compiere/grid/ed/VRowIDEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VRowIDEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java
diff --git a/client/src/org/compiere/grid/ed/VRowIDRenderer.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDRenderer.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VRowIDRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDRenderer.java
diff --git a/client/src/org/compiere/grid/ed/VString.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VString.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java
diff --git a/client/src/org/compiere/grid/ed/VStringBeanInfo.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VStringBeanInfo.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VStringBeanInfo.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VStringBeanInfo.java
diff --git a/client/src/org/compiere/grid/ed/VText.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VText.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VText.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VText.java
diff --git a/client/src/org/compiere/grid/ed/VTextBeanInfo.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextBeanInfo.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VTextBeanInfo.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextBeanInfo.java
diff --git a/client/src/org/compiere/grid/ed/VTextLong.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextLong.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VTextLong.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VTextLong.java
diff --git a/client/src/org/compiere/grid/ed/VURL.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/VURL.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java
diff --git a/client/src/org/compiere/grid/ed/ValuePreference.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/ValuePreference.java
similarity index 100%
rename from client/src/org/compiere/grid/ed/ValuePreference.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/ValuePreference.java
diff --git a/client/src/org/compiere/grid/ed/package.html b/org.adempiere.ui.swing/src/org/compiere/grid/ed/package.html
similarity index 100%
rename from client/src/org/compiere/grid/ed/package.html
rename to org.adempiere.ui.swing/src/org/compiere/grid/ed/package.html
diff --git a/client/src/org/compiere/grid/package.html b/org.adempiere.ui.swing/src/org/compiere/grid/package.html
similarity index 100%
rename from client/src/org/compiere/grid/package.html
rename to org.adempiere.ui.swing/src/org/compiere/grid/package.html
diff --git a/client/src/org/compiere/grid/tree/AdempiereTreeModel.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/AdempiereTreeModel.java
similarity index 100%
rename from client/src/org/compiere/grid/tree/AdempiereTreeModel.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/tree/AdempiereTreeModel.java
diff --git a/client/src/org/compiere/grid/tree/TransferableTreeNode.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/TransferableTreeNode.java
similarity index 100%
rename from client/src/org/compiere/grid/tree/TransferableTreeNode.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/tree/TransferableTreeNode.java
diff --git a/client/src/org/compiere/grid/tree/VTreeCellRenderer.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeCellRenderer.java
similarity index 100%
rename from client/src/org/compiere/grid/tree/VTreeCellRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeCellRenderer.java
diff --git a/client/src/org/compiere/grid/tree/VTreePanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
similarity index 100%
rename from client/src/org/compiere/grid/tree/VTreePanel.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
diff --git a/client/src/org/compiere/grid/tree/VTreeTransferHandler.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeTransferHandler.java
similarity index 100%
rename from client/src/org/compiere/grid/tree/VTreeTransferHandler.java
rename to org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeTransferHandler.java
diff --git a/client/src/org/compiere/images/AD10030.bak.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD10030.bak.gif
similarity index 100%
rename from client/src/org/compiere/images/AD10030.bak.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AD10030.bak.gif
diff --git a/client/src/org/compiere/images/AD10030.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD10030.gif
similarity index 100%
rename from client/src/org/compiere/images/AD10030.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AD10030.gif
diff --git a/client/src/org/compiere/images/AD10030.png b/org.adempiere.ui.swing/src/org/compiere/images/AD10030.png
similarity index 100%
rename from client/src/org/compiere/images/AD10030.png
rename to org.adempiere.ui.swing/src/org/compiere/images/AD10030.png
diff --git a/client/src/org/compiere/images/AD10030HR.png b/org.adempiere.ui.swing/src/org/compiere/images/AD10030HR.png
similarity index 100%
rename from client/src/org/compiere/images/AD10030HR.png
rename to org.adempiere.ui.swing/src/org/compiere/images/AD10030HR.png
diff --git a/client/src/org/compiere/images/AD16.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD16.gif
similarity index 100%
rename from client/src/org/compiere/images/AD16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AD16.gif
diff --git a/client/src/org/compiere/images/AD32.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD32.gif
similarity index 100%
rename from client/src/org/compiere/images/AD32.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AD32.gif
diff --git a/client/src/org/compiere/images/ADempiereHR_.png b/org.adempiere.ui.swing/src/org/compiere/images/ADempiereHR_.png
similarity index 100%
rename from client/src/org/compiere/images/ADempiereHR_.png
rename to org.adempiere.ui.swing/src/org/compiere/images/ADempiereHR_.png
diff --git a/client/src/org/compiere/images/ADempiere_.png b/org.adempiere.ui.swing/src/org/compiere/images/ADempiere_.png
similarity index 100%
rename from client/src/org/compiere/images/ADempiere_.png
rename to org.adempiere.ui.swing/src/org/compiere/images/ADempiere_.png
diff --git a/client/src/org/compiere/images/About16.gif b/org.adempiere.ui.swing/src/org/compiere/images/About16.gif
similarity index 100%
rename from client/src/org/compiere/images/About16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/About16.gif
diff --git a/client/src/org/compiere/images/About24.gif b/org.adempiere.ui.swing/src/org/compiere/images/About24.gif
similarity index 100%
rename from client/src/org/compiere/images/About24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/About24.gif
diff --git a/client/src/org/compiere/images/Account10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Account10.gif
similarity index 100%
rename from client/src/org/compiere/images/Account10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Account10.gif
diff --git a/client/src/org/compiere/images/Account16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Account16.gif
similarity index 100%
rename from client/src/org/compiere/images/Account16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Account16.gif
diff --git a/client/src/org/compiere/images/Account24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Account24.gif
similarity index 100%
rename from client/src/org/compiere/images/Account24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Account24.gif
diff --git a/serverRoot/AdemPiere150x50.gif b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiere150x50.gif
similarity index 100%
rename from serverRoot/AdemPiere150x50.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AdemPiere150x50.gif
diff --git a/client/src/org/compiere/images/AdemPiereCom.gif b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.gif
similarity index 100%
rename from client/src/org/compiere/images/AdemPiereCom.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.gif
diff --git a/client/src/org/compiere/images/AdemPiereCom.jpg b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.jpg
similarity index 100%
rename from client/src/org/compiere/images/AdemPiereCom.jpg
rename to org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.jpg
diff --git a/client/src/org/compiere/images/AdemPiereCom.png b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.png
similarity index 100%
rename from client/src/org/compiere/images/AdemPiereCom.png
rename to org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.png
diff --git a/client/src/org/compiere/images/AdemPiereComHR.png b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComHR.png
similarity index 100%
rename from client/src/org/compiere/images/AdemPiereComHR.png
rename to org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComHR.png
diff --git a/client/src/org/compiere/images/AdemPiereComx.png b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComx.png
similarity index 100%
rename from client/src/org/compiere/images/AdemPiereComx.png
rename to org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComx.png
diff --git a/client/src/org/compiere/images/Adempiere.gif b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.gif
similarity index 100%
rename from client/src/org/compiere/images/Adempiere.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Adempiere.gif
diff --git a/client/src/org/compiere/images/Adempiere.jpg b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.jpg
similarity index 100%
rename from client/src/org/compiere/images/Adempiere.jpg
rename to org.adempiere.ui.swing/src/org/compiere/images/Adempiere.jpg
diff --git a/client/src/org/compiere/images/Adempiere.png b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.png
similarity index 100%
rename from client/src/org/compiere/images/Adempiere.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Adempiere.png
diff --git a/serverRoot/Adempiere120x60.gif b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere120x60.gif
similarity index 100%
rename from serverRoot/Adempiere120x60.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Adempiere120x60.gif
diff --git a/client/src/org/compiere/images/AdempiereHR.png b/org.adempiere.ui.swing/src/org/compiere/images/AdempiereHR.png
similarity index 100%
rename from client/src/org/compiere/images/AdempiereHR.png
rename to org.adempiere.ui.swing/src/org/compiere/images/AdempiereHR.png
diff --git a/client/src/org/compiere/images/Adempierex.png b/org.adempiere.ui.swing/src/org/compiere/images/Adempierex.png
similarity index 100%
rename from client/src/org/compiere/images/Adempierex.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Adempierex.png
diff --git a/client/src/org/compiere/images/Archive16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Archive16.gif
similarity index 100%
rename from client/src/org/compiere/images/Archive16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Archive16.gif
diff --git a/client/src/org/compiere/images/Archive24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Archive24.gif
similarity index 100%
rename from client/src/org/compiere/images/Archive24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Archive24.gif
diff --git a/client/src/org/compiere/images/Assignment10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Assignment10.gif
similarity index 100%
rename from client/src/org/compiere/images/Assignment10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Assignment10.gif
diff --git a/client/src/org/compiere/images/Assignment16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Assignment16.gif
similarity index 100%
rename from client/src/org/compiere/images/Assignment16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Assignment16.gif
diff --git a/client/src/org/compiere/images/Assignment24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Assignment24.gif
similarity index 100%
rename from client/src/org/compiere/images/Assignment24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Assignment24.gif
diff --git a/client/src/org/compiere/images/Attachment16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Attachment16.gif
similarity index 100%
rename from client/src/org/compiere/images/Attachment16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Attachment16.gif
diff --git a/client/src/org/compiere/images/Attachment24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Attachment24.gif
similarity index 100%
rename from client/src/org/compiere/images/Attachment24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Attachment24.gif
diff --git a/client/src/org/compiere/images/Attachment24D.gif b/org.adempiere.ui.swing/src/org/compiere/images/Attachment24D.gif
similarity index 100%
rename from client/src/org/compiere/images/Attachment24D.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Attachment24D.gif
diff --git a/client/src/org/compiere/images/AttachmentX16.gif b/org.adempiere.ui.swing/src/org/compiere/images/AttachmentX16.gif
similarity index 100%
rename from client/src/org/compiere/images/AttachmentX16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AttachmentX16.gif
diff --git a/client/src/org/compiere/images/AttachmentX16_grey.gif b/org.adempiere.ui.swing/src/org/compiere/images/AttachmentX16_grey.gif
similarity index 100%
rename from client/src/org/compiere/images/AttachmentX16_grey.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AttachmentX16_grey.gif
diff --git a/client/src/org/compiere/images/AttachmentX24.gif b/org.adempiere.ui.swing/src/org/compiere/images/AttachmentX24.gif
similarity index 100%
rename from client/src/org/compiere/images/AttachmentX24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/AttachmentX24.gif
diff --git a/client/src/org/compiere/images/BPartner10.gif b/org.adempiere.ui.swing/src/org/compiere/images/BPartner10.gif
similarity index 100%
rename from client/src/org/compiere/images/BPartner10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/BPartner10.gif
diff --git a/client/src/org/compiere/images/BPartner16.gif b/org.adempiere.ui.swing/src/org/compiere/images/BPartner16.gif
similarity index 100%
rename from client/src/org/compiere/images/BPartner16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/BPartner16.gif
diff --git a/client/src/org/compiere/images/BPartner24.gif b/org.adempiere.ui.swing/src/org/compiere/images/BPartner24.gif
similarity index 100%
rename from client/src/org/compiere/images/BPartner24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/BPartner24.gif
diff --git a/client/src/org/compiere/images/Bold16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Bold16.gif
similarity index 100%
rename from client/src/org/compiere/images/Bold16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Bold16.gif
diff --git a/client/src/org/compiere/images/C10030.gif b/org.adempiere.ui.swing/src/org/compiere/images/C10030.gif
similarity index 100%
rename from client/src/org/compiere/images/C10030.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/C10030.gif
diff --git a/client/src/org/compiere/images/C10030.jpg b/org.adempiere.ui.swing/src/org/compiere/images/C10030.jpg
similarity index 100%
rename from client/src/org/compiere/images/C10030.jpg
rename to org.adempiere.ui.swing/src/org/compiere/images/C10030.jpg
diff --git a/client/src/org/compiere/images/C10030.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030.png
similarity index 100%
rename from client/src/org/compiere/images/C10030.png
rename to org.adempiere.ui.swing/src/org/compiere/images/C10030.png
diff --git a/client/src/org/compiere/images/C10030HR.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030HR.png
similarity index 100%
rename from client/src/org/compiere/images/C10030HR.png
rename to org.adempiere.ui.swing/src/org/compiere/images/C10030HR.png
diff --git a/client/src/org/compiere/images/C10030x.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030x.png
similarity index 100%
rename from client/src/org/compiere/images/C10030x.png
rename to org.adempiere.ui.swing/src/org/compiere/images/C10030x.png
diff --git a/client/src/org/compiere/images/C10030xHR.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030xHR.png
similarity index 100%
rename from client/src/org/compiere/images/C10030xHR.png
rename to org.adempiere.ui.swing/src/org/compiere/images/C10030xHR.png
diff --git a/client/src/org/compiere/images/C16.gif b/org.adempiere.ui.swing/src/org/compiere/images/C16.gif
similarity index 100%
rename from client/src/org/compiere/images/C16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/C16.gif
diff --git a/serverRoot/C32.gif b/org.adempiere.ui.swing/src/org/compiere/images/C32.gif
similarity index 100%
rename from serverRoot/C32.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/C32.gif
diff --git a/client/src/org/compiere/images/Calculator10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Calculator10.gif
similarity index 100%
rename from client/src/org/compiere/images/Calculator10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Calculator10.gif
diff --git a/client/src/org/compiere/images/Calculator16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Calculator16.gif
similarity index 100%
rename from client/src/org/compiere/images/Calculator16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Calculator16.gif
diff --git a/client/src/org/compiere/images/Calculator24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Calculator24.gif
similarity index 100%
rename from client/src/org/compiere/images/Calculator24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Calculator24.gif
diff --git a/client/src/org/compiere/images/Calendar10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Calendar10.gif
similarity index 100%
rename from client/src/org/compiere/images/Calendar10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Calendar10.gif
diff --git a/client/src/org/compiere/images/Calendar16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Calendar16.gif
similarity index 100%
rename from client/src/org/compiere/images/Calendar16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Calendar16.gif
diff --git a/client/src/org/compiere/images/Calendar24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Calendar24.gif
similarity index 100%
rename from client/src/org/compiere/images/Calendar24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Calendar24.gif
diff --git a/client/src/org/compiere/images/Cancel10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Cancel10.gif
similarity index 100%
rename from client/src/org/compiere/images/Cancel10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Cancel10.gif
diff --git a/client/src/org/compiere/images/Cancel16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Cancel16.gif
similarity index 100%
rename from client/src/org/compiere/images/Cancel16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Cancel16.gif
diff --git a/client/src/org/compiere/images/Cancel24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Cancel24.gif
similarity index 100%
rename from client/src/org/compiere/images/Cancel24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Cancel24.gif
diff --git a/client/src/org/compiere/images/ChangeLog16.png b/org.adempiere.ui.swing/src/org/compiere/images/ChangeLog16.png
similarity index 100%
rename from client/src/org/compiere/images/ChangeLog16.png
rename to org.adempiere.ui.swing/src/org/compiere/images/ChangeLog16.png
diff --git a/client/src/org/compiere/images/Chat16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Chat16.gif
similarity index 100%
rename from client/src/org/compiere/images/Chat16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Chat16.gif
diff --git a/client/src/org/compiere/images/Chat24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Chat24.gif
similarity index 100%
rename from client/src/org/compiere/images/Chat24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Chat24.gif
diff --git a/client/src/org/compiere/images/ChatX16.gif b/org.adempiere.ui.swing/src/org/compiere/images/ChatX16.gif
similarity index 100%
rename from client/src/org/compiere/images/ChatX16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ChatX16.gif
diff --git a/client/src/org/compiere/images/ChatX24.gif b/org.adempiere.ui.swing/src/org/compiere/images/ChatX24.gif
similarity index 100%
rename from client/src/org/compiere/images/ChatX24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ChatX24.gif
diff --git a/client/src/org/compiere/images/ComPiereCom.gif b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.gif
similarity index 100%
rename from client/src/org/compiere/images/ComPiereCom.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.gif
diff --git a/client/src/org/compiere/images/ComPiereCom.jpg b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.jpg
similarity index 100%
rename from client/src/org/compiere/images/ComPiereCom.jpg
rename to org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.jpg
diff --git a/client/src/org/compiere/images/ComPiereCom.png b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.png
similarity index 100%
rename from client/src/org/compiere/images/ComPiereCom.png
rename to org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.png
diff --git a/client/src/org/compiere/images/ComPiereComHR.png b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComHR.png
similarity index 100%
rename from client/src/org/compiere/images/ComPiereComHR.png
rename to org.adempiere.ui.swing/src/org/compiere/images/ComPiereComHR.png
diff --git a/client/src/org/compiere/images/ComPiereComx.png b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComx.png
similarity index 100%
rename from client/src/org/compiere/images/ComPiereComx.png
rename to org.adempiere.ui.swing/src/org/compiere/images/ComPiereComx.png
diff --git a/client/src/org/compiere/images/Compiere.gif b/org.adempiere.ui.swing/src/org/compiere/images/Compiere.gif
similarity index 100%
rename from client/src/org/compiere/images/Compiere.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Compiere.gif
diff --git a/client/src/org/compiere/images/Compiere.jpg b/org.adempiere.ui.swing/src/org/compiere/images/Compiere.jpg
similarity index 100%
rename from client/src/org/compiere/images/Compiere.jpg
rename to org.adempiere.ui.swing/src/org/compiere/images/Compiere.jpg
diff --git a/client/src/org/compiere/images/Compiere.png b/org.adempiere.ui.swing/src/org/compiere/images/Compiere.png
similarity index 100%
rename from client/src/org/compiere/images/Compiere.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Compiere.png
diff --git a/client/src/org/compiere/images/CompiereHR.png b/org.adempiere.ui.swing/src/org/compiere/images/CompiereHR.png
similarity index 100%
rename from client/src/org/compiere/images/CompiereHR.png
rename to org.adempiere.ui.swing/src/org/compiere/images/CompiereHR.png
diff --git a/client/src/org/compiere/images/Compierex.png b/org.adempiere.ui.swing/src/org/compiere/images/Compierex.png
similarity index 100%
rename from client/src/org/compiere/images/Compierex.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Compierex.png
diff --git a/client/src/org/compiere/images/Copy16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Copy16.gif
similarity index 100%
rename from client/src/org/compiere/images/Copy16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Copy16.gif
diff --git a/client/src/org/compiere/images/Copy24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Copy24.gif
similarity index 100%
rename from client/src/org/compiere/images/Copy24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Copy24.gif
diff --git a/client/src/org/compiere/images/Customize16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Customize16.gif
similarity index 100%
rename from client/src/org/compiere/images/Customize16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Customize16.gif
diff --git a/client/src/org/compiere/images/Customize24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Customize24.gif
similarity index 100%
rename from client/src/org/compiere/images/Customize24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Customize24.gif
diff --git a/client/src/org/compiere/images/Delete16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Delete16.gif
similarity index 100%
rename from client/src/org/compiere/images/Delete16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Delete16.gif
diff --git a/client/src/org/compiere/images/Delete24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Delete24.gif
similarity index 100%
rename from client/src/org/compiere/images/Delete24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Delete24.gif
diff --git a/client/src/org/compiere/images/DeleteSelection16.gif b/org.adempiere.ui.swing/src/org/compiere/images/DeleteSelection16.gif
similarity index 100%
rename from client/src/org/compiere/images/DeleteSelection16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/DeleteSelection16.gif
diff --git a/client/src/org/compiere/images/DeleteSelection24.gif b/org.adempiere.ui.swing/src/org/compiere/images/DeleteSelection24.gif
similarity index 100%
rename from client/src/org/compiere/images/DeleteSelection24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/DeleteSelection24.gif
diff --git a/client/src/org/compiere/images/Detail16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Detail16.gif
similarity index 100%
rename from client/src/org/compiere/images/Detail16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Detail16.gif
diff --git a/client/src/org/compiere/images/Detail24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Detail24.gif
similarity index 100%
rename from client/src/org/compiere/images/Detail24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Detail24.gif
diff --git a/client/src/org/compiere/images/DragCursor32.gif b/org.adempiere.ui.swing/src/org/compiere/images/DragCursor32.gif
similarity index 100%
rename from client/src/org/compiere/images/DragCursor32.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/DragCursor32.gif
diff --git a/client/src/org/compiere/images/EMailSupport16.gif b/org.adempiere.ui.swing/src/org/compiere/images/EMailSupport16.gif
similarity index 100%
rename from client/src/org/compiere/images/EMailSupport16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/EMailSupport16.gif
diff --git a/client/src/org/compiere/images/EMailSupport24.gif b/org.adempiere.ui.swing/src/org/compiere/images/EMailSupport24.gif
similarity index 100%
rename from client/src/org/compiere/images/EMailSupport24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/EMailSupport24.gif
diff --git a/client/src/org/compiere/images/Edit16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Edit16.gif
similarity index 100%
rename from client/src/org/compiere/images/Edit16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Edit16.gif
diff --git a/client/src/org/compiere/images/Edit24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Edit24.gif
similarity index 100%
rename from client/src/org/compiere/images/Edit24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Edit24.gif
diff --git a/client/src/org/compiere/images/Editor16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Editor16.gif
similarity index 100%
rename from client/src/org/compiere/images/Editor16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Editor16.gif
diff --git a/client/src/org/compiere/images/Editor24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Editor24.gif
similarity index 100%
rename from client/src/org/compiere/images/Editor24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Editor24.gif
diff --git a/client/src/org/compiere/images/End16.gif b/org.adempiere.ui.swing/src/org/compiere/images/End16.gif
similarity index 100%
rename from client/src/org/compiere/images/End16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/End16.gif
diff --git a/client/src/org/compiere/images/End24.gif b/org.adempiere.ui.swing/src/org/compiere/images/End24.gif
similarity index 100%
rename from client/src/org/compiere/images/End24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/End24.gif
diff --git a/client/src/org/compiere/images/Error32.gif b/org.adempiere.ui.swing/src/org/compiere/images/Error32.gif
similarity index 100%
rename from client/src/org/compiere/images/Error32.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Error32.gif
diff --git a/client/src/org/compiere/images/Exit16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Exit16.gif
similarity index 100%
rename from client/src/org/compiere/images/Exit16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Exit16.gif
diff --git a/client/src/org/compiere/images/Exit24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Exit24.gif
similarity index 100%
rename from client/src/org/compiere/images/Exit24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Exit24.gif
diff --git a/client/src/org/compiere/images/Export16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Export16.gif
similarity index 100%
rename from client/src/org/compiere/images/Export16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Export16.gif
diff --git a/client/src/org/compiere/images/Export16X.gif b/org.adempiere.ui.swing/src/org/compiere/images/Export16X.gif
similarity index 100%
rename from client/src/org/compiere/images/Export16X.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Export16X.gif
diff --git a/client/src/org/compiere/images/Export24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Export24.gif
similarity index 100%
rename from client/src/org/compiere/images/Export24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Export24.gif
diff --git a/client/src/org/compiere/images/Export24X.gif b/org.adempiere.ui.swing/src/org/compiere/images/Export24X.gif
similarity index 100%
rename from client/src/org/compiere/images/Export24X.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Export24X.gif
diff --git a/client/src/org/compiere/images/ExportX16.gif b/org.adempiere.ui.swing/src/org/compiere/images/ExportX16.gif
similarity index 100%
rename from client/src/org/compiere/images/ExportX16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ExportX16.gif
diff --git a/client/src/org/compiere/images/ExportX24.gif b/org.adempiere.ui.swing/src/org/compiere/images/ExportX24.gif
similarity index 100%
rename from client/src/org/compiere/images/ExportX24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ExportX24.gif
diff --git a/client/src/org/compiere/images/FastBack24.gif b/org.adempiere.ui.swing/src/org/compiere/images/FastBack24.gif
similarity index 100%
rename from client/src/org/compiere/images/FastBack24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/FastBack24.gif
diff --git a/client/src/org/compiere/images/FastForward24.gif b/org.adempiere.ui.swing/src/org/compiere/images/FastForward24.gif
similarity index 100%
rename from client/src/org/compiere/images/FastForward24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/FastForward24.gif
diff --git a/client/src/org/compiere/images/Find16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Find16.gif
similarity index 100%
rename from client/src/org/compiere/images/Find16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Find16.gif
diff --git a/client/src/org/compiere/images/Find24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Find24.gif
similarity index 100%
rename from client/src/org/compiere/images/Find24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Find24.gif
diff --git a/client/src/org/compiere/images/FindX16.gif b/org.adempiere.ui.swing/src/org/compiere/images/FindX16.gif
similarity index 100%
rename from client/src/org/compiere/images/FindX16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/FindX16.gif
diff --git a/client/src/org/compiere/images/FindX24.gif b/org.adempiere.ui.swing/src/org/compiere/images/FindX24.gif
similarity index 100%
rename from client/src/org/compiere/images/FindX24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/FindX24.gif
diff --git a/client/src/org/compiere/images/First16.gif b/org.adempiere.ui.swing/src/org/compiere/images/First16.gif
similarity index 100%
rename from client/src/org/compiere/images/First16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/First16.gif
diff --git a/client/src/org/compiere/images/First24.gif b/org.adempiere.ui.swing/src/org/compiere/images/First24.gif
similarity index 100%
rename from client/src/org/compiere/images/First24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/First24.gif
diff --git a/client/src/org/compiere/images/First24D.gif b/org.adempiere.ui.swing/src/org/compiere/images/First24D.gif
similarity index 100%
rename from client/src/org/compiere/images/First24D.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/First24D.gif
diff --git a/client/src/org/compiere/images/Folder16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Folder16.gif
similarity index 100%
rename from client/src/org/compiere/images/Folder16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Folder16.gif
diff --git a/client/src/org/compiere/images/Folder24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Folder24.gif
similarity index 100%
rename from client/src/org/compiere/images/Folder24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Folder24.gif
diff --git a/client/src/org/compiere/images/GetMail16.gif b/org.adempiere.ui.swing/src/org/compiere/images/GetMail16.gif
similarity index 100%
rename from client/src/org/compiere/images/GetMail16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/GetMail16.gif
diff --git a/client/src/org/compiere/images/GetMail24.gif b/org.adempiere.ui.swing/src/org/compiere/images/GetMail24.gif
similarity index 100%
rename from client/src/org/compiere/images/GetMail24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/GetMail24.gif
diff --git a/client/src/org/compiere/images/Help16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Help16.gif
similarity index 100%
rename from client/src/org/compiere/images/Help16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Help16.gif
diff --git a/client/src/org/compiere/images/Help24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Help24.gif
similarity index 100%
rename from client/src/org/compiere/images/Help24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Help24.gif
diff --git a/client/src/org/compiere/images/History16.gif b/org.adempiere.ui.swing/src/org/compiere/images/History16.gif
similarity index 100%
rename from client/src/org/compiere/images/History16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/History16.gif
diff --git a/client/src/org/compiere/images/History24.gif b/org.adempiere.ui.swing/src/org/compiere/images/History24.gif
similarity index 100%
rename from client/src/org/compiere/images/History24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/History24.gif
diff --git a/client/src/org/compiere/images/History24D.gif b/org.adempiere.ui.swing/src/org/compiere/images/History24D.gif
similarity index 100%
rename from client/src/org/compiere/images/History24D.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/History24D.gif
diff --git a/client/src/org/compiere/images/HistoryX16.gif b/org.adempiere.ui.swing/src/org/compiere/images/HistoryX16.gif
similarity index 100%
rename from client/src/org/compiere/images/HistoryX16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/HistoryX16.gif
diff --git a/client/src/org/compiere/images/HistoryX24.gif b/org.adempiere.ui.swing/src/org/compiere/images/HistoryX24.gif
similarity index 100%
rename from client/src/org/compiere/images/HistoryX24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/HistoryX24.gif
diff --git a/client/src/org/compiere/images/Home16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Home16.gif
similarity index 100%
rename from client/src/org/compiere/images/Home16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Home16.gif
diff --git a/client/src/org/compiere/images/Home24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Home24.gif
similarity index 100%
rename from client/src/org/compiere/images/Home24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Home24.gif
diff --git a/client/src/org/compiere/images/Ignore16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Ignore16.gif
similarity index 100%
rename from client/src/org/compiere/images/Ignore16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Ignore16.gif
diff --git a/client/src/org/compiere/images/Ignore24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Ignore24.gif
similarity index 100%
rename from client/src/org/compiere/images/Ignore24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Ignore24.gif
diff --git a/client/src/org/compiere/images/Import16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Import16.gif
similarity index 100%
rename from client/src/org/compiere/images/Import16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Import16.gif
diff --git a/client/src/org/compiere/images/Import24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Import24.gif
similarity index 100%
rename from client/src/org/compiere/images/Import24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Import24.gif
diff --git a/client/src/org/compiere/images/Info16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Info16.gif
similarity index 100%
rename from client/src/org/compiere/images/Info16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Info16.gif
diff --git a/client/src/org/compiere/images/Info24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Info24.gif
similarity index 100%
rename from client/src/org/compiere/images/Info24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Info24.gif
diff --git a/client/src/org/compiere/images/InfoAccount16.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoAccount16.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoAccount16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoAccount16.gif
diff --git a/client/src/org/compiere/images/InfoAccount24.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoAccount24.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoAccount24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoAccount24.gif
diff --git a/client/src/org/compiere/images/InfoBPartner16.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoBPartner16.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoBPartner16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoBPartner16.gif
diff --git a/client/src/org/compiere/images/InfoBPartner24.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoBPartner24.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoBPartner24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoBPartner24.gif
diff --git a/client/src/org/compiere/images/InfoProduct16.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoProduct16.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoProduct16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoProduct16.gif
diff --git a/client/src/org/compiere/images/InfoProduct24.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoProduct24.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoProduct24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoProduct24.gif
diff --git a/client/src/org/compiere/images/InfoSchedule16.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoSchedule16.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoSchedule16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoSchedule16.gif
diff --git a/client/src/org/compiere/images/InfoSchedule24.gif b/org.adempiere.ui.swing/src/org/compiere/images/InfoSchedule24.gif
similarity index 100%
rename from client/src/org/compiere/images/InfoSchedule24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/InfoSchedule24.gif
diff --git a/client/src/org/compiere/images/Inform32.gif b/org.adempiere.ui.swing/src/org/compiere/images/Inform32.gif
similarity index 100%
rename from client/src/org/compiere/images/Inform32.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Inform32.gif
diff --git a/client/src/org/compiere/images/Italic16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Italic16.gif
similarity index 100%
rename from client/src/org/compiere/images/Italic16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Italic16.gif
diff --git a/client/src/org/compiere/images/Java_anim.bak.gif b/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.bak.gif
similarity index 100%
rename from client/src/org/compiere/images/Java_anim.bak.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Java_anim.bak.gif
diff --git a/client/src/org/compiere/images/Java_anim.gif b/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.gif
similarity index 100%
rename from client/src/org/compiere/images/Java_anim.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Java_anim.gif
diff --git a/client/src/org/compiere/images/Java_logo.gif b/org.adempiere.ui.swing/src/org/compiere/images/Java_logo.gif
similarity index 100%
rename from client/src/org/compiere/images/Java_logo.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Java_logo.gif
diff --git a/client/src/org/compiere/images/Last16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Last16.gif
similarity index 100%
rename from client/src/org/compiere/images/Last16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Last16.gif
diff --git a/client/src/org/compiere/images/Last24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Last24.gif
similarity index 100%
rename from client/src/org/compiere/images/Last24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Last24.gif
diff --git a/client/src/org/compiere/images/Last24D.gif b/org.adempiere.ui.swing/src/org/compiere/images/Last24D.gif
similarity index 100%
rename from client/src/org/compiere/images/Last24D.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Last24D.gif
diff --git a/client/src/org/compiere/images/Location10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Location10.gif
similarity index 100%
rename from client/src/org/compiere/images/Location10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Location10.gif
diff --git a/client/src/org/compiere/images/Locator10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Locator10.gif
similarity index 100%
rename from client/src/org/compiere/images/Locator10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Locator10.gif
diff --git a/client/src/org/compiere/images/Lock16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Lock16.gif
similarity index 100%
rename from client/src/org/compiere/images/Lock16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Lock16.gif
diff --git a/client/src/org/compiere/images/Lock24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Lock24.gif
similarity index 100%
rename from client/src/org/compiere/images/Lock24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Lock24.gif
diff --git a/client/src/org/compiere/images/LockX16.gif b/org.adempiere.ui.swing/src/org/compiere/images/LockX16.gif
similarity index 100%
rename from client/src/org/compiere/images/LockX16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/LockX16.gif
diff --git a/client/src/org/compiere/images/LockX24.gif b/org.adempiere.ui.swing/src/org/compiere/images/LockX24.gif
similarity index 100%
rename from client/src/org/compiere/images/LockX24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/LockX24.gif
diff --git a/client/src/org/compiere/images/Logo.gif b/org.adempiere.ui.swing/src/org/compiere/images/Logo.gif
similarity index 100%
rename from client/src/org/compiere/images/Logo.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Logo.gif
diff --git a/client/src/org/compiere/images/Logout16.png b/org.adempiere.ui.swing/src/org/compiere/images/Logout16.png
similarity index 100%
rename from client/src/org/compiere/images/Logout16.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Logout16.png
diff --git a/client/src/org/compiere/images/Logout24.png b/org.adempiere.ui.swing/src/org/compiere/images/Logout24.png
similarity index 100%
rename from client/src/org/compiere/images/Logout24.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Logout24.png
diff --git a/client/src/org/compiere/images/Minus16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Minus16.gif
similarity index 100%
rename from client/src/org/compiere/images/Minus16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Minus16.gif
diff --git a/client/src/org/compiere/images/Minus24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Minus24.gif
similarity index 100%
rename from client/src/org/compiere/images/Minus24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Minus24.gif
diff --git a/client/src/org/compiere/images/Multi16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Multi16.gif
similarity index 100%
rename from client/src/org/compiere/images/Multi16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Multi16.gif
diff --git a/client/src/org/compiere/images/Multi24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Multi24.gif
similarity index 100%
rename from client/src/org/compiere/images/Multi24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Multi24.gif
diff --git a/client/src/org/compiere/images/MultiX16.gif b/org.adempiere.ui.swing/src/org/compiere/images/MultiX16.gif
similarity index 100%
rename from client/src/org/compiere/images/MultiX16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/MultiX16.gif
diff --git a/client/src/org/compiere/images/MultiX24.gif b/org.adempiere.ui.swing/src/org/compiere/images/MultiX24.gif
similarity index 100%
rename from client/src/org/compiere/images/MultiX24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/MultiX24.gif
diff --git a/client/src/org/compiere/images/New16.gif b/org.adempiere.ui.swing/src/org/compiere/images/New16.gif
similarity index 100%
rename from client/src/org/compiere/images/New16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/New16.gif
diff --git a/client/src/org/compiere/images/New24.gif b/org.adempiere.ui.swing/src/org/compiere/images/New24.gif
similarity index 100%
rename from client/src/org/compiere/images/New24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/New24.gif
diff --git a/client/src/org/compiere/images/Next16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Next16.gif
similarity index 100%
rename from client/src/org/compiere/images/Next16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Next16.gif
diff --git a/client/src/org/compiere/images/Next24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Next24.gif
similarity index 100%
rename from client/src/org/compiere/images/Next24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Next24.gif
diff --git a/client/src/org/compiere/images/Next24D.gif b/org.adempiere.ui.swing/src/org/compiere/images/Next24D.gif
similarity index 100%
rename from client/src/org/compiere/images/Next24D.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Next24D.gif
diff --git a/client/src/org/compiere/images/Normal16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Normal16.gif
similarity index 100%
rename from client/src/org/compiere/images/Normal16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Normal16.gif
diff --git a/client/src/org/compiere/images/Ok16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Ok16.gif
similarity index 100%
rename from client/src/org/compiere/images/Ok16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Ok16.gif
diff --git a/client/src/org/compiere/images/Ok24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Ok24.gif
similarity index 100%
rename from client/src/org/compiere/images/Ok24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Ok24.gif
diff --git a/client/src/org/compiere/images/Online10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Online10.gif
similarity index 100%
rename from client/src/org/compiere/images/Online10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Online10.gif
diff --git a/client/src/org/compiere/images/Online16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Online16.gif
similarity index 100%
rename from client/src/org/compiere/images/Online16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Online16.gif
diff --git a/client/src/org/compiere/images/Online24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Online24.gif
similarity index 100%
rename from client/src/org/compiere/images/Online24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Online24.gif
diff --git a/client/src/org/compiere/images/Open16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Open16.gif
similarity index 100%
rename from client/src/org/compiere/images/Open16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Open16.gif
diff --git a/client/src/org/compiere/images/Open24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Open24.gif
similarity index 100%
rename from client/src/org/compiere/images/Open24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Open24.gif
diff --git a/client/src/org/compiere/images/PAPanel.css b/org.adempiere.ui.swing/src/org/compiere/images/PAPanel.css
similarity index 100%
rename from client/src/org/compiere/images/PAPanel.css
rename to org.adempiere.ui.swing/src/org/compiere/images/PAPanel.css
diff --git a/client/src/org/compiere/images/PAttribute10.gif b/org.adempiere.ui.swing/src/org/compiere/images/PAttribute10.gif
similarity index 100%
rename from client/src/org/compiere/images/PAttribute10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PAttribute10.gif
diff --git a/client/src/org/compiere/images/PAttribute16.gif b/org.adempiere.ui.swing/src/org/compiere/images/PAttribute16.gif
similarity index 100%
rename from client/src/org/compiere/images/PAttribute16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PAttribute16.gif
diff --git a/client/src/org/compiere/images/PAttribute24.gif b/org.adempiere.ui.swing/src/org/compiere/images/PAttribute24.gif
similarity index 100%
rename from client/src/org/compiere/images/PAttribute24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PAttribute24.gif
diff --git a/client/src/org/compiere/images/PageSetup16.gif b/org.adempiere.ui.swing/src/org/compiere/images/PageSetup16.gif
similarity index 100%
rename from client/src/org/compiere/images/PageSetup16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PageSetup16.gif
diff --git a/client/src/org/compiere/images/PageSetup24.gif b/org.adempiere.ui.swing/src/org/compiere/images/PageSetup24.gif
similarity index 100%
rename from client/src/org/compiere/images/PageSetup24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PageSetup24.gif
diff --git a/client/src/org/compiere/images/Parent16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Parent16.gif
similarity index 100%
rename from client/src/org/compiere/images/Parent16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Parent16.gif
diff --git a/client/src/org/compiere/images/Parent24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Parent24.gif
similarity index 100%
rename from client/src/org/compiere/images/Parent24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Parent24.gif
diff --git a/client/src/org/compiere/images/Payment16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Payment16.gif
similarity index 100%
rename from client/src/org/compiere/images/Payment16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Payment16.gif
diff --git a/client/src/org/compiere/images/Payment24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Payment24.gif
similarity index 100%
rename from client/src/org/compiere/images/Payment24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Payment24.gif
diff --git a/client/src/org/compiere/images/PickOpen10.gif b/org.adempiere.ui.swing/src/org/compiere/images/PickOpen10.gif
similarity index 100%
rename from client/src/org/compiere/images/PickOpen10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PickOpen10.gif
diff --git a/client/src/org/compiere/images/Plus16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Plus16.gif
similarity index 100%
rename from client/src/org/compiere/images/Plus16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Plus16.gif
diff --git a/client/src/org/compiere/images/Plus24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Plus24.gif
similarity index 100%
rename from client/src/org/compiere/images/Plus24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Plus24.gif
diff --git a/client/src/org/compiere/images/Preference16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Preference16.gif
similarity index 100%
rename from client/src/org/compiere/images/Preference16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Preference16.gif
diff --git a/client/src/org/compiere/images/Preference24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Preference24.gif
similarity index 100%
rename from client/src/org/compiere/images/Preference24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Preference24.gif
diff --git a/client/src/org/compiere/images/Previous16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Previous16.gif
similarity index 100%
rename from client/src/org/compiere/images/Previous16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Previous16.gif
diff --git a/client/src/org/compiere/images/Previous24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Previous24.gif
similarity index 100%
rename from client/src/org/compiere/images/Previous24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Previous24.gif
diff --git a/client/src/org/compiere/images/Previous24D.gif b/org.adempiere.ui.swing/src/org/compiere/images/Previous24D.gif
similarity index 100%
rename from client/src/org/compiere/images/Previous24D.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Previous24D.gif
diff --git a/client/src/org/compiere/images/Print16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Print16.gif
similarity index 100%
rename from client/src/org/compiere/images/Print16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Print16.gif
diff --git a/client/src/org/compiere/images/Print24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Print24.gif
similarity index 100%
rename from client/src/org/compiere/images/Print24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Print24.gif
diff --git a/client/src/org/compiere/images/PrintPreview16.gif b/org.adempiere.ui.swing/src/org/compiere/images/PrintPreview16.gif
similarity index 100%
rename from client/src/org/compiere/images/PrintPreview16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PrintPreview16.gif
diff --git a/client/src/org/compiere/images/PrintPreview24.gif b/org.adempiere.ui.swing/src/org/compiere/images/PrintPreview24.gif
similarity index 100%
rename from client/src/org/compiere/images/PrintPreview24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PrintPreview24.gif
diff --git a/client/src/org/compiere/images/PrintScreen16.gif b/org.adempiere.ui.swing/src/org/compiere/images/PrintScreen16.gif
similarity index 100%
rename from client/src/org/compiere/images/PrintScreen16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PrintScreen16.gif
diff --git a/client/src/org/compiere/images/PrintScreen24.gif b/org.adempiere.ui.swing/src/org/compiere/images/PrintScreen24.gif
similarity index 100%
rename from client/src/org/compiere/images/PrintScreen24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/PrintScreen24.gif
diff --git a/client/src/org/compiere/images/Process16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Process16.gif
similarity index 100%
rename from client/src/org/compiere/images/Process16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Process16.gif
diff --git a/client/src/org/compiere/images/Process24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Process24.gif
similarity index 100%
rename from client/src/org/compiere/images/Process24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Process24.gif
diff --git a/client/src/org/compiere/images/Product10.gif b/org.adempiere.ui.swing/src/org/compiere/images/Product10.gif
similarity index 100%
rename from client/src/org/compiere/images/Product10.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Product10.gif
diff --git a/client/src/org/compiere/images/Product16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Product16.gif
similarity index 100%
rename from client/src/org/compiere/images/Product16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Product16.gif
diff --git a/client/src/org/compiere/images/Product24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Product24.gif
similarity index 100%
rename from client/src/org/compiere/images/Product24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Product24.gif
diff --git a/client/src/org/compiere/images/Question32.gif b/org.adempiere.ui.swing/src/org/compiere/images/Question32.gif
similarity index 100%
rename from client/src/org/compiere/images/Question32.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Question32.gif
diff --git a/client/src/org/compiere/images/Redo16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Redo16.gif
similarity index 100%
rename from client/src/org/compiere/images/Redo16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Redo16.gif
diff --git a/client/src/org/compiere/images/Redo24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Redo24.gif
similarity index 100%
rename from client/src/org/compiere/images/Redo24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Redo24.gif
diff --git a/client/src/org/compiere/images/Refresh16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Refresh16.gif
similarity index 100%
rename from client/src/org/compiere/images/Refresh16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Refresh16.gif
diff --git a/client/src/org/compiere/images/Refresh24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Refresh24.gif
similarity index 100%
rename from client/src/org/compiere/images/Refresh24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Refresh24.gif
diff --git a/client/src/org/compiere/images/Register16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Register16.gif
similarity index 100%
rename from client/src/org/compiere/images/Register16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Register16.gif
diff --git a/client/src/org/compiere/images/Register24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Register24.gif
similarity index 100%
rename from client/src/org/compiere/images/Register24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Register24.gif
diff --git a/client/src/org/compiere/images/Report16.png b/org.adempiere.ui.swing/src/org/compiere/images/Report16.png
similarity index 100%
rename from client/src/org/compiere/images/Report16.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Report16.png
diff --git a/client/src/org/compiere/images/Report24.png b/org.adempiere.ui.swing/src/org/compiere/images/Report24.png
similarity index 100%
rename from client/src/org/compiere/images/Report24.png
rename to org.adempiere.ui.swing/src/org/compiere/images/Report24.png
diff --git a/client/src/org/compiere/images/Request16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Request16.gif
similarity index 100%
rename from client/src/org/compiere/images/Request16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Request16.gif
diff --git a/client/src/org/compiere/images/Request24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Request24.gif
similarity index 100%
rename from client/src/org/compiere/images/Request24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Request24.gif
diff --git a/client/src/org/compiere/images/Reset16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Reset16.gif
similarity index 100%
rename from client/src/org/compiere/images/Reset16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Reset16.gif
diff --git a/client/src/org/compiere/images/Reset24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Reset24.gif
similarity index 100%
rename from client/src/org/compiere/images/Reset24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Reset24.gif
diff --git a/client/src/org/compiere/images/Save16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Save16.gif
similarity index 100%
rename from client/src/org/compiere/images/Save16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Save16.gif
diff --git a/client/src/org/compiere/images/Save24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Save24.gif
similarity index 100%
rename from client/src/org/compiere/images/Save24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Save24.gif
diff --git a/client/src/org/compiere/images/ScreenShot16.gif b/org.adempiere.ui.swing/src/org/compiere/images/ScreenShot16.gif
similarity index 100%
rename from client/src/org/compiere/images/ScreenShot16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ScreenShot16.gif
diff --git a/client/src/org/compiere/images/ScreenShot24.gif b/org.adempiere.ui.swing/src/org/compiere/images/ScreenShot24.gif
similarity index 100%
rename from client/src/org/compiere/images/ScreenShot24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ScreenShot24.gif
diff --git a/client/src/org/compiere/images/Script16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Script16.gif
similarity index 100%
rename from client/src/org/compiere/images/Script16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Script16.gif
diff --git a/client/src/org/compiere/images/Script24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Script24.gif
similarity index 100%
rename from client/src/org/compiere/images/Script24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Script24.gif
diff --git a/client/src/org/compiere/images/SelectAll16.png b/org.adempiere.ui.swing/src/org/compiere/images/SelectAll16.png
similarity index 100%
rename from client/src/org/compiere/images/SelectAll16.png
rename to org.adempiere.ui.swing/src/org/compiere/images/SelectAll16.png
diff --git a/client/src/org/compiere/images/SelectAll24.png b/org.adempiere.ui.swing/src/org/compiere/images/SelectAll24.png
similarity index 100%
rename from client/src/org/compiere/images/SelectAll24.png
rename to org.adempiere.ui.swing/src/org/compiere/images/SelectAll24.png
diff --git a/client/src/org/compiere/images/SendMail16.gif b/org.adempiere.ui.swing/src/org/compiere/images/SendMail16.gif
similarity index 100%
rename from client/src/org/compiere/images/SendMail16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/SendMail16.gif
diff --git a/client/src/org/compiere/images/SendMail24.gif b/org.adempiere.ui.swing/src/org/compiere/images/SendMail24.gif
similarity index 100%
rename from client/src/org/compiere/images/SendMail24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/SendMail24.gif
diff --git a/client/src/org/compiere/images/Server16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Server16.gif
similarity index 100%
rename from client/src/org/compiere/images/Server16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Server16.gif
diff --git a/client/src/org/compiere/images/Server24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Server24.gif
similarity index 100%
rename from client/src/org/compiere/images/Server24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Server24.gif
diff --git a/client/src/org/compiere/images/Setup16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Setup16.gif
similarity index 100%
rename from client/src/org/compiere/images/Setup16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Setup16.gif
diff --git a/client/src/org/compiere/images/Setup24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Setup24.gif
similarity index 100%
rename from client/src/org/compiere/images/Setup24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Setup24.gif
diff --git a/client/src/org/compiere/images/StepBack24.gif b/org.adempiere.ui.swing/src/org/compiere/images/StepBack24.gif
similarity index 100%
rename from client/src/org/compiere/images/StepBack24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/StepBack24.gif
diff --git a/client/src/org/compiere/images/StepForward24.gif b/org.adempiere.ui.swing/src/org/compiere/images/StepForward24.gif
similarity index 100%
rename from client/src/org/compiere/images/StepForward24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/StepForward24.gif
diff --git a/client/src/org/compiere/images/Summary16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Summary16.gif
similarity index 100%
rename from client/src/org/compiere/images/Summary16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Summary16.gif
diff --git a/client/src/org/compiere/images/Summary24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Summary24.gif
similarity index 100%
rename from client/src/org/compiere/images/Summary24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Summary24.gif
diff --git a/client/src/org/compiere/images/Translate16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Translate16.gif
similarity index 100%
rename from client/src/org/compiere/images/Translate16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Translate16.gif
diff --git a/client/src/org/compiere/images/Translate24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Translate24.gif
similarity index 100%
rename from client/src/org/compiere/images/Translate24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Translate24.gif
diff --git a/client/src/org/compiere/images/Underline16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Underline16.gif
similarity index 100%
rename from client/src/org/compiere/images/Underline16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Underline16.gif
diff --git a/client/src/org/compiere/images/Undo16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Undo16.gif
similarity index 100%
rename from client/src/org/compiere/images/Undo16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Undo16.gif
diff --git a/client/src/org/compiere/images/Undo24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Undo24.gif
similarity index 100%
rename from client/src/org/compiere/images/Undo24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Undo24.gif
diff --git a/client/src/org/compiere/images/VPreference16.gif b/org.adempiere.ui.swing/src/org/compiere/images/VPreference16.gif
similarity index 100%
rename from client/src/org/compiere/images/VPreference16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/VPreference16.gif
diff --git a/client/src/org/compiere/images/VPreference24.gif b/org.adempiere.ui.swing/src/org/compiere/images/VPreference24.gif
similarity index 100%
rename from client/src/org/compiere/images/VPreference24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/VPreference24.gif
diff --git a/client/src/org/compiere/images/Warn32.gif b/org.adempiere.ui.swing/src/org/compiere/images/Warn32.gif
similarity index 100%
rename from client/src/org/compiere/images/Warn32.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Warn32.gif
diff --git a/client/src/org/compiere/images/WinSize16.gif b/org.adempiere.ui.swing/src/org/compiere/images/WinSize16.gif
similarity index 100%
rename from client/src/org/compiere/images/WinSize16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/WinSize16.gif
diff --git a/client/src/org/compiere/images/WinSize24.gif b/org.adempiere.ui.swing/src/org/compiere/images/WinSize24.gif
similarity index 100%
rename from client/src/org/compiere/images/WinSize24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/WinSize24.gif
diff --git a/client/src/org/compiere/images/WorkFlow16.gif b/org.adempiere.ui.swing/src/org/compiere/images/WorkFlow16.gif
similarity index 100%
rename from client/src/org/compiere/images/WorkFlow16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/WorkFlow16.gif
diff --git a/client/src/org/compiere/images/WorkFlow24.gif b/org.adempiere.ui.swing/src/org/compiere/images/WorkFlow24.gif
similarity index 100%
rename from client/src/org/compiere/images/WorkFlow24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/WorkFlow24.gif
diff --git a/client/src/org/compiere/images/WorkFlow_16.gif b/org.adempiere.ui.swing/src/org/compiere/images/WorkFlow_16.gif
similarity index 100%
rename from client/src/org/compiere/images/WorkFlow_16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/WorkFlow_16.gif
diff --git a/client/src/org/compiere/images/WorkFlow_24.gif b/org.adempiere.ui.swing/src/org/compiere/images/WorkFlow_24.gif
similarity index 100%
rename from client/src/org/compiere/images/WorkFlow_24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/WorkFlow_24.gif
diff --git a/client/src/org/compiere/images/Zoom16.gif b/org.adempiere.ui.swing/src/org/compiere/images/Zoom16.gif
similarity index 100%
rename from client/src/org/compiere/images/Zoom16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Zoom16.gif
diff --git a/client/src/org/compiere/images/Zoom24.gif b/org.adempiere.ui.swing/src/org/compiere/images/Zoom24.gif
similarity index 100%
rename from client/src/org/compiere/images/Zoom24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/Zoom24.gif
diff --git a/client/src/org/compiere/images/ZoomAcross16.gif b/org.adempiere.ui.swing/src/org/compiere/images/ZoomAcross16.gif
similarity index 100%
rename from client/src/org/compiere/images/ZoomAcross16.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ZoomAcross16.gif
diff --git a/client/src/org/compiere/images/ZoomAcross24.gif b/org.adempiere.ui.swing/src/org/compiere/images/ZoomAcross24.gif
similarity index 100%
rename from client/src/org/compiere/images/ZoomAcross24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/ZoomAcross24.gif
diff --git a/client/src/org/compiere/images/downarrow.gif b/org.adempiere.ui.swing/src/org/compiere/images/downarrow.gif
similarity index 100%
rename from client/src/org/compiere/images/downarrow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/downarrow.gif
diff --git a/client/src/org/compiere/images/logo_ad.png b/org.adempiere.ui.swing/src/org/compiere/images/logo_ad.png
similarity index 100%
rename from client/src/org/compiere/images/logo_ad.png
rename to org.adempiere.ui.swing/src/org/compiere/images/logo_ad.png
diff --git a/client/src/org/compiere/images/mClosed.gif b/org.adempiere.ui.swing/src/org/compiere/images/mClosed.gif
similarity index 100%
rename from client/src/org/compiere/images/mClosed.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mClosed.gif
diff --git a/client/src/org/compiere/images/mDocAction.gif b/org.adempiere.ui.swing/src/org/compiere/images/mDocAction.gif
similarity index 100%
rename from client/src/org/compiere/images/mDocAction.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mDocAction.gif
diff --git a/client/src/org/compiere/images/mOpen.gif b/org.adempiere.ui.swing/src/org/compiere/images/mOpen.gif
similarity index 100%
rename from client/src/org/compiere/images/mOpen.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mOpen.gif
diff --git a/client/src/org/compiere/images/mProcess.gif b/org.adempiere.ui.swing/src/org/compiere/images/mProcess.gif
similarity index 100%
rename from client/src/org/compiere/images/mProcess.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mProcess.gif
diff --git a/client/src/org/compiere/images/mReport.gif b/org.adempiere.ui.swing/src/org/compiere/images/mReport.gif
similarity index 100%
rename from client/src/org/compiere/images/mReport.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mReport.gif
diff --git a/client/src/org/compiere/images/mSetVariable.gif b/org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.gif
similarity index 100%
rename from client/src/org/compiere/images/mSetVariable.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.gif
diff --git a/client/src/org/compiere/images/mUserChoice.gif b/org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.gif
similarity index 100%
rename from client/src/org/compiere/images/mUserChoice.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.gif
diff --git a/client/src/org/compiere/images/mWindow.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWindow.gif
similarity index 100%
rename from client/src/org/compiere/images/mWindow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWindow.gif
diff --git a/client/src/org/compiere/images/mWorkFlow.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.gif
similarity index 100%
rename from client/src/org/compiere/images/mWorkFlow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.gif
diff --git a/client/src/org/compiere/images/mWorkbench.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.gif
similarity index 100%
rename from client/src/org/compiere/images/mWorkbench.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.gif
diff --git a/client/src/org/compiere/images/standard.css b/org.adempiere.ui.swing/src/org/compiere/images/standard.css
similarity index 100%
rename from client/src/org/compiere/images/standard.css
rename to org.adempiere.ui.swing/src/org/compiere/images/standard.css
diff --git a/client/src/org/compiere/images/uparrow.gif b/org.adempiere.ui.swing/src/org/compiere/images/uparrow.gif
similarity index 100%
rename from client/src/org/compiere/images/uparrow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/uparrow.gif
diff --git a/client/src/org/compiere/images/wfBack24.gif b/org.adempiere.ui.swing/src/org/compiere/images/wfBack24.gif
similarity index 100%
rename from client/src/org/compiere/images/wfBack24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/wfBack24.gif
diff --git a/client/src/org/compiere/images/wfEnd24.gif b/org.adempiere.ui.swing/src/org/compiere/images/wfEnd24.gif
similarity index 100%
rename from client/src/org/compiere/images/wfEnd24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/wfEnd24.gif
diff --git a/client/src/org/compiere/images/wfNext24.gif b/org.adempiere.ui.swing/src/org/compiere/images/wfNext24.gif
similarity index 100%
rename from client/src/org/compiere/images/wfNext24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/wfNext24.gif
diff --git a/client/src/org/compiere/images/wfStart24.gif b/org.adempiere.ui.swing/src/org/compiere/images/wfStart24.gif
similarity index 100%
rename from client/src/org/compiere/images/wfStart24.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/wfStart24.gif
diff --git a/client/src/org/compiere/images/zip.gif b/org.adempiere.ui.swing/src/org/compiere/images/zip.gif
similarity index 100%
rename from client/src/org/compiere/images/zip.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/zip.gif
diff --git a/client/src/org/compiere/install/LanguageMaintenance.java b/org.adempiere.ui.swing/src/org/compiere/install/LanguageMaintenance.java
similarity index 100%
rename from client/src/org/compiere/install/LanguageMaintenance.java
rename to org.adempiere.ui.swing/src/org/compiere/install/LanguageMaintenance.java
diff --git a/client/src/org/compiere/install/VTranslationDialog.java b/org.adempiere.ui.swing/src/org/compiere/install/VTranslationDialog.java
similarity index 100%
rename from client/src/org/compiere/install/VTranslationDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/install/VTranslationDialog.java
diff --git a/client/src/org/compiere/install/package.html b/org.adempiere.ui.swing/src/org/compiere/install/package.html
similarity index 100%
rename from client/src/org/compiere/install/package.html
rename to org.adempiere.ui.swing/src/org/compiere/install/package.html
diff --git a/client/src/org/compiere/license.html b/org.adempiere.ui.swing/src/org/compiere/license.html
similarity index 100%
rename from client/src/org/compiere/license.html
rename to org.adempiere.ui.swing/src/org/compiere/license.html
diff --git a/client/src/org/compiere/minigrid/CheckRenderer.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/CheckRenderer.java
similarity index 100%
rename from client/src/org/compiere/minigrid/CheckRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/minigrid/CheckRenderer.java
diff --git a/client/src/org/compiere/minigrid/IDColumnEditor.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/IDColumnEditor.java
similarity index 100%
rename from client/src/org/compiere/minigrid/IDColumnEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/minigrid/IDColumnEditor.java
diff --git a/client/src/org/compiere/minigrid/IDColumnRenderer.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/IDColumnRenderer.java
similarity index 100%
rename from client/src/org/compiere/minigrid/IDColumnRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/minigrid/IDColumnRenderer.java
diff --git a/client/src/org/compiere/minigrid/MiniCellEditor.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniCellEditor.java
similarity index 100%
rename from client/src/org/compiere/minigrid/MiniCellEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/minigrid/MiniCellEditor.java
diff --git a/client/src/org/compiere/minigrid/MiniTable.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java
similarity index 100%
rename from client/src/org/compiere/minigrid/MiniTable.java
rename to org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java
diff --git a/client/src/org/compiere/minigrid/ROCellEditor.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/ROCellEditor.java
similarity index 100%
rename from client/src/org/compiere/minigrid/ROCellEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/minigrid/ROCellEditor.java
diff --git a/client/src/org/compiere/minigrid/package.html b/org.adempiere.ui.swing/src/org/compiere/minigrid/package.html
similarity index 100%
rename from client/src/org/compiere/minigrid/package.html
rename to org.adempiere.ui.swing/src/org/compiere/minigrid/package.html
diff --git a/client/src/org/compiere/plaf/Adempiere200x100.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/Adempiere200x100.gif
similarity index 100%
rename from client/src/org/compiere/plaf/Adempiere200x100.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/Adempiere200x100.gif
diff --git a/client/src/org/compiere/plaf/AquaTheme.java b/org.adempiere.ui.swing/src/org/compiere/plaf/AquaTheme.java
similarity index 100%
rename from client/src/org/compiere/plaf/AquaTheme.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/AquaTheme.java
diff --git a/client/src/org/compiere/plaf/CharcoalTheme.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CharcoalTheme.java
similarity index 100%
rename from client/src/org/compiere/plaf/CharcoalTheme.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CharcoalTheme.java
diff --git a/client/src/org/compiere/plaf/CompiereButtonListener.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereButtonListener.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java
diff --git a/client/src/org/compiere/plaf/CompiereButtonUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereButtonUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonUI.java
diff --git a/client/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java
diff --git a/client/src/org/compiere/plaf/CompiereCheckBoxUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereCheckBoxUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereCheckBoxUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereCheckBoxUI.java
diff --git a/client/src/org/compiere/plaf/CompiereColor.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereColor.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereColor.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereColor.java
diff --git a/client/src/org/compiere/plaf/CompiereComboBoxUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboBoxUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereComboBoxUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboBoxUI.java
diff --git a/client/src/org/compiere/plaf/CompiereComboPopup.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereComboPopup.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
diff --git a/client/src/org/compiere/plaf/CompiereLabelUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereLabelUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereLabelUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereLabelUI.java
diff --git a/client/src/org/compiere/plaf/CompiereLookAndFeel.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereLookAndFeel.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereLookAndFeel.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereLookAndFeel.java
diff --git a/client/src/org/compiere/plaf/CompiereMenuBarUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereMenuBarUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereMenuBarUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereMenuBarUI.java
diff --git a/client/src/org/compiere/plaf/CompiereMenuItemUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereMenuItemUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereMenuItemUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereMenuItemUI.java
diff --git a/client/src/org/compiere/plaf/CompiereMenuUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereMenuUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereMenuUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereMenuUI.java
diff --git a/client/src/org/compiere/plaf/CompierePanelUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompierePanelUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompierePanelUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompierePanelUI.java
diff --git a/client/src/org/compiere/plaf/CompiereRadioButtonUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereRadioButtonUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereRadioButtonUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereRadioButtonUI.java
diff --git a/client/src/org/compiere/plaf/CompiereRootPaneUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereRootPaneUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereRootPaneUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereRootPaneUI.java
diff --git a/client/src/org/compiere/plaf/CompiereScrollPaneUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereScrollPaneUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereScrollPaneUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereScrollPaneUI.java
diff --git a/client/src/org/compiere/plaf/CompiereSplitPaneDivider.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereSplitPaneDivider.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereSplitPaneDivider.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereSplitPaneDivider.java
diff --git a/client/src/org/compiere/plaf/CompiereSplitPaneUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereSplitPaneUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereSplitPaneUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereSplitPaneUI.java
diff --git a/client/src/org/compiere/plaf/CompiereTabbedPaneUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTabbedPaneUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereTabbedPaneUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTabbedPaneUI.java
diff --git a/client/src/org/compiere/plaf/CompiereTableHeaderUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTableHeaderUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereTableHeaderUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTableHeaderUI.java
diff --git a/client/src/org/compiere/plaf/CompiereTextAreaUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereTextAreaUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java
diff --git a/client/src/org/compiere/plaf/CompiereTheme.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTheme.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereTheme.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTheme.java
diff --git a/client/src/org/compiere/plaf/CompiereThemeBlueMetal.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereThemeBlueMetal.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereThemeBlueMetal.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereThemeBlueMetal.java
diff --git a/client/src/org/compiere/plaf/CompiereThemeEditor.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereThemeEditor.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereThemeEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereThemeEditor.java
diff --git a/client/src/org/compiere/plaf/CompiereThemeIce.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereThemeIce.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereThemeIce.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereThemeIce.java
diff --git a/client/src/org/compiere/plaf/CompiereToggleButtonUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToggleButtonUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereToggleButtonUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToggleButtonUI.java
diff --git a/client/src/org/compiere/plaf/CompiereToolBarUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolBarUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereToolBarUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolBarUI.java
diff --git a/client/src/org/compiere/plaf/CompiereToolTipUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereToolTipUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java
diff --git a/client/src/org/compiere/plaf/CompiereUtils.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereUtils.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereUtils.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereUtils.java
diff --git a/client/src/org/compiere/plaf/CompiereViewportUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereViewportUI.java
similarity index 100%
rename from client/src/org/compiere/plaf/CompiereViewportUI.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/CompiereViewportUI.java
diff --git a/client/src/org/compiere/plaf/ContrastTheme.java b/org.adempiere.ui.swing/src/org/compiere/plaf/ContrastTheme.java
similarity index 100%
rename from client/src/org/compiere/plaf/ContrastTheme.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/ContrastTheme.java
diff --git a/client/src/org/compiere/plaf/EmeraldTheme.java b/org.adempiere.ui.swing/src/org/compiere/plaf/EmeraldTheme.java
similarity index 100%
rename from client/src/org/compiere/plaf/EmeraldTheme.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/EmeraldTheme.java
diff --git a/client/src/org/compiere/plaf/PlafRes.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes.java
diff --git a/client/src/org/compiere/plaf/PlafRes_ar.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ar.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_ar.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ar.java
diff --git a/client/src/org/compiere/plaf/PlafRes_bg.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_bg.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_bg.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_bg.java
diff --git a/client/src/org/compiere/plaf/PlafRes_ca.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ca.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_ca.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ca.java
diff --git a/client/src/org/compiere/plaf/PlafRes_da.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_da.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_da.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_da.java
diff --git a/client/src/org/compiere/plaf/PlafRes_de.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_de.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_de.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_de.java
diff --git a/client/src/org/compiere/plaf/PlafRes_el.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_el.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_el.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_el.java
diff --git a/client/src/org/compiere/plaf/PlafRes_es.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_es.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_es.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_es.java
diff --git a/client/src/org/compiere/plaf/PlafRes_fa.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_fa.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_fa.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_fa.java
diff --git a/client/src/org/compiere/plaf/PlafRes_fr.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_fr.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_fr.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_fr.java
diff --git a/client/src/org/compiere/plaf/PlafRes_hr.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_hr.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_hr.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_hr.java
diff --git a/client/src/org/compiere/plaf/PlafRes_hu.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_hu.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_hu.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_hu.java
diff --git a/client/src/org/compiere/plaf/PlafRes_in.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_in.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_in.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_in.java
diff --git a/client/src/org/compiere/plaf/PlafRes_it.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_it.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_it.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_it.java
diff --git a/client/src/org/compiere/plaf/PlafRes_ja.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ja.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_ja.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ja.java
diff --git a/client/src/org/compiere/plaf/PlafRes_ms.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ms.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_ms.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ms.java
diff --git a/client/src/org/compiere/plaf/PlafRes_nl.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_nl.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_nl.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_nl.java
diff --git a/client/src/org/compiere/plaf/PlafRes_no.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_no.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_no.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_no.java
diff --git a/client/src/org/compiere/plaf/PlafRes_pl.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_pl.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_pl.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_pl.java
diff --git a/client/src/org/compiere/plaf/PlafRes_pt.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_pt.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_pt.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_pt.java
diff --git a/client/src/org/compiere/plaf/PlafRes_ro.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ro.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_ro.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ro.java
diff --git a/client/src/org/compiere/plaf/PlafRes_ru.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ru.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_ru.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_ru.java
diff --git a/client/src/org/compiere/plaf/PlafRes_sl.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_sl.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_sl.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_sl.java
diff --git a/client/src/org/compiere/plaf/PlafRes_sr.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_sr.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_sr.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_sr.java
diff --git a/client/src/org/compiere/plaf/PlafRes_sv.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_sv.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_sv.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_sv.java
diff --git a/client/src/org/compiere/plaf/PlafRes_th.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_th.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_th.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_th.java
diff --git a/client/src/org/compiere/plaf/PlafRes_vi.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_vi.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_vi.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_vi.java
diff --git a/client/src/org/compiere/plaf/PlafRes_zh.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_zh.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_zh.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_zh.java
diff --git a/client/src/org/compiere/plaf/PlafRes_zh_CN.java b/org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_zh_CN.java
similarity index 100%
rename from client/src/org/compiere/plaf/PlafRes_zh_CN.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/PlafRes_zh_CN.java
diff --git a/client/src/org/compiere/plaf/RubyTheme.java b/org.adempiere.ui.swing/src/org/compiere/plaf/RubyTheme.java
similarity index 100%
rename from client/src/org/compiere/plaf/RubyTheme.java
rename to org.adempiere.ui.swing/src/org/compiere/plaf/RubyTheme.java
diff --git a/client/src/org/compiere/plaf/icons/CL16.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/CL16.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/CL16.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/CL16.gif
diff --git a/client/src/org/compiere/plaf/icons/CL32.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/CL32.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/CL32.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/CL32.gif
diff --git a/client/src/org/compiere/plaf/icons/Cancel24.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/Cancel24.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/Cancel24.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/Cancel24.gif
diff --git a/client/src/org/compiere/plaf/icons/Error.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/Error.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/Error.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/Error.gif
diff --git a/client/src/org/compiere/plaf/icons/Inform.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/Inform.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/Inform.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/Inform.gif
diff --git a/client/src/org/compiere/plaf/icons/Ok24.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/Ok24.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/Ok24.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/Ok24.gif
diff --git a/client/src/org/compiere/plaf/icons/Question.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/Question.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/Question.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/Question.gif
diff --git a/client/src/org/compiere/plaf/icons/Warn.gif b/org.adempiere.ui.swing/src/org/compiere/plaf/icons/Warn.gif
similarity index 100%
rename from client/src/org/compiere/plaf/icons/Warn.gif
rename to org.adempiere.ui.swing/src/org/compiere/plaf/icons/Warn.gif
diff --git a/client/src/org/compiere/plaf/package.html b/org.adempiere.ui.swing/src/org/compiere/plaf/package.html
similarity index 100%
rename from client/src/org/compiere/plaf/package.html
rename to org.adempiere.ui.swing/src/org/compiere/plaf/package.html
diff --git a/client/src/org/compiere/plaf/sounds/FrameClose.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameClose.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/FrameClose.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameClose.wav
diff --git a/client/src/org/compiere/plaf/sounds/FrameMaximize.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameMaximize.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/FrameMaximize.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameMaximize.wav
diff --git a/client/src/org/compiere/plaf/sounds/FrameMinimize.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameMinimize.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/FrameMinimize.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameMinimize.wav
diff --git a/client/src/org/compiere/plaf/sounds/FrameRestoreDown.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameRestoreDown.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/FrameRestoreDown.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameRestoreDown.wav
diff --git a/client/src/org/compiere/plaf/sounds/FrameRestoreUp.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameRestoreUp.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/FrameRestoreUp.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/FrameRestoreUp.wav
diff --git a/client/src/org/compiere/plaf/sounds/MenuItemCommand.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/MenuItemCommand.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/MenuItemCommand.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/MenuItemCommand.wav
diff --git a/client/src/org/compiere/plaf/sounds/OptionPaneError.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneError.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/OptionPaneError.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneError.wav
diff --git a/client/src/org/compiere/plaf/sounds/OptionPaneInformation.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneInformation.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/OptionPaneInformation.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneInformation.wav
diff --git a/client/src/org/compiere/plaf/sounds/OptionPaneQuestion.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneQuestion.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/OptionPaneQuestion.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneQuestion.wav
diff --git a/client/src/org/compiere/plaf/sounds/OptionPaneWarning.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneWarning.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/OptionPaneWarning.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/OptionPaneWarning.wav
diff --git a/client/src/org/compiere/plaf/sounds/PopupMenuPopup.wav b/org.adempiere.ui.swing/src/org/compiere/plaf/sounds/PopupMenuPopup.wav
similarity index 100%
rename from client/src/org/compiere/plaf/sounds/PopupMenuPopup.wav
rename to org.adempiere.ui.swing/src/org/compiere/plaf/sounds/PopupMenuPopup.wav
diff --git a/client/src/org/compiere/plaf/vincent.jpg b/org.adempiere.ui.swing/src/org/compiere/plaf/vincent.jpg
similarity index 100%
rename from client/src/org/compiere/plaf/vincent.jpg
rename to org.adempiere.ui.swing/src/org/compiere/plaf/vincent.jpg
diff --git a/client/src/org/compiere/pos/AdempierePOSException.java b/org.adempiere.ui.swing/src/org/compiere/pos/AdempierePOSException.java
similarity index 100%
rename from client/src/org/compiere/pos/AdempierePOSException.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/AdempierePOSException.java
diff --git a/client/src/org/compiere/pos/CashSubFunctions.java b/org.adempiere.ui.swing/src/org/compiere/pos/CashSubFunctions.java
similarity index 100%
rename from client/src/org/compiere/pos/CashSubFunctions.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/CashSubFunctions.java
diff --git a/client/src/org/compiere/pos/POSKeyboard.java b/org.adempiere.ui.swing/src/org/compiere/pos/POSKeyboard.java
similarity index 100%
rename from client/src/org/compiere/pos/POSKeyboard.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/POSKeyboard.java
diff --git a/client/src/org/compiere/pos/PosApplication.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosApplication.java
similarity index 100%
rename from client/src/org/compiere/pos/PosApplication.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosApplication.java
diff --git a/client/src/org/compiere/pos/PosBasePanel.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosBasePanel.java
similarity index 100%
rename from client/src/org/compiere/pos/PosBasePanel.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosBasePanel.java
diff --git a/client/src/org/compiere/pos/PosKeyListener.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosKeyListener.java
similarity index 100%
rename from client/src/org/compiere/pos/PosKeyListener.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosKeyListener.java
diff --git a/client/src/org/compiere/pos/PosKeyPanel.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosKeyPanel.java
similarity index 100%
rename from client/src/org/compiere/pos/PosKeyPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosKeyPanel.java
diff --git a/client/src/org/compiere/pos/PosKeyboardFocusManager.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosKeyboardFocusManager.java
similarity index 100%
rename from client/src/org/compiere/pos/PosKeyboardFocusManager.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosKeyboardFocusManager.java
diff --git a/client/src/org/compiere/pos/PosLogin.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosLogin.java
similarity index 100%
rename from client/src/org/compiere/pos/PosLogin.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosLogin.java
diff --git a/client/src/org/compiere/pos/PosOrderModel.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosOrderModel.java
similarity index 100%
rename from client/src/org/compiere/pos/PosOrderModel.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosOrderModel.java
diff --git a/client/src/org/compiere/pos/PosPanel.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosPanel.java
similarity index 100%
rename from client/src/org/compiere/pos/PosPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosPanel.java
diff --git a/client/src/org/compiere/pos/PosPayment.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosPayment.java
similarity index 100%
rename from client/src/org/compiere/pos/PosPayment.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosPayment.java
diff --git a/client/src/org/compiere/pos/PosQuery.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosQuery.java
similarity index 100%
rename from client/src/org/compiere/pos/PosQuery.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosQuery.java
diff --git a/client/src/org/compiere/pos/PosSubPanel.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosSubPanel.java
similarity index 100%
rename from client/src/org/compiere/pos/PosSubPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosSubPanel.java
diff --git a/client/src/org/compiere/pos/PosTable.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosTable.java
similarity index 100%
rename from client/src/org/compiere/pos/PosTable.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosTable.java
diff --git a/client/src/org/compiere/pos/PosTextField.java b/org.adempiere.ui.swing/src/org/compiere/pos/PosTextField.java
similarity index 100%
rename from client/src/org/compiere/pos/PosTextField.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/PosTextField.java
diff --git a/client/src/org/compiere/pos/QueryBPartner.java b/org.adempiere.ui.swing/src/org/compiere/pos/QueryBPartner.java
similarity index 100%
rename from client/src/org/compiere/pos/QueryBPartner.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/QueryBPartner.java
diff --git a/client/src/org/compiere/pos/QueryProduct.java b/org.adempiere.ui.swing/src/org/compiere/pos/QueryProduct.java
similarity index 100%
rename from client/src/org/compiere/pos/QueryProduct.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/QueryProduct.java
diff --git a/client/src/org/compiere/pos/QueryTicket.java b/org.adempiere.ui.swing/src/org/compiere/pos/QueryTicket.java
similarity index 100%
rename from client/src/org/compiere/pos/QueryTicket.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/QueryTicket.java
diff --git a/client/src/org/compiere/pos/SubCheckout.java b/org.adempiere.ui.swing/src/org/compiere/pos/SubCheckout.java
similarity index 100%
rename from client/src/org/compiere/pos/SubCheckout.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/SubCheckout.java
diff --git a/client/src/org/compiere/pos/SubCurrentLine.java b/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java
similarity index 100%
rename from client/src/org/compiere/pos/SubCurrentLine.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java
diff --git a/client/src/org/compiere/pos/SubFunctionKeys.java b/org.adempiere.ui.swing/src/org/compiere/pos/SubFunctionKeys.java
similarity index 100%
rename from client/src/org/compiere/pos/SubFunctionKeys.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/SubFunctionKeys.java
diff --git a/client/src/org/compiere/pos/SubOrder.java b/org.adempiere.ui.swing/src/org/compiere/pos/SubOrder.java
similarity index 100%
rename from client/src/org/compiere/pos/SubOrder.java
rename to org.adempiere.ui.swing/src/org/compiere/pos/SubOrder.java
diff --git a/client/src/org/compiere/pos/package.html b/org.adempiere.ui.swing/src/org/compiere/pos/package.html
similarity index 100%
rename from client/src/org/compiere/pos/package.html
rename to org.adempiere.ui.swing/src/org/compiere/pos/package.html
diff --git a/client/src/org/compiere/print/AReport.java b/org.adempiere.ui.swing/src/org/compiere/print/AReport.java
similarity index 100%
rename from client/src/org/compiere/print/AReport.java
rename to org.adempiere.ui.swing/src/org/compiere/print/AReport.java
diff --git a/client/src/org/compiere/print/CPrinter.java b/org.adempiere.ui.swing/src/org/compiere/print/CPrinter.java
similarity index 100%
rename from client/src/org/compiere/print/CPrinter.java
rename to org.adempiere.ui.swing/src/org/compiere/print/CPrinter.java
diff --git a/client/src/org/compiere/print/SwingViewerProvider.java b/org.adempiere.ui.swing/src/org/compiere/print/SwingViewerProvider.java
similarity index 100%
rename from client/src/org/compiere/print/SwingViewerProvider.java
rename to org.adempiere.ui.swing/src/org/compiere/print/SwingViewerProvider.java
diff --git a/client/src/org/compiere/print/View.java b/org.adempiere.ui.swing/src/org/compiere/print/View.java
similarity index 100%
rename from client/src/org/compiere/print/View.java
rename to org.adempiere.ui.swing/src/org/compiere/print/View.java
diff --git a/client/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
similarity index 100%
rename from client/src/org/compiere/print/Viewer.java
rename to org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
diff --git a/client/src/org/compiere/print/package.html b/org.adempiere.ui.swing/src/org/compiere/print/package.html
similarity index 100%
rename from client/src/org/compiere/print/package.html
rename to org.adempiere.ui.swing/src/org/compiere/print/package.html
diff --git a/client/src/org/compiere/report/core/ResultTable.java b/org.adempiere.ui.swing/src/org/compiere/report/core/ResultTable.java
similarity index 100%
rename from client/src/org/compiere/report/core/ResultTable.java
rename to org.adempiere.ui.swing/src/org/compiere/report/core/ResultTable.java
diff --git a/client/src/org/compiere/report/core/ResultTableCellEditor.java b/org.adempiere.ui.swing/src/org/compiere/report/core/ResultTableCellEditor.java
similarity index 100%
rename from client/src/org/compiere/report/core/ResultTableCellEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/report/core/ResultTableCellEditor.java
diff --git a/client/src/org/compiere/report/core/ResultTableCellRenderer.java b/org.adempiere.ui.swing/src/org/compiere/report/core/ResultTableCellRenderer.java
similarity index 100%
rename from client/src/org/compiere/report/core/ResultTableCellRenderer.java
rename to org.adempiere.ui.swing/src/org/compiere/report/core/ResultTableCellRenderer.java
diff --git a/client/src/org/compiere/swing/CButton.java b/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
similarity index 100%
rename from client/src/org/compiere/swing/CButton.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CButton.java
diff --git a/client/src/org/compiere/swing/CCheckBox.java b/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java
similarity index 100%
rename from client/src/org/compiere/swing/CCheckBox.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java
diff --git a/client/src/org/compiere/swing/CCheckBoxMenuItem.java b/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBoxMenuItem.java
similarity index 100%
rename from client/src/org/compiere/swing/CCheckBoxMenuItem.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CCheckBoxMenuItem.java
diff --git a/client/src/org/compiere/swing/CColumnControlButton.java b/org.adempiere.ui.swing/src/org/compiere/swing/CColumnControlButton.java
similarity index 100%
rename from client/src/org/compiere/swing/CColumnControlButton.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CColumnControlButton.java
diff --git a/client/src/org/compiere/swing/CComboBox.java b/org.adempiere.ui.swing/src/org/compiere/swing/CComboBox.java
similarity index 100%
rename from client/src/org/compiere/swing/CComboBox.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CComboBox.java
diff --git a/client/src/org/compiere/swing/CDialog.java b/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java
similarity index 100%
rename from client/src/org/compiere/swing/CDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java
diff --git a/client/src/org/compiere/swing/CEditor.java b/org.adempiere.ui.swing/src/org/compiere/swing/CEditor.java
similarity index 100%
rename from client/src/org/compiere/swing/CEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CEditor.java
diff --git a/client/src/org/compiere/swing/CField.java b/org.adempiere.ui.swing/src/org/compiere/swing/CField.java
similarity index 100%
rename from client/src/org/compiere/swing/CField.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CField.java
diff --git a/client/src/org/compiere/swing/CFieldEditor.java b/org.adempiere.ui.swing/src/org/compiere/swing/CFieldEditor.java
similarity index 100%
rename from client/src/org/compiere/swing/CFieldEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CFieldEditor.java
diff --git a/client/src/org/compiere/swing/CFieldPopup.java b/org.adempiere.ui.swing/src/org/compiere/swing/CFieldPopup.java
similarity index 100%
rename from client/src/org/compiere/swing/CFieldPopup.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CFieldPopup.java
diff --git a/client/src/org/compiere/swing/CFrame.java b/org.adempiere.ui.swing/src/org/compiere/swing/CFrame.java
similarity index 100%
rename from client/src/org/compiere/swing/CFrame.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CFrame.java
diff --git a/client/src/org/compiere/swing/CLabel.java b/org.adempiere.ui.swing/src/org/compiere/swing/CLabel.java
similarity index 100%
rename from client/src/org/compiere/swing/CLabel.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CLabel.java
diff --git a/client/src/org/compiere/swing/CMenuItem.java b/org.adempiere.ui.swing/src/org/compiere/swing/CMenuItem.java
similarity index 100%
rename from client/src/org/compiere/swing/CMenuItem.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CMenuItem.java
diff --git a/client/src/org/compiere/swing/CPanel.java b/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java
similarity index 100%
rename from client/src/org/compiere/swing/CPanel.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java
diff --git a/client/src/org/compiere/swing/CPassword.java b/org.adempiere.ui.swing/src/org/compiere/swing/CPassword.java
similarity index 100%
rename from client/src/org/compiere/swing/CPassword.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CPassword.java
diff --git a/client/src/org/compiere/swing/CScrollPane.java b/org.adempiere.ui.swing/src/org/compiere/swing/CScrollPane.java
similarity index 100%
rename from client/src/org/compiere/swing/CScrollPane.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CScrollPane.java
diff --git a/client/src/org/compiere/swing/CTabbedPane.java b/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java
similarity index 100%
rename from client/src/org/compiere/swing/CTabbedPane.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java
diff --git a/client/src/org/compiere/swing/CTable.java b/org.adempiere.ui.swing/src/org/compiere/swing/CTable.java
similarity index 100%
rename from client/src/org/compiere/swing/CTable.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CTable.java
diff --git a/client/src/org/compiere/swing/CTextArea.java b/org.adempiere.ui.swing/src/org/compiere/swing/CTextArea.java
similarity index 100%
rename from client/src/org/compiere/swing/CTextArea.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CTextArea.java
diff --git a/client/src/org/compiere/swing/CTextField.java b/org.adempiere.ui.swing/src/org/compiere/swing/CTextField.java
similarity index 100%
rename from client/src/org/compiere/swing/CTextField.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CTextField.java
diff --git a/client/src/org/compiere/swing/CTextPane.java b/org.adempiere.ui.swing/src/org/compiere/swing/CTextPane.java
similarity index 100%
rename from client/src/org/compiere/swing/CTextPane.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CTextPane.java
diff --git a/client/src/org/compiere/swing/CToggleButton.java b/org.adempiere.ui.swing/src/org/compiere/swing/CToggleButton.java
similarity index 100%
rename from client/src/org/compiere/swing/CToggleButton.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CToggleButton.java
diff --git a/client/src/org/compiere/swing/CollapsiblePanel.java b/org.adempiere.ui.swing/src/org/compiere/swing/CollapsiblePanel.java
similarity index 100%
rename from client/src/org/compiere/swing/CollapsiblePanel.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/CollapsiblePanel.java
diff --git a/client/src/org/compiere/swing/ColorBlind.java b/org.adempiere.ui.swing/src/org/compiere/swing/ColorBlind.java
similarity index 100%
rename from client/src/org/compiere/swing/ColorBlind.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/ColorBlind.java
diff --git a/client/src/org/compiere/swing/ColorEditor.java b/org.adempiere.ui.swing/src/org/compiere/swing/ColorEditor.java
similarity index 100%
rename from client/src/org/compiere/swing/ColorEditor.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/ColorEditor.java
diff --git a/client/src/org/compiere/swing/ExtendedTheme.java b/org.adempiere.ui.swing/src/org/compiere/swing/ExtendedTheme.java
similarity index 100%
rename from client/src/org/compiere/swing/ExtendedTheme.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/ExtendedTheme.java
diff --git a/client/src/org/compiere/swing/FontChooser.java b/org.adempiere.ui.swing/src/org/compiere/swing/FontChooser.java
similarity index 100%
rename from client/src/org/compiere/swing/FontChooser.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/FontChooser.java
diff --git a/client/src/org/compiere/swing/ShadowBorder.java b/org.adempiere.ui.swing/src/org/compiere/swing/ShadowBorder.java
similarity index 100%
rename from client/src/org/compiere/swing/ShadowBorder.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/ShadowBorder.java
diff --git a/client/src/org/compiere/swing/StackedBox.java b/org.adempiere.ui.swing/src/org/compiere/swing/StackedBox.java
similarity index 100%
rename from client/src/org/compiere/swing/StackedBox.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/StackedBox.java
diff --git a/client/src/org/compiere/swing/TableCellNone.java b/org.adempiere.ui.swing/src/org/compiere/swing/TableCellNone.java
similarity index 100%
rename from client/src/org/compiere/swing/TableCellNone.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/TableCellNone.java
diff --git a/client/src/org/compiere/swing/ThemeUtils.java b/org.adempiere.ui.swing/src/org/compiere/swing/ThemeUtils.java
similarity index 100%
rename from client/src/org/compiere/swing/ThemeUtils.java
rename to org.adempiere.ui.swing/src/org/compiere/swing/ThemeUtils.java
diff --git a/client/src/org/compiere/swing/package.html b/org.adempiere.ui.swing/src/org/compiere/swing/package.html
similarity index 100%
rename from client/src/org/compiere/swing/package.html
rename to org.adempiere.ui.swing/src/org/compiere/swing/package.html
diff --git a/client/src/org/compiere/util/IniDialog.java b/org.adempiere.ui.swing/src/org/compiere/util/IniDialog.java
similarity index 100%
rename from client/src/org/compiere/util/IniDialog.java
rename to org.adempiere.ui.swing/src/org/compiere/util/IniDialog.java
diff --git a/client/src/org/compiere/util/MiniBrowser.java b/org.adempiere.ui.swing/src/org/compiere/util/MiniBrowser.java
similarity index 100%
rename from client/src/org/compiere/util/MiniBrowser.java
rename to org.adempiere.ui.swing/src/org/compiere/util/MiniBrowser.java
diff --git a/client/src/org/compiere/util/ResourceFinder.java b/org.adempiere.ui.swing/src/org/compiere/util/ResourceFinder.java
similarity index 100%
rename from client/src/org/compiere/util/ResourceFinder.java
rename to org.adempiere.ui.swing/src/org/compiere/util/ResourceFinder.java
diff --git a/client/src/org/compiere/util/Splash.java b/org.adempiere.ui.swing/src/org/compiere/util/Splash.java
similarity index 100%
rename from client/src/org/compiere/util/Splash.java
rename to org.adempiere.ui.swing/src/org/compiere/util/Splash.java
diff --git a/client/src/org/eevolution/form/VInOutInvoiceGen.java b/org.adempiere.ui.swing/src/org/eevolution/form/VInOutInvoiceGen.java
similarity index 100%
rename from client/src/org/eevolution/form/VInOutInvoiceGen.java
rename to org.adempiere.ui.swing/src/org/eevolution/form/VInOutInvoiceGen.java
diff --git a/client/swing.properties b/org.adempiere.ui.swing/swing.properties
similarity index 100%
rename from client/swing.properties
rename to org.adempiere.ui.swing/swing.properties
diff --git a/org.adempiere.ui.zk-feature/.project b/org.adempiere.ui.zk-feature/.project
new file mode 100644
index 0000000000..61e9d9d74a
--- /dev/null
+++ b/org.adempiere.ui.zk-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.ui.zk-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.ui.zk-feature/build.properties b/org.adempiere.ui.zk-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.ui.zk-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
new file mode 100644
index 0000000000..b76e8c16d3
--- /dev/null
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
diff --git a/zkwebui/.classpath b/org.adempiere.ui.zk/.classpath
similarity index 100%
rename from zkwebui/.classpath
rename to org.adempiere.ui.zk/.classpath
diff --git a/zkwebui/.project b/org.adempiere.ui.zk/.project
similarity index 97%
rename from zkwebui/.project
rename to org.adempiere.ui.zk/.project
index 263a7a75fa..17d049b1e8 100644
--- a/zkwebui/.project
+++ b/org.adempiere.ui.zk/.project
@@ -1,6 +1,6 @@
- zkwebui
+ org.adempiere.ui.zkbase
diff --git a/zkwebui/.settings/.jsdtscope b/org.adempiere.ui.zk/.settings/.jsdtscope
similarity index 100%
rename from zkwebui/.settings/.jsdtscope
rename to org.adempiere.ui.zk/.settings/.jsdtscope
diff --git a/zkwebui/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from zkwebui/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
diff --git a/zkwebui/.tomcatplugin b/org.adempiere.ui.zk/.tomcatplugin
similarity index 100%
rename from zkwebui/.tomcatplugin
rename to org.adempiere.ui.zk/.tomcatplugin
diff --git a/zkwebui/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
similarity index 95%
rename from zkwebui/META-INF/MANIFEST.MF
rename to org.adempiere.ui.zk/META-INF/MANIFEST.MF
index c6137fd253..3b2936f177 100644
--- a/zkwebui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: org.adempiere.webui
-Bundle-SymbolicName: org.adempiere.webui;singleton:=true
+Bundle-Name: Zk Web Client
+Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
Bundle-Version: 1.0.0.qualifier
Web-ContextPath: webui
Bundle-ClassPath: WEB-INF/classes/,
@@ -364,14 +364,14 @@ Export-Package: junit.extensions,
web.zul.img.tree,
web.zul.img.vd,
web.zul.img.wnd
-Eclipse-RegisterBuddy: org.adempiere.tools
-Require-Bundle: org.apache.xerces;bundle-version="2.9.0",
- org.apache.xml.serializer;bundle-version="2.7.1",
- com.springsource.javax.servlet;bundle-version="2.5.0",
- org.adempiere.JasperReports;bundle-version="1.0.0",
+Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0",
org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.tools;bundle-version="1.0.0",
- org.adempiere.JasperReportsTools;bundle-version="1.0.0",
- org.adempiere.ui.base;bundle-version="1.0.0"
+ org.adempiere.report.jasper.library;bundle-version="1.0.0",
+ org.adempiere.ui;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-ExtensibleAPI: true
+Import-Package: javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
+ org.apache.commons.codec.binary,
+ org.apache.ecs,
+ org.apache.ecs.xhtml
diff --git a/zkwebui/RUN_build.bat b/org.adempiere.ui.zk/RUN_build.bat
similarity index 100%
rename from zkwebui/RUN_build.bat
rename to org.adempiere.ui.zk/RUN_build.bat
diff --git a/zkwebui/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
similarity index 100%
rename from zkwebui/WEB-INF/src/metainfo/zk/lang-addon.xml
rename to org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/ClientInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/ClientInfo.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/DelegatingServlet.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/DelegatingServlet.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/DelegatingServlet.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/DelegatingServlet.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/Extensions.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/Extensions.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/Extensions.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/Extensions.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/IWebClient.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/IWebClient.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/IWebClient.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/IWebClient.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/LayoutUtils.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LayoutUtils.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/LayoutUtils.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LayoutUtils.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/TimelineEventFeed.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/TimelineEventFeed.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/TimelineEventFeed.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/TimelineEventFeed.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/ValuePreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/ValuePreference.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/WArchive.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WArchive.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/WArchive.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WArchive.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/WLogin.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/WLogin.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/WRequest.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/WRequest.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/WZoomAcross.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WZoomAcross.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/WZoomAcross.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WZoomAcross.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/AEnv.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/BusyDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/BusyDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/BusyDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/BusyDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/WProcessCtl.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WProcessCtl.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/WProcessCtl.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WProcessCtl.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/WReport.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WReport.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/WReport.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WReport.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMergeUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMergeUI.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMergeUI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMergeUI.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceDetail.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceDetail.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceDetail.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceDetail.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceIndicator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceIndicator.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceIndicator.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WPerformanceIndicator.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WViewPI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WViewPI.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WViewPI.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WViewPI.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFNodeContainer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFNodeContainer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFNodeContainer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFNodeContainer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPopupItem.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPopupItem.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPopupItem.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPopupItem.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ADButtonTabList.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADButtonTabList.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ADButtonTabList.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADButtonTabList.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTreeOnDropListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/AbstractADTab.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AbstractADTab.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/AbstractADTab.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AbstractADTab.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Accordion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Accordion.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Accordion.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Accordion.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/BackgroundColours.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/BackgroundColours.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/BackgroundColours.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/BackgroundColours.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Bandbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Bandbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Bandbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Bandbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Borderlayout.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Button.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Button.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Button.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Button.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Checkbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Checkbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Checkbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Checkbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Column.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Column.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Column.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Column.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Columns.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Columns.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Columns.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Columns.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combinationbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ComboItem.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ComboItem.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ComboItem.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ComboItem.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Combobox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combobox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Combobox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Combobox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Datebox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Datebox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Datebox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Datebox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/DesktopTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DesktopTabpanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/DesktopTabpanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DesktopTabpanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DrillCommand.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/EditorBox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/FToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FToolbar.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/FToolbar.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FToolbar.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/FWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FWindow.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/FWindow.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FWindow.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/FilenameBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FilenameBox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/FilenameBox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FilenameBox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Grid.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Grid.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Grid.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Grid.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridFactory.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/GridFactory.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridFactory.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/GridPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/IADTab.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/IADTab.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/IADTab.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/IADTab.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/IADTabList.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/IADTabList.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/IADTabList.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/IADTabList.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Label.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Label.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Label.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Label.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListCell.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListCell.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ListCell.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListCell.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListHead.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListHead.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ListHead.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListHead.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListHeader.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListHeader.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ListHeader.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListHeader.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListItem.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListItem.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ListItem.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListItem.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ListPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Listbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Listbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Listbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Listbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Locationbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Locationbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Locationbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Locationbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Messagebox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Messagebox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/PAttributebox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Panel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Panel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Panel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Panel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Row.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Row.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Row.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Row.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Rows.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Rows.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Rows.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Rows.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Searchbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Searchbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Searchbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Searchbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleListModel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/SimpleTreeModel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Tab.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tab.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Tab.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tab.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabpanels.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanels.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabpanels.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanels.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabs.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabs.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Tabs.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabs.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Textbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Textbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/TokenCommand.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ToolBar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ToolBar.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ToolBar.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ToolBar.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ToolBarButton.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ToolBarButton.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ToolBarButton.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ToolBarButton.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Urlbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Urlbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Urlbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Urlbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/VerticalBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/VerticalBox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/VerticalBox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/VerticalBox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/WListbox.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WTableColumn.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WTableColumn.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/WTableColumn.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WTableColumn.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Window.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Window.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/Window.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Window.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ZkCssHelper.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZkCssHelper.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ZkCssHelper.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZkCssHelper.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ZoomCommand.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPActivities.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPViews.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DashboardPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DashboardPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/IDashboardPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/IDashboardPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/IDashboardPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/IDashboardPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/IDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/IDesktop.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/desktop/IDesktop.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/IDesktop.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/IZoomableEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/IZoomableEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/IZoomableEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/IZoomableEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WBinaryEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WBinaryEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WBinaryEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WBinaryEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPasswordEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPasswordEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WPasswordEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPasswordEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WUnknownEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUnknownEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WUnknownEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUnknownEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WebEditorFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WebEditorFactory.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/editor/WebEditorFactory.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WebEditorFactory.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ActionListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ActionListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/MenuListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/MenuListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/MenuListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/MenuListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/install/WTranslationDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTreePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTreePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTreePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTreePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/IADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IADTabpanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/IADTabpanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IADTabpanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/IFormController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IFormController.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/IFormController.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IFormController.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LogoPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LogoPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/SidePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/SidePanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/SidePanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/SidePanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/part/UIPart.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/UIPart.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/part/UIPart.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/UIPart.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/process/CacheReset.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CacheReset.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/process/CacheReset.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CacheReset.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionManager.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/session/SessionManager.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionManager.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ITheme.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/DocumentSearch.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/DocumentSearch.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/DocumentSearch.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/DocumentSearch.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/OSTask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/OSTask.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/ReaderInputStream.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ReaderInputStream.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/ReaderInputStream.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ReaderInputStream.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/SortComparator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/SortComparator.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/SortComparator.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/SortComparator.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/TreeItemAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeItemAction.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/TreeItemAction.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeItemAction.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeNodeAction.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/util/UserPreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ADWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ADWindow.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/ADWindow.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ADWindow.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/FDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/FDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WPreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPreference.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WPreference.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPreference.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WTask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WTask.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
diff --git a/zkwebui/WEB-INF/src/org/zkoss/web/servlet/Servlets.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/web/servlet/Servlets.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/zkoss/web/servlet/Servlets.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/zkoss/web/servlet/Servlets.java
diff --git a/zkwebui/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java
similarity index 100%
rename from zkwebui/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java
rename to org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zkmax/zul/render/Combobox2Default.java
diff --git a/zkwebui/WEB-INF/tld/web/core.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/web/core.dsp.tld
similarity index 100%
rename from zkwebui/WEB-INF/tld/web/core.dsp.tld
rename to org.adempiere.ui.zk/WEB-INF/tld/web/core.dsp.tld
diff --git a/zkwebui/WEB-INF/tld/web/html.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/web/html.dsp.tld
similarity index 100%
rename from zkwebui/WEB-INF/tld/web/html.dsp.tld
rename to org.adempiere.ui.zk/WEB-INF/tld/web/html.dsp.tld
diff --git a/zkwebui/WEB-INF/tld/zk/core.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/zk/core.dsp.tld
similarity index 100%
rename from zkwebui/WEB-INF/tld/zk/core.dsp.tld
rename to org.adempiere.ui.zk/WEB-INF/tld/zk/core.dsp.tld
diff --git a/zkwebui/WEB-INF/tld/zk/core.jsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/zk/core.jsp.tld
similarity index 100%
rename from zkwebui/WEB-INF/tld/zk/core.jsp.tld
rename to org.adempiere.ui.zk/WEB-INF/tld/zk/core.jsp.tld
diff --git a/zkwebui/WEB-INF/tld/zul/core.dsp.tld b/org.adempiere.ui.zk/WEB-INF/tld/zul/core.dsp.tld
similarity index 100%
rename from zkwebui/WEB-INF/tld/zul/core.dsp.tld
rename to org.adempiere.ui.zk/WEB-INF/tld/zul/core.dsp.tld
diff --git a/zkwebui/WEB-INF/web-2.5.xml b/org.adempiere.ui.zk/WEB-INF/web-2.5.xml
similarity index 100%
rename from zkwebui/WEB-INF/web-2.5.xml
rename to org.adempiere.ui.zk/WEB-INF/web-2.5.xml
diff --git a/zkwebui/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml
similarity index 100%
rename from zkwebui/WEB-INF/web.xml
rename to org.adempiere.ui.zk/WEB-INF/web.xml
diff --git a/zkwebui/WEB-INF/xsd/zul.xsd b/org.adempiere.ui.zk/WEB-INF/xsd/zul.xsd
similarity index 100%
rename from zkwebui/WEB-INF/xsd/zul.xsd
rename to org.adempiere.ui.zk/WEB-INF/xsd/zul.xsd
diff --git a/zkwebui/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
similarity index 100%
rename from zkwebui/WEB-INF/zk.xml
rename to org.adempiere.ui.zk/WEB-INF/zk.xml
diff --git a/zkwebui/build.properties b/org.adempiere.ui.zk/build.properties
similarity index 100%
rename from zkwebui/build.properties
rename to org.adempiere.ui.zk/build.properties
diff --git a/zkwebui/css/PAPanel.css b/org.adempiere.ui.zk/css/PAPanel.css
similarity index 100%
rename from zkwebui/css/PAPanel.css
rename to org.adempiere.ui.zk/css/PAPanel.css
diff --git a/zkwebui/css/report.css b/org.adempiere.ui.zk/css/report.css
similarity index 100%
rename from zkwebui/css/report.css
rename to org.adempiere.ui.zk/css/report.css
diff --git a/zkwebui/images/AD10030.png b/org.adempiere.ui.zk/images/AD10030.png
similarity index 100%
rename from zkwebui/images/AD10030.png
rename to org.adempiere.ui.zk/images/AD10030.png
diff --git a/zkwebui/images/AD10030HR.png b/org.adempiere.ui.zk/images/AD10030HR.png
similarity index 100%
rename from zkwebui/images/AD10030HR.png
rename to org.adempiere.ui.zk/images/AD10030HR.png
diff --git a/zkwebui/images/AD16.png b/org.adempiere.ui.zk/images/AD16.png
similarity index 100%
rename from zkwebui/images/AD16.png
rename to org.adempiere.ui.zk/images/AD16.png
diff --git a/zkwebui/images/AD32.png b/org.adempiere.ui.zk/images/AD32.png
similarity index 100%
rename from zkwebui/images/AD32.png
rename to org.adempiere.ui.zk/images/AD32.png
diff --git a/zkwebui/images/About16.png b/org.adempiere.ui.zk/images/About16.png
similarity index 100%
rename from zkwebui/images/About16.png
rename to org.adempiere.ui.zk/images/About16.png
diff --git a/zkwebui/images/About24.png b/org.adempiere.ui.zk/images/About24.png
similarity index 100%
rename from zkwebui/images/About24.png
rename to org.adempiere.ui.zk/images/About24.png
diff --git a/zkwebui/images/Account10.png b/org.adempiere.ui.zk/images/Account10.png
similarity index 100%
rename from zkwebui/images/Account10.png
rename to org.adempiere.ui.zk/images/Account10.png
diff --git a/zkwebui/images/Account16.png b/org.adempiere.ui.zk/images/Account16.png
similarity index 100%
rename from zkwebui/images/Account16.png
rename to org.adempiere.ui.zk/images/Account16.png
diff --git a/zkwebui/images/Account24.png b/org.adempiere.ui.zk/images/Account24.png
similarity index 100%
rename from zkwebui/images/Account24.png
rename to org.adempiere.ui.zk/images/Account24.png
diff --git a/zkwebui/images/AdemPiere150x50.png b/org.adempiere.ui.zk/images/AdemPiere150x50.png
similarity index 100%
rename from zkwebui/images/AdemPiere150x50.png
rename to org.adempiere.ui.zk/images/AdemPiere150x50.png
diff --git a/zkwebui/images/AdemPiereCom.jpg b/org.adempiere.ui.zk/images/AdemPiereCom.jpg
similarity index 100%
rename from zkwebui/images/AdemPiereCom.jpg
rename to org.adempiere.ui.zk/images/AdemPiereCom.jpg
diff --git a/zkwebui/images/AdemPiereCom.png b/org.adempiere.ui.zk/images/AdemPiereCom.png
similarity index 100%
rename from zkwebui/images/AdemPiereCom.png
rename to org.adempiere.ui.zk/images/AdemPiereCom.png
diff --git a/zkwebui/images/AdemPiereComHR.png b/org.adempiere.ui.zk/images/AdemPiereComHR.png
similarity index 100%
rename from zkwebui/images/AdemPiereComHR.png
rename to org.adempiere.ui.zk/images/AdemPiereComHR.png
diff --git a/zkwebui/images/AdemPiereComx.png b/org.adempiere.ui.zk/images/AdemPiereComx.png
similarity index 100%
rename from zkwebui/images/AdemPiereComx.png
rename to org.adempiere.ui.zk/images/AdemPiereComx.png
diff --git a/zkwebui/images/Adempiere.jpg b/org.adempiere.ui.zk/images/Adempiere.jpg
similarity index 100%
rename from zkwebui/images/Adempiere.jpg
rename to org.adempiere.ui.zk/images/Adempiere.jpg
diff --git a/zkwebui/images/Adempiere.png b/org.adempiere.ui.zk/images/Adempiere.png
similarity index 100%
rename from zkwebui/images/Adempiere.png
rename to org.adempiere.ui.zk/images/Adempiere.png
diff --git a/zkwebui/images/Adempiere120x60.png b/org.adempiere.ui.zk/images/Adempiere120x60.png
similarity index 100%
rename from zkwebui/images/Adempiere120x60.png
rename to org.adempiere.ui.zk/images/Adempiere120x60.png
diff --git a/zkwebui/images/AdempiereHR.png b/org.adempiere.ui.zk/images/AdempiereHR.png
similarity index 100%
rename from zkwebui/images/AdempiereHR.png
rename to org.adempiere.ui.zk/images/AdempiereHR.png
diff --git a/zkwebui/images/Adempierex.png b/org.adempiere.ui.zk/images/Adempierex.png
similarity index 100%
rename from zkwebui/images/Adempierex.png
rename to org.adempiere.ui.zk/images/Adempierex.png
diff --git a/zkwebui/images/Archive16.png b/org.adempiere.ui.zk/images/Archive16.png
similarity index 100%
rename from zkwebui/images/Archive16.png
rename to org.adempiere.ui.zk/images/Archive16.png
diff --git a/zkwebui/images/Archive24.png b/org.adempiere.ui.zk/images/Archive24.png
similarity index 100%
rename from zkwebui/images/Archive24.png
rename to org.adempiere.ui.zk/images/Archive24.png
diff --git a/zkwebui/images/Assignment10.png b/org.adempiere.ui.zk/images/Assignment10.png
similarity index 100%
rename from zkwebui/images/Assignment10.png
rename to org.adempiere.ui.zk/images/Assignment10.png
diff --git a/zkwebui/images/Assignment16.png b/org.adempiere.ui.zk/images/Assignment16.png
similarity index 100%
rename from zkwebui/images/Assignment16.png
rename to org.adempiere.ui.zk/images/Assignment16.png
diff --git a/zkwebui/images/Assignment24.png b/org.adempiere.ui.zk/images/Assignment24.png
similarity index 100%
rename from zkwebui/images/Assignment24.png
rename to org.adempiere.ui.zk/images/Assignment24.png
diff --git a/zkwebui/images/Attachment16.png b/org.adempiere.ui.zk/images/Attachment16.png
similarity index 100%
rename from zkwebui/images/Attachment16.png
rename to org.adempiere.ui.zk/images/Attachment16.png
diff --git a/zkwebui/images/Attachment24.png b/org.adempiere.ui.zk/images/Attachment24.png
similarity index 100%
rename from zkwebui/images/Attachment24.png
rename to org.adempiere.ui.zk/images/Attachment24.png
diff --git a/zkwebui/images/Attachment24D.png b/org.adempiere.ui.zk/images/Attachment24D.png
similarity index 100%
rename from zkwebui/images/Attachment24D.png
rename to org.adempiere.ui.zk/images/Attachment24D.png
diff --git a/zkwebui/images/AttachmentX16.png b/org.adempiere.ui.zk/images/AttachmentX16.png
similarity index 100%
rename from zkwebui/images/AttachmentX16.png
rename to org.adempiere.ui.zk/images/AttachmentX16.png
diff --git a/zkwebui/images/AttachmentX24.png b/org.adempiere.ui.zk/images/AttachmentX24.png
similarity index 100%
rename from zkwebui/images/AttachmentX24.png
rename to org.adempiere.ui.zk/images/AttachmentX24.png
diff --git a/zkwebui/images/BPartner10.png b/org.adempiere.ui.zk/images/BPartner10.png
similarity index 100%
rename from zkwebui/images/BPartner10.png
rename to org.adempiere.ui.zk/images/BPartner10.png
diff --git a/zkwebui/images/BPartner16.png b/org.adempiere.ui.zk/images/BPartner16.png
similarity index 100%
rename from zkwebui/images/BPartner16.png
rename to org.adempiere.ui.zk/images/BPartner16.png
diff --git a/zkwebui/images/BPartner24.png b/org.adempiere.ui.zk/images/BPartner24.png
similarity index 100%
rename from zkwebui/images/BPartner24.png
rename to org.adempiere.ui.zk/images/BPartner24.png
diff --git a/zkwebui/images/Bold16.png b/org.adempiere.ui.zk/images/Bold16.png
similarity index 100%
rename from zkwebui/images/Bold16.png
rename to org.adempiere.ui.zk/images/Bold16.png
diff --git a/zkwebui/images/C10030.jpg b/org.adempiere.ui.zk/images/C10030.jpg
similarity index 100%
rename from zkwebui/images/C10030.jpg
rename to org.adempiere.ui.zk/images/C10030.jpg
diff --git a/zkwebui/images/C10030.png b/org.adempiere.ui.zk/images/C10030.png
similarity index 100%
rename from zkwebui/images/C10030.png
rename to org.adempiere.ui.zk/images/C10030.png
diff --git a/zkwebui/images/C10030HR.png b/org.adempiere.ui.zk/images/C10030HR.png
similarity index 100%
rename from zkwebui/images/C10030HR.png
rename to org.adempiere.ui.zk/images/C10030HR.png
diff --git a/zkwebui/images/C10030x.png b/org.adempiere.ui.zk/images/C10030x.png
similarity index 100%
rename from zkwebui/images/C10030x.png
rename to org.adempiere.ui.zk/images/C10030x.png
diff --git a/zkwebui/images/C10030xHR.png b/org.adempiere.ui.zk/images/C10030xHR.png
similarity index 100%
rename from zkwebui/images/C10030xHR.png
rename to org.adempiere.ui.zk/images/C10030xHR.png
diff --git a/zkwebui/images/C16.png b/org.adempiere.ui.zk/images/C16.png
similarity index 100%
rename from zkwebui/images/C16.png
rename to org.adempiere.ui.zk/images/C16.png
diff --git a/zkwebui/images/C32.png b/org.adempiere.ui.zk/images/C32.png
similarity index 100%
rename from zkwebui/images/C32.png
rename to org.adempiere.ui.zk/images/C32.png
diff --git a/zkwebui/images/Calculator10.png b/org.adempiere.ui.zk/images/Calculator10.png
similarity index 100%
rename from zkwebui/images/Calculator10.png
rename to org.adempiere.ui.zk/images/Calculator10.png
diff --git a/zkwebui/images/Calculator16.png b/org.adempiere.ui.zk/images/Calculator16.png
similarity index 100%
rename from zkwebui/images/Calculator16.png
rename to org.adempiere.ui.zk/images/Calculator16.png
diff --git a/zkwebui/images/Calculator24.png b/org.adempiere.ui.zk/images/Calculator24.png
similarity index 100%
rename from zkwebui/images/Calculator24.png
rename to org.adempiere.ui.zk/images/Calculator24.png
diff --git a/zkwebui/images/Calendar10.png b/org.adempiere.ui.zk/images/Calendar10.png
similarity index 100%
rename from zkwebui/images/Calendar10.png
rename to org.adempiere.ui.zk/images/Calendar10.png
diff --git a/zkwebui/images/Calendar16.png b/org.adempiere.ui.zk/images/Calendar16.png
similarity index 100%
rename from zkwebui/images/Calendar16.png
rename to org.adempiere.ui.zk/images/Calendar16.png
diff --git a/zkwebui/images/Calendar24.png b/org.adempiere.ui.zk/images/Calendar24.png
similarity index 100%
rename from zkwebui/images/Calendar24.png
rename to org.adempiere.ui.zk/images/Calendar24.png
diff --git a/zkwebui/images/Cancel10.png b/org.adempiere.ui.zk/images/Cancel10.png
similarity index 100%
rename from zkwebui/images/Cancel10.png
rename to org.adempiere.ui.zk/images/Cancel10.png
diff --git a/zkwebui/images/Cancel16.png b/org.adempiere.ui.zk/images/Cancel16.png
similarity index 100%
rename from zkwebui/images/Cancel16.png
rename to org.adempiere.ui.zk/images/Cancel16.png
diff --git a/zkwebui/images/Cancel24.png b/org.adempiere.ui.zk/images/Cancel24.png
similarity index 100%
rename from zkwebui/images/Cancel24.png
rename to org.adempiere.ui.zk/images/Cancel24.png
diff --git a/zkwebui/images/ChangeLog16.png b/org.adempiere.ui.zk/images/ChangeLog16.png
similarity index 100%
rename from zkwebui/images/ChangeLog16.png
rename to org.adempiere.ui.zk/images/ChangeLog16.png
diff --git a/zkwebui/images/Chat16.png b/org.adempiere.ui.zk/images/Chat16.png
similarity index 100%
rename from zkwebui/images/Chat16.png
rename to org.adempiere.ui.zk/images/Chat16.png
diff --git a/zkwebui/images/Chat24.png b/org.adempiere.ui.zk/images/Chat24.png
similarity index 100%
rename from zkwebui/images/Chat24.png
rename to org.adempiere.ui.zk/images/Chat24.png
diff --git a/zkwebui/images/ChatX16.png b/org.adempiere.ui.zk/images/ChatX16.png
similarity index 100%
rename from zkwebui/images/ChatX16.png
rename to org.adempiere.ui.zk/images/ChatX16.png
diff --git a/zkwebui/images/ChatX24.png b/org.adempiere.ui.zk/images/ChatX24.png
similarity index 100%
rename from zkwebui/images/ChatX24.png
rename to org.adempiere.ui.zk/images/ChatX24.png
diff --git a/zkwebui/images/ComPiereCom.jpg b/org.adempiere.ui.zk/images/ComPiereCom.jpg
similarity index 100%
rename from zkwebui/images/ComPiereCom.jpg
rename to org.adempiere.ui.zk/images/ComPiereCom.jpg
diff --git a/zkwebui/images/ComPiereCom.png b/org.adempiere.ui.zk/images/ComPiereCom.png
similarity index 100%
rename from zkwebui/images/ComPiereCom.png
rename to org.adempiere.ui.zk/images/ComPiereCom.png
diff --git a/zkwebui/images/ComPiereComHR.png b/org.adempiere.ui.zk/images/ComPiereComHR.png
similarity index 100%
rename from zkwebui/images/ComPiereComHR.png
rename to org.adempiere.ui.zk/images/ComPiereComHR.png
diff --git a/zkwebui/images/ComPiereComx.png b/org.adempiere.ui.zk/images/ComPiereComx.png
similarity index 100%
rename from zkwebui/images/ComPiereComx.png
rename to org.adempiere.ui.zk/images/ComPiereComx.png
diff --git a/zkwebui/images/Compiere.jpg b/org.adempiere.ui.zk/images/Compiere.jpg
similarity index 100%
rename from zkwebui/images/Compiere.jpg
rename to org.adempiere.ui.zk/images/Compiere.jpg
diff --git a/zkwebui/images/Compiere.png b/org.adempiere.ui.zk/images/Compiere.png
similarity index 100%
rename from zkwebui/images/Compiere.png
rename to org.adempiere.ui.zk/images/Compiere.png
diff --git a/zkwebui/images/CompiereHR.png b/org.adempiere.ui.zk/images/CompiereHR.png
similarity index 100%
rename from zkwebui/images/CompiereHR.png
rename to org.adempiere.ui.zk/images/CompiereHR.png
diff --git a/zkwebui/images/Compierex.png b/org.adempiere.ui.zk/images/Compierex.png
similarity index 100%
rename from zkwebui/images/Compierex.png
rename to org.adempiere.ui.zk/images/Compierex.png
diff --git a/zkwebui/images/Copy16.png b/org.adempiere.ui.zk/images/Copy16.png
similarity index 100%
rename from zkwebui/images/Copy16.png
rename to org.adempiere.ui.zk/images/Copy16.png
diff --git a/zkwebui/images/Copy24.png b/org.adempiere.ui.zk/images/Copy24.png
similarity index 100%
rename from zkwebui/images/Copy24.png
rename to org.adempiere.ui.zk/images/Copy24.png
diff --git a/zkwebui/images/Customize16.png b/org.adempiere.ui.zk/images/Customize16.png
similarity index 100%
rename from zkwebui/images/Customize16.png
rename to org.adempiere.ui.zk/images/Customize16.png
diff --git a/zkwebui/images/Customize24.png b/org.adempiere.ui.zk/images/Customize24.png
similarity index 100%
rename from zkwebui/images/Customize24.png
rename to org.adempiere.ui.zk/images/Customize24.png
diff --git a/zkwebui/images/Delete16.png b/org.adempiere.ui.zk/images/Delete16.png
similarity index 100%
rename from zkwebui/images/Delete16.png
rename to org.adempiere.ui.zk/images/Delete16.png
diff --git a/zkwebui/images/Delete24.png b/org.adempiere.ui.zk/images/Delete24.png
similarity index 100%
rename from zkwebui/images/Delete24.png
rename to org.adempiere.ui.zk/images/Delete24.png
diff --git a/zkwebui/images/DeleteSelection16.png b/org.adempiere.ui.zk/images/DeleteSelection16.png
similarity index 100%
rename from zkwebui/images/DeleteSelection16.png
rename to org.adempiere.ui.zk/images/DeleteSelection16.png
diff --git a/zkwebui/images/DeleteSelection24.png b/org.adempiere.ui.zk/images/DeleteSelection24.png
similarity index 100%
rename from zkwebui/images/DeleteSelection24.png
rename to org.adempiere.ui.zk/images/DeleteSelection24.png
diff --git a/zkwebui/images/Detail16.png b/org.adempiere.ui.zk/images/Detail16.png
similarity index 100%
rename from zkwebui/images/Detail16.png
rename to org.adempiere.ui.zk/images/Detail16.png
diff --git a/zkwebui/images/Detail24.png b/org.adempiere.ui.zk/images/Detail24.png
similarity index 100%
rename from zkwebui/images/Detail24.png
rename to org.adempiere.ui.zk/images/Detail24.png
diff --git a/zkwebui/images/EMailSupport16.png b/org.adempiere.ui.zk/images/EMailSupport16.png
similarity index 100%
rename from zkwebui/images/EMailSupport16.png
rename to org.adempiere.ui.zk/images/EMailSupport16.png
diff --git a/zkwebui/images/EMailSupport24.png b/org.adempiere.ui.zk/images/EMailSupport24.png
similarity index 100%
rename from zkwebui/images/EMailSupport24.png
rename to org.adempiere.ui.zk/images/EMailSupport24.png
diff --git a/zkwebui/images/Edit16.png b/org.adempiere.ui.zk/images/Edit16.png
similarity index 100%
rename from zkwebui/images/Edit16.png
rename to org.adempiere.ui.zk/images/Edit16.png
diff --git a/zkwebui/images/Edit24.png b/org.adempiere.ui.zk/images/Edit24.png
similarity index 100%
rename from zkwebui/images/Edit24.png
rename to org.adempiere.ui.zk/images/Edit24.png
diff --git a/zkwebui/images/Editor16.png b/org.adempiere.ui.zk/images/Editor16.png
similarity index 100%
rename from zkwebui/images/Editor16.png
rename to org.adempiere.ui.zk/images/Editor16.png
diff --git a/zkwebui/images/Editor24.png b/org.adempiere.ui.zk/images/Editor24.png
similarity index 100%
rename from zkwebui/images/Editor24.png
rename to org.adempiere.ui.zk/images/Editor24.png
diff --git a/zkwebui/images/End16.png b/org.adempiere.ui.zk/images/End16.png
similarity index 100%
rename from zkwebui/images/End16.png
rename to org.adempiere.ui.zk/images/End16.png
diff --git a/zkwebui/images/End24.png b/org.adempiere.ui.zk/images/End24.png
similarity index 100%
rename from zkwebui/images/End24.png
rename to org.adempiere.ui.zk/images/End24.png
diff --git a/zkwebui/images/Error32.png b/org.adempiere.ui.zk/images/Error32.png
similarity index 100%
rename from zkwebui/images/Error32.png
rename to org.adempiere.ui.zk/images/Error32.png
diff --git a/zkwebui/images/Exit16.png b/org.adempiere.ui.zk/images/Exit16.png
similarity index 100%
rename from zkwebui/images/Exit16.png
rename to org.adempiere.ui.zk/images/Exit16.png
diff --git a/zkwebui/images/Exit24.png b/org.adempiere.ui.zk/images/Exit24.png
similarity index 100%
rename from zkwebui/images/Exit24.png
rename to org.adempiere.ui.zk/images/Exit24.png
diff --git a/zkwebui/images/Export16.png b/org.adempiere.ui.zk/images/Export16.png
similarity index 100%
rename from zkwebui/images/Export16.png
rename to org.adempiere.ui.zk/images/Export16.png
diff --git a/zkwebui/images/Export16X.png b/org.adempiere.ui.zk/images/Export16X.png
similarity index 100%
rename from zkwebui/images/Export16X.png
rename to org.adempiere.ui.zk/images/Export16X.png
diff --git a/zkwebui/images/Export24.png b/org.adempiere.ui.zk/images/Export24.png
similarity index 100%
rename from zkwebui/images/Export24.png
rename to org.adempiere.ui.zk/images/Export24.png
diff --git a/zkwebui/images/Export24X.png b/org.adempiere.ui.zk/images/Export24X.png
similarity index 100%
rename from zkwebui/images/Export24X.png
rename to org.adempiere.ui.zk/images/Export24X.png
diff --git a/zkwebui/images/ExportX16.png b/org.adempiere.ui.zk/images/ExportX16.png
similarity index 100%
rename from zkwebui/images/ExportX16.png
rename to org.adempiere.ui.zk/images/ExportX16.png
diff --git a/zkwebui/images/ExportX24.png b/org.adempiere.ui.zk/images/ExportX24.png
similarity index 100%
rename from zkwebui/images/ExportX24.png
rename to org.adempiere.ui.zk/images/ExportX24.png
diff --git a/zkwebui/images/FastBack24.png b/org.adempiere.ui.zk/images/FastBack24.png
similarity index 100%
rename from zkwebui/images/FastBack24.png
rename to org.adempiere.ui.zk/images/FastBack24.png
diff --git a/zkwebui/images/FastForward24.png b/org.adempiere.ui.zk/images/FastForward24.png
similarity index 100%
rename from zkwebui/images/FastForward24.png
rename to org.adempiere.ui.zk/images/FastForward24.png
diff --git a/zkwebui/images/Find16.png b/org.adempiere.ui.zk/images/Find16.png
similarity index 100%
rename from zkwebui/images/Find16.png
rename to org.adempiere.ui.zk/images/Find16.png
diff --git a/zkwebui/images/Find24.png b/org.adempiere.ui.zk/images/Find24.png
similarity index 100%
rename from zkwebui/images/Find24.png
rename to org.adempiere.ui.zk/images/Find24.png
diff --git a/zkwebui/images/FindX16.png b/org.adempiere.ui.zk/images/FindX16.png
similarity index 100%
rename from zkwebui/images/FindX16.png
rename to org.adempiere.ui.zk/images/FindX16.png
diff --git a/zkwebui/images/FindX24.png b/org.adempiere.ui.zk/images/FindX24.png
similarity index 100%
rename from zkwebui/images/FindX24.png
rename to org.adempiere.ui.zk/images/FindX24.png
diff --git a/zkwebui/images/First16.png b/org.adempiere.ui.zk/images/First16.png
similarity index 100%
rename from zkwebui/images/First16.png
rename to org.adempiere.ui.zk/images/First16.png
diff --git a/zkwebui/images/First24.png b/org.adempiere.ui.zk/images/First24.png
similarity index 100%
rename from zkwebui/images/First24.png
rename to org.adempiere.ui.zk/images/First24.png
diff --git a/zkwebui/images/First24D.png b/org.adempiere.ui.zk/images/First24D.png
similarity index 100%
rename from zkwebui/images/First24D.png
rename to org.adempiere.ui.zk/images/First24D.png
diff --git a/zkwebui/images/Folder16.png b/org.adempiere.ui.zk/images/Folder16.png
similarity index 100%
rename from zkwebui/images/Folder16.png
rename to org.adempiere.ui.zk/images/Folder16.png
diff --git a/zkwebui/images/Folder24.png b/org.adempiere.ui.zk/images/Folder24.png
similarity index 100%
rename from zkwebui/images/Folder24.png
rename to org.adempiere.ui.zk/images/Folder24.png
diff --git a/zkwebui/images/GetMail16.png b/org.adempiere.ui.zk/images/GetMail16.png
similarity index 100%
rename from zkwebui/images/GetMail16.png
rename to org.adempiere.ui.zk/images/GetMail16.png
diff --git a/zkwebui/images/GetMail24.png b/org.adempiere.ui.zk/images/GetMail24.png
similarity index 100%
rename from zkwebui/images/GetMail24.png
rename to org.adempiere.ui.zk/images/GetMail24.png
diff --git a/zkwebui/images/Help16.png b/org.adempiere.ui.zk/images/Help16.png
similarity index 100%
rename from zkwebui/images/Help16.png
rename to org.adempiere.ui.zk/images/Help16.png
diff --git a/zkwebui/images/Help24.png b/org.adempiere.ui.zk/images/Help24.png
similarity index 100%
rename from zkwebui/images/Help24.png
rename to org.adempiere.ui.zk/images/Help24.png
diff --git a/zkwebui/images/History16.png b/org.adempiere.ui.zk/images/History16.png
similarity index 100%
rename from zkwebui/images/History16.png
rename to org.adempiere.ui.zk/images/History16.png
diff --git a/zkwebui/images/History24.png b/org.adempiere.ui.zk/images/History24.png
similarity index 100%
rename from zkwebui/images/History24.png
rename to org.adempiere.ui.zk/images/History24.png
diff --git a/zkwebui/images/History24D.png b/org.adempiere.ui.zk/images/History24D.png
similarity index 100%
rename from zkwebui/images/History24D.png
rename to org.adempiere.ui.zk/images/History24D.png
diff --git a/zkwebui/images/HistoryX16.png b/org.adempiere.ui.zk/images/HistoryX16.png
similarity index 100%
rename from zkwebui/images/HistoryX16.png
rename to org.adempiere.ui.zk/images/HistoryX16.png
diff --git a/zkwebui/images/HistoryX24.png b/org.adempiere.ui.zk/images/HistoryX24.png
similarity index 100%
rename from zkwebui/images/HistoryX24.png
rename to org.adempiere.ui.zk/images/HistoryX24.png
diff --git a/zkwebui/images/Home16.png b/org.adempiere.ui.zk/images/Home16.png
similarity index 100%
rename from zkwebui/images/Home16.png
rename to org.adempiere.ui.zk/images/Home16.png
diff --git a/zkwebui/images/Home24.png b/org.adempiere.ui.zk/images/Home24.png
similarity index 100%
rename from zkwebui/images/Home24.png
rename to org.adempiere.ui.zk/images/Home24.png
diff --git a/zkwebui/images/Ignore16.png b/org.adempiere.ui.zk/images/Ignore16.png
similarity index 100%
rename from zkwebui/images/Ignore16.png
rename to org.adempiere.ui.zk/images/Ignore16.png
diff --git a/zkwebui/images/Ignore24.png b/org.adempiere.ui.zk/images/Ignore24.png
similarity index 100%
rename from zkwebui/images/Ignore24.png
rename to org.adempiere.ui.zk/images/Ignore24.png
diff --git a/zkwebui/images/Import16.png b/org.adempiere.ui.zk/images/Import16.png
similarity index 100%
rename from zkwebui/images/Import16.png
rename to org.adempiere.ui.zk/images/Import16.png
diff --git a/zkwebui/images/Import24.png b/org.adempiere.ui.zk/images/Import24.png
similarity index 100%
rename from zkwebui/images/Import24.png
rename to org.adempiere.ui.zk/images/Import24.png
diff --git a/zkwebui/images/Info16.png b/org.adempiere.ui.zk/images/Info16.png
similarity index 100%
rename from zkwebui/images/Info16.png
rename to org.adempiere.ui.zk/images/Info16.png
diff --git a/zkwebui/images/Info24.png b/org.adempiere.ui.zk/images/Info24.png
similarity index 100%
rename from zkwebui/images/Info24.png
rename to org.adempiere.ui.zk/images/Info24.png
diff --git a/zkwebui/images/InfoAccount16.png b/org.adempiere.ui.zk/images/InfoAccount16.png
similarity index 100%
rename from zkwebui/images/InfoAccount16.png
rename to org.adempiere.ui.zk/images/InfoAccount16.png
diff --git a/zkwebui/images/InfoAccount24.png b/org.adempiere.ui.zk/images/InfoAccount24.png
similarity index 100%
rename from zkwebui/images/InfoAccount24.png
rename to org.adempiere.ui.zk/images/InfoAccount24.png
diff --git a/zkwebui/images/InfoBPartner16.png b/org.adempiere.ui.zk/images/InfoBPartner16.png
similarity index 100%
rename from zkwebui/images/InfoBPartner16.png
rename to org.adempiere.ui.zk/images/InfoBPartner16.png
diff --git a/zkwebui/images/InfoBPartner24.png b/org.adempiere.ui.zk/images/InfoBPartner24.png
similarity index 100%
rename from zkwebui/images/InfoBPartner24.png
rename to org.adempiere.ui.zk/images/InfoBPartner24.png
diff --git a/zkwebui/images/InfoProduct16.png b/org.adempiere.ui.zk/images/InfoProduct16.png
similarity index 100%
rename from zkwebui/images/InfoProduct16.png
rename to org.adempiere.ui.zk/images/InfoProduct16.png
diff --git a/zkwebui/images/InfoProduct24.png b/org.adempiere.ui.zk/images/InfoProduct24.png
similarity index 100%
rename from zkwebui/images/InfoProduct24.png
rename to org.adempiere.ui.zk/images/InfoProduct24.png
diff --git a/zkwebui/images/InfoSchedule16.png b/org.adempiere.ui.zk/images/InfoSchedule16.png
similarity index 100%
rename from zkwebui/images/InfoSchedule16.png
rename to org.adempiere.ui.zk/images/InfoSchedule16.png
diff --git a/zkwebui/images/InfoSchedule24.png b/org.adempiere.ui.zk/images/InfoSchedule24.png
similarity index 100%
rename from zkwebui/images/InfoSchedule24.png
rename to org.adempiere.ui.zk/images/InfoSchedule24.png
diff --git a/zkwebui/images/Inform32.png b/org.adempiere.ui.zk/images/Inform32.png
similarity index 100%
rename from zkwebui/images/Inform32.png
rename to org.adempiere.ui.zk/images/Inform32.png
diff --git a/zkwebui/images/Italic16.png b/org.adempiere.ui.zk/images/Italic16.png
similarity index 100%
rename from zkwebui/images/Italic16.png
rename to org.adempiere.ui.zk/images/Italic16.png
diff --git a/zkwebui/images/Java_logo.png b/org.adempiere.ui.zk/images/Java_logo.png
similarity index 100%
rename from zkwebui/images/Java_logo.png
rename to org.adempiere.ui.zk/images/Java_logo.png
diff --git a/zkwebui/images/Last16.png b/org.adempiere.ui.zk/images/Last16.png
similarity index 100%
rename from zkwebui/images/Last16.png
rename to org.adempiere.ui.zk/images/Last16.png
diff --git a/zkwebui/images/Last24.png b/org.adempiere.ui.zk/images/Last24.png
similarity index 100%
rename from zkwebui/images/Last24.png
rename to org.adempiere.ui.zk/images/Last24.png
diff --git a/zkwebui/images/Last24D.png b/org.adempiere.ui.zk/images/Last24D.png
similarity index 100%
rename from zkwebui/images/Last24D.png
rename to org.adempiere.ui.zk/images/Last24D.png
diff --git a/zkwebui/images/Location10.png b/org.adempiere.ui.zk/images/Location10.png
similarity index 100%
rename from zkwebui/images/Location10.png
rename to org.adempiere.ui.zk/images/Location10.png
diff --git a/zkwebui/images/Locator10.png b/org.adempiere.ui.zk/images/Locator10.png
similarity index 100%
rename from zkwebui/images/Locator10.png
rename to org.adempiere.ui.zk/images/Locator10.png
diff --git a/zkwebui/images/Lock16.png b/org.adempiere.ui.zk/images/Lock16.png
similarity index 100%
rename from zkwebui/images/Lock16.png
rename to org.adempiere.ui.zk/images/Lock16.png
diff --git a/zkwebui/images/Lock24.png b/org.adempiere.ui.zk/images/Lock24.png
similarity index 100%
rename from zkwebui/images/Lock24.png
rename to org.adempiere.ui.zk/images/Lock24.png
diff --git a/zkwebui/images/LockX16.png b/org.adempiere.ui.zk/images/LockX16.png
similarity index 100%
rename from zkwebui/images/LockX16.png
rename to org.adempiere.ui.zk/images/LockX16.png
diff --git a/zkwebui/images/LockX24.png b/org.adempiere.ui.zk/images/LockX24.png
similarity index 100%
rename from zkwebui/images/LockX24.png
rename to org.adempiere.ui.zk/images/LockX24.png
diff --git a/zkwebui/images/Logout16.png b/org.adempiere.ui.zk/images/Logout16.png
similarity index 100%
rename from zkwebui/images/Logout16.png
rename to org.adempiere.ui.zk/images/Logout16.png
diff --git a/zkwebui/images/Logout24.png b/org.adempiere.ui.zk/images/Logout24.png
similarity index 100%
rename from zkwebui/images/Logout24.png
rename to org.adempiere.ui.zk/images/Logout24.png
diff --git a/zkwebui/images/Minus16.png b/org.adempiere.ui.zk/images/Minus16.png
similarity index 100%
rename from zkwebui/images/Minus16.png
rename to org.adempiere.ui.zk/images/Minus16.png
diff --git a/zkwebui/images/Minus24.png b/org.adempiere.ui.zk/images/Minus24.png
similarity index 100%
rename from zkwebui/images/Minus24.png
rename to org.adempiere.ui.zk/images/Minus24.png
diff --git a/zkwebui/images/Multi16.png b/org.adempiere.ui.zk/images/Multi16.png
similarity index 100%
rename from zkwebui/images/Multi16.png
rename to org.adempiere.ui.zk/images/Multi16.png
diff --git a/zkwebui/images/Multi24.png b/org.adempiere.ui.zk/images/Multi24.png
similarity index 100%
rename from zkwebui/images/Multi24.png
rename to org.adempiere.ui.zk/images/Multi24.png
diff --git a/zkwebui/images/MultiX16.png b/org.adempiere.ui.zk/images/MultiX16.png
similarity index 100%
rename from zkwebui/images/MultiX16.png
rename to org.adempiere.ui.zk/images/MultiX16.png
diff --git a/zkwebui/images/MultiX24.png b/org.adempiere.ui.zk/images/MultiX24.png
similarity index 100%
rename from zkwebui/images/MultiX24.png
rename to org.adempiere.ui.zk/images/MultiX24.png
diff --git a/zkwebui/images/New16.png b/org.adempiere.ui.zk/images/New16.png
similarity index 100%
rename from zkwebui/images/New16.png
rename to org.adempiere.ui.zk/images/New16.png
diff --git a/zkwebui/images/New24.png b/org.adempiere.ui.zk/images/New24.png
similarity index 100%
rename from zkwebui/images/New24.png
rename to org.adempiere.ui.zk/images/New24.png
diff --git a/zkwebui/images/Next16.png b/org.adempiere.ui.zk/images/Next16.png
similarity index 100%
rename from zkwebui/images/Next16.png
rename to org.adempiere.ui.zk/images/Next16.png
diff --git a/zkwebui/images/Next24.png b/org.adempiere.ui.zk/images/Next24.png
similarity index 100%
rename from zkwebui/images/Next24.png
rename to org.adempiere.ui.zk/images/Next24.png
diff --git a/zkwebui/images/Next24D.png b/org.adempiere.ui.zk/images/Next24D.png
similarity index 100%
rename from zkwebui/images/Next24D.png
rename to org.adempiere.ui.zk/images/Next24D.png
diff --git a/zkwebui/images/Normal16.png b/org.adempiere.ui.zk/images/Normal16.png
similarity index 100%
rename from zkwebui/images/Normal16.png
rename to org.adempiere.ui.zk/images/Normal16.png
diff --git a/zkwebui/images/Ok16.png b/org.adempiere.ui.zk/images/Ok16.png
similarity index 100%
rename from zkwebui/images/Ok16.png
rename to org.adempiere.ui.zk/images/Ok16.png
diff --git a/zkwebui/images/Ok24.png b/org.adempiere.ui.zk/images/Ok24.png
similarity index 100%
rename from zkwebui/images/Ok24.png
rename to org.adempiere.ui.zk/images/Ok24.png
diff --git a/zkwebui/images/Online10.png b/org.adempiere.ui.zk/images/Online10.png
similarity index 100%
rename from zkwebui/images/Online10.png
rename to org.adempiere.ui.zk/images/Online10.png
diff --git a/zkwebui/images/Online16.png b/org.adempiere.ui.zk/images/Online16.png
similarity index 100%
rename from zkwebui/images/Online16.png
rename to org.adempiere.ui.zk/images/Online16.png
diff --git a/zkwebui/images/Online24.png b/org.adempiere.ui.zk/images/Online24.png
similarity index 100%
rename from zkwebui/images/Online24.png
rename to org.adempiere.ui.zk/images/Online24.png
diff --git a/zkwebui/images/Open16.png b/org.adempiere.ui.zk/images/Open16.png
similarity index 100%
rename from zkwebui/images/Open16.png
rename to org.adempiere.ui.zk/images/Open16.png
diff --git a/zkwebui/images/Open24.png b/org.adempiere.ui.zk/images/Open24.png
similarity index 100%
rename from zkwebui/images/Open24.png
rename to org.adempiere.ui.zk/images/Open24.png
diff --git a/zkwebui/images/PAttribute10.png b/org.adempiere.ui.zk/images/PAttribute10.png
similarity index 100%
rename from zkwebui/images/PAttribute10.png
rename to org.adempiere.ui.zk/images/PAttribute10.png
diff --git a/zkwebui/images/PAttribute16.png b/org.adempiere.ui.zk/images/PAttribute16.png
similarity index 100%
rename from zkwebui/images/PAttribute16.png
rename to org.adempiere.ui.zk/images/PAttribute16.png
diff --git a/zkwebui/images/PAttribute24.png b/org.adempiere.ui.zk/images/PAttribute24.png
similarity index 100%
rename from zkwebui/images/PAttribute24.png
rename to org.adempiere.ui.zk/images/PAttribute24.png
diff --git a/zkwebui/images/PageSetup16.png b/org.adempiere.ui.zk/images/PageSetup16.png
similarity index 100%
rename from zkwebui/images/PageSetup16.png
rename to org.adempiere.ui.zk/images/PageSetup16.png
diff --git a/zkwebui/images/PageSetup24.png b/org.adempiere.ui.zk/images/PageSetup24.png
similarity index 100%
rename from zkwebui/images/PageSetup24.png
rename to org.adempiere.ui.zk/images/PageSetup24.png
diff --git a/zkwebui/images/Parent16.png b/org.adempiere.ui.zk/images/Parent16.png
similarity index 100%
rename from zkwebui/images/Parent16.png
rename to org.adempiere.ui.zk/images/Parent16.png
diff --git a/zkwebui/images/Parent24.png b/org.adempiere.ui.zk/images/Parent24.png
similarity index 100%
rename from zkwebui/images/Parent24.png
rename to org.adempiere.ui.zk/images/Parent24.png
diff --git a/zkwebui/images/Payment16.png b/org.adempiere.ui.zk/images/Payment16.png
similarity index 100%
rename from zkwebui/images/Payment16.png
rename to org.adempiere.ui.zk/images/Payment16.png
diff --git a/zkwebui/images/Payment24.png b/org.adempiere.ui.zk/images/Payment24.png
similarity index 100%
rename from zkwebui/images/Payment24.png
rename to org.adempiere.ui.zk/images/Payment24.png
diff --git a/zkwebui/images/PickOpen10.png b/org.adempiere.ui.zk/images/PickOpen10.png
similarity index 100%
rename from zkwebui/images/PickOpen10.png
rename to org.adempiere.ui.zk/images/PickOpen10.png
diff --git a/zkwebui/images/Plus16.png b/org.adempiere.ui.zk/images/Plus16.png
similarity index 100%
rename from zkwebui/images/Plus16.png
rename to org.adempiere.ui.zk/images/Plus16.png
diff --git a/zkwebui/images/Plus24.png b/org.adempiere.ui.zk/images/Plus24.png
similarity index 100%
rename from zkwebui/images/Plus24.png
rename to org.adempiere.ui.zk/images/Plus24.png
diff --git a/zkwebui/images/Posterita.jpg b/org.adempiere.ui.zk/images/Posterita.jpg
similarity index 100%
rename from zkwebui/images/Posterita.jpg
rename to org.adempiere.ui.zk/images/Posterita.jpg
diff --git a/zkwebui/images/PosteritaAjaxUILogo.jpg b/org.adempiere.ui.zk/images/PosteritaAjaxUILogo.jpg
similarity index 100%
rename from zkwebui/images/PosteritaAjaxUILogo.jpg
rename to org.adempiere.ui.zk/images/PosteritaAjaxUILogo.jpg
diff --git a/zkwebui/images/Preference16.png b/org.adempiere.ui.zk/images/Preference16.png
similarity index 100%
rename from zkwebui/images/Preference16.png
rename to org.adempiere.ui.zk/images/Preference16.png
diff --git a/zkwebui/images/Preference24.png b/org.adempiere.ui.zk/images/Preference24.png
similarity index 100%
rename from zkwebui/images/Preference24.png
rename to org.adempiere.ui.zk/images/Preference24.png
diff --git a/zkwebui/images/Previous16.png b/org.adempiere.ui.zk/images/Previous16.png
similarity index 100%
rename from zkwebui/images/Previous16.png
rename to org.adempiere.ui.zk/images/Previous16.png
diff --git a/zkwebui/images/Previous24.png b/org.adempiere.ui.zk/images/Previous24.png
similarity index 100%
rename from zkwebui/images/Previous24.png
rename to org.adempiere.ui.zk/images/Previous24.png
diff --git a/zkwebui/images/Previous24D.png b/org.adempiere.ui.zk/images/Previous24D.png
similarity index 100%
rename from zkwebui/images/Previous24D.png
rename to org.adempiere.ui.zk/images/Previous24D.png
diff --git a/zkwebui/images/Print16.png b/org.adempiere.ui.zk/images/Print16.png
similarity index 100%
rename from zkwebui/images/Print16.png
rename to org.adempiere.ui.zk/images/Print16.png
diff --git a/zkwebui/images/Print24.png b/org.adempiere.ui.zk/images/Print24.png
similarity index 100%
rename from zkwebui/images/Print24.png
rename to org.adempiere.ui.zk/images/Print24.png
diff --git a/zkwebui/images/PrintScreen16.png b/org.adempiere.ui.zk/images/PrintScreen16.png
similarity index 100%
rename from zkwebui/images/PrintScreen16.png
rename to org.adempiere.ui.zk/images/PrintScreen16.png
diff --git a/zkwebui/images/PrintScreen24.png b/org.adempiere.ui.zk/images/PrintScreen24.png
similarity index 100%
rename from zkwebui/images/PrintScreen24.png
rename to org.adempiere.ui.zk/images/PrintScreen24.png
diff --git a/zkwebui/images/Process16.png b/org.adempiere.ui.zk/images/Process16.png
similarity index 100%
rename from zkwebui/images/Process16.png
rename to org.adempiere.ui.zk/images/Process16.png
diff --git a/zkwebui/images/Process24.png b/org.adempiere.ui.zk/images/Process24.png
similarity index 100%
rename from zkwebui/images/Process24.png
rename to org.adempiere.ui.zk/images/Process24.png
diff --git a/zkwebui/images/Product10.png b/org.adempiere.ui.zk/images/Product10.png
similarity index 100%
rename from zkwebui/images/Product10.png
rename to org.adempiere.ui.zk/images/Product10.png
diff --git a/zkwebui/images/Product16.png b/org.adempiere.ui.zk/images/Product16.png
similarity index 100%
rename from zkwebui/images/Product16.png
rename to org.adempiere.ui.zk/images/Product16.png
diff --git a/zkwebui/images/Product24.png b/org.adempiere.ui.zk/images/Product24.png
similarity index 100%
rename from zkwebui/images/Product24.png
rename to org.adempiere.ui.zk/images/Product24.png
diff --git a/zkwebui/images/Question32.png b/org.adempiere.ui.zk/images/Question32.png
similarity index 100%
rename from zkwebui/images/Question32.png
rename to org.adempiere.ui.zk/images/Question32.png
diff --git a/zkwebui/images/Redo16.png b/org.adempiere.ui.zk/images/Redo16.png
similarity index 100%
rename from zkwebui/images/Redo16.png
rename to org.adempiere.ui.zk/images/Redo16.png
diff --git a/zkwebui/images/Redo24.png b/org.adempiere.ui.zk/images/Redo24.png
similarity index 100%
rename from zkwebui/images/Redo24.png
rename to org.adempiere.ui.zk/images/Redo24.png
diff --git a/zkwebui/images/Refresh16.png b/org.adempiere.ui.zk/images/Refresh16.png
similarity index 100%
rename from zkwebui/images/Refresh16.png
rename to org.adempiere.ui.zk/images/Refresh16.png
diff --git a/zkwebui/images/Refresh24.png b/org.adempiere.ui.zk/images/Refresh24.png
similarity index 100%
rename from zkwebui/images/Refresh24.png
rename to org.adempiere.ui.zk/images/Refresh24.png
diff --git a/zkwebui/images/Register16.png b/org.adempiere.ui.zk/images/Register16.png
similarity index 100%
rename from zkwebui/images/Register16.png
rename to org.adempiere.ui.zk/images/Register16.png
diff --git a/zkwebui/images/Register24.png b/org.adempiere.ui.zk/images/Register24.png
similarity index 100%
rename from zkwebui/images/Register24.png
rename to org.adempiere.ui.zk/images/Register24.png
diff --git a/zkwebui/images/Report16.png b/org.adempiere.ui.zk/images/Report16.png
similarity index 100%
rename from zkwebui/images/Report16.png
rename to org.adempiere.ui.zk/images/Report16.png
diff --git a/zkwebui/images/Report24.png b/org.adempiere.ui.zk/images/Report24.png
similarity index 100%
rename from zkwebui/images/Report24.png
rename to org.adempiere.ui.zk/images/Report24.png
diff --git a/zkwebui/images/Request16.png b/org.adempiere.ui.zk/images/Request16.png
similarity index 100%
rename from zkwebui/images/Request16.png
rename to org.adempiere.ui.zk/images/Request16.png
diff --git a/zkwebui/images/Request24.png b/org.adempiere.ui.zk/images/Request24.png
similarity index 100%
rename from zkwebui/images/Request24.png
rename to org.adempiere.ui.zk/images/Request24.png
diff --git a/zkwebui/images/Reset16.png b/org.adempiere.ui.zk/images/Reset16.png
similarity index 100%
rename from zkwebui/images/Reset16.png
rename to org.adempiere.ui.zk/images/Reset16.png
diff --git a/zkwebui/images/Reset24.png b/org.adempiere.ui.zk/images/Reset24.png
similarity index 100%
rename from zkwebui/images/Reset24.png
rename to org.adempiere.ui.zk/images/Reset24.png
diff --git a/zkwebui/images/Save16.png b/org.adempiere.ui.zk/images/Save16.png
similarity index 100%
rename from zkwebui/images/Save16.png
rename to org.adempiere.ui.zk/images/Save16.png
diff --git a/zkwebui/images/Save24.png b/org.adempiere.ui.zk/images/Save24.png
similarity index 100%
rename from zkwebui/images/Save24.png
rename to org.adempiere.ui.zk/images/Save24.png
diff --git a/zkwebui/images/ScreenShot16.png b/org.adempiere.ui.zk/images/ScreenShot16.png
similarity index 100%
rename from zkwebui/images/ScreenShot16.png
rename to org.adempiere.ui.zk/images/ScreenShot16.png
diff --git a/zkwebui/images/ScreenShot24.png b/org.adempiere.ui.zk/images/ScreenShot24.png
similarity index 100%
rename from zkwebui/images/ScreenShot24.png
rename to org.adempiere.ui.zk/images/ScreenShot24.png
diff --git a/zkwebui/images/Script16.png b/org.adempiere.ui.zk/images/Script16.png
similarity index 100%
rename from zkwebui/images/Script16.png
rename to org.adempiere.ui.zk/images/Script16.png
diff --git a/zkwebui/images/Script24.png b/org.adempiere.ui.zk/images/Script24.png
similarity index 100%
rename from zkwebui/images/Script24.png
rename to org.adempiere.ui.zk/images/Script24.png
diff --git a/zkwebui/images/SelectAll16.png b/org.adempiere.ui.zk/images/SelectAll16.png
similarity index 100%
rename from zkwebui/images/SelectAll16.png
rename to org.adempiere.ui.zk/images/SelectAll16.png
diff --git a/zkwebui/images/SelectAll24.png b/org.adempiere.ui.zk/images/SelectAll24.png
similarity index 100%
rename from zkwebui/images/SelectAll24.png
rename to org.adempiere.ui.zk/images/SelectAll24.png
diff --git a/zkwebui/images/SendMail16.png b/org.adempiere.ui.zk/images/SendMail16.png
similarity index 100%
rename from zkwebui/images/SendMail16.png
rename to org.adempiere.ui.zk/images/SendMail16.png
diff --git a/zkwebui/images/SendMail24.png b/org.adempiere.ui.zk/images/SendMail24.png
similarity index 100%
rename from zkwebui/images/SendMail24.png
rename to org.adempiere.ui.zk/images/SendMail24.png
diff --git a/zkwebui/images/Server16.png b/org.adempiere.ui.zk/images/Server16.png
similarity index 100%
rename from zkwebui/images/Server16.png
rename to org.adempiere.ui.zk/images/Server16.png
diff --git a/zkwebui/images/Server24.png b/org.adempiere.ui.zk/images/Server24.png
similarity index 100%
rename from zkwebui/images/Server24.png
rename to org.adempiere.ui.zk/images/Server24.png
diff --git a/zkwebui/images/Setup16.png b/org.adempiere.ui.zk/images/Setup16.png
similarity index 100%
rename from zkwebui/images/Setup16.png
rename to org.adempiere.ui.zk/images/Setup16.png
diff --git a/zkwebui/images/Setup24.png b/org.adempiere.ui.zk/images/Setup24.png
similarity index 100%
rename from zkwebui/images/Setup24.png
rename to org.adempiere.ui.zk/images/Setup24.png
diff --git a/zkwebui/images/StepBack24.png b/org.adempiere.ui.zk/images/StepBack24.png
similarity index 100%
rename from zkwebui/images/StepBack24.png
rename to org.adempiere.ui.zk/images/StepBack24.png
diff --git a/zkwebui/images/StepForward24.png b/org.adempiere.ui.zk/images/StepForward24.png
similarity index 100%
rename from zkwebui/images/StepForward24.png
rename to org.adempiere.ui.zk/images/StepForward24.png
diff --git a/zkwebui/images/Summary16.png b/org.adempiere.ui.zk/images/Summary16.png
similarity index 100%
rename from zkwebui/images/Summary16.png
rename to org.adempiere.ui.zk/images/Summary16.png
diff --git a/zkwebui/images/Summary24.png b/org.adempiere.ui.zk/images/Summary24.png
similarity index 100%
rename from zkwebui/images/Summary24.png
rename to org.adempiere.ui.zk/images/Summary24.png
diff --git a/zkwebui/images/Translate16.png b/org.adempiere.ui.zk/images/Translate16.png
similarity index 100%
rename from zkwebui/images/Translate16.png
rename to org.adempiere.ui.zk/images/Translate16.png
diff --git a/zkwebui/images/Translate24.png b/org.adempiere.ui.zk/images/Translate24.png
similarity index 100%
rename from zkwebui/images/Translate24.png
rename to org.adempiere.ui.zk/images/Translate24.png
diff --git a/zkwebui/images/Underline16.png b/org.adempiere.ui.zk/images/Underline16.png
similarity index 100%
rename from zkwebui/images/Underline16.png
rename to org.adempiere.ui.zk/images/Underline16.png
diff --git a/zkwebui/images/Undo16.png b/org.adempiere.ui.zk/images/Undo16.png
similarity index 100%
rename from zkwebui/images/Undo16.png
rename to org.adempiere.ui.zk/images/Undo16.png
diff --git a/zkwebui/images/Undo24.png b/org.adempiere.ui.zk/images/Undo24.png
similarity index 100%
rename from zkwebui/images/Undo24.png
rename to org.adempiere.ui.zk/images/Undo24.png
diff --git a/zkwebui/images/VPreference16.png b/org.adempiere.ui.zk/images/VPreference16.png
similarity index 100%
rename from zkwebui/images/VPreference16.png
rename to org.adempiere.ui.zk/images/VPreference16.png
diff --git a/zkwebui/images/VPreference24.png b/org.adempiere.ui.zk/images/VPreference24.png
similarity index 100%
rename from zkwebui/images/VPreference24.png
rename to org.adempiere.ui.zk/images/VPreference24.png
diff --git a/zkwebui/images/Warn32.png b/org.adempiere.ui.zk/images/Warn32.png
similarity index 100%
rename from zkwebui/images/Warn32.png
rename to org.adempiere.ui.zk/images/Warn32.png
diff --git a/zkwebui/images/WinSize16.png b/org.adempiere.ui.zk/images/WinSize16.png
similarity index 100%
rename from zkwebui/images/WinSize16.png
rename to org.adempiere.ui.zk/images/WinSize16.png
diff --git a/zkwebui/images/WinSize24.png b/org.adempiere.ui.zk/images/WinSize24.png
similarity index 100%
rename from zkwebui/images/WinSize24.png
rename to org.adempiere.ui.zk/images/WinSize24.png
diff --git a/zkwebui/images/WorkFlow16.png b/org.adempiere.ui.zk/images/WorkFlow16.png
similarity index 100%
rename from zkwebui/images/WorkFlow16.png
rename to org.adempiere.ui.zk/images/WorkFlow16.png
diff --git a/zkwebui/images/WorkFlow24.png b/org.adempiere.ui.zk/images/WorkFlow24.png
similarity index 100%
rename from zkwebui/images/WorkFlow24.png
rename to org.adempiere.ui.zk/images/WorkFlow24.png
diff --git a/zkwebui/images/WorkFlow_16.png b/org.adempiere.ui.zk/images/WorkFlow_16.png
similarity index 100%
rename from zkwebui/images/WorkFlow_16.png
rename to org.adempiere.ui.zk/images/WorkFlow_16.png
diff --git a/zkwebui/images/WorkFlow_24.png b/org.adempiere.ui.zk/images/WorkFlow_24.png
similarity index 100%
rename from zkwebui/images/WorkFlow_24.png
rename to org.adempiere.ui.zk/images/WorkFlow_24.png
diff --git a/zkwebui/images/Zoom16.png b/org.adempiere.ui.zk/images/Zoom16.png
similarity index 100%
rename from zkwebui/images/Zoom16.png
rename to org.adempiere.ui.zk/images/Zoom16.png
diff --git a/zkwebui/images/Zoom24.png b/org.adempiere.ui.zk/images/Zoom24.png
similarity index 100%
rename from zkwebui/images/Zoom24.png
rename to org.adempiere.ui.zk/images/Zoom24.png
diff --git a/zkwebui/images/ZoomAcross16.png b/org.adempiere.ui.zk/images/ZoomAcross16.png
similarity index 100%
rename from zkwebui/images/ZoomAcross16.png
rename to org.adempiere.ui.zk/images/ZoomAcross16.png
diff --git a/zkwebui/images/ZoomAcross24.png b/org.adempiere.ui.zk/images/ZoomAcross24.png
similarity index 100%
rename from zkwebui/images/ZoomAcross24.png
rename to org.adempiere.ui.zk/images/ZoomAcross24.png
diff --git a/zkwebui/images/downarrow.png b/org.adempiere.ui.zk/images/downarrow.png
similarity index 100%
rename from zkwebui/images/downarrow.png
rename to org.adempiere.ui.zk/images/downarrow.png
diff --git a/zkwebui/images/gradient-bg.png b/org.adempiere.ui.zk/images/gradient-bg.png
similarity index 100%
rename from zkwebui/images/gradient-bg.png
rename to org.adempiere.ui.zk/images/gradient-bg.png
diff --git a/zkwebui/images/loading.png b/org.adempiere.ui.zk/images/loading.png
similarity index 100%
rename from zkwebui/images/loading.png
rename to org.adempiere.ui.zk/images/loading.png
diff --git a/zkwebui/images/logo.png b/org.adempiere.ui.zk/images/logo.png
similarity index 100%
rename from zkwebui/images/logo.png
rename to org.adempiere.ui.zk/images/logo.png
diff --git a/zkwebui/images/logo_ad.png b/org.adempiere.ui.zk/images/logo_ad.png
similarity index 100%
rename from zkwebui/images/logo_ad.png
rename to org.adempiere.ui.zk/images/logo_ad.png
diff --git a/zkwebui/images/logoff.JPG b/org.adempiere.ui.zk/images/logoff.JPG
similarity index 100%
rename from zkwebui/images/logoff.JPG
rename to org.adempiere.ui.zk/images/logoff.JPG
diff --git a/zkwebui/images/mClosed.png b/org.adempiere.ui.zk/images/mClosed.png
similarity index 100%
rename from zkwebui/images/mClosed.png
rename to org.adempiere.ui.zk/images/mClosed.png
diff --git a/zkwebui/images/mDocAction.png b/org.adempiere.ui.zk/images/mDocAction.png
similarity index 100%
rename from zkwebui/images/mDocAction.png
rename to org.adempiere.ui.zk/images/mDocAction.png
diff --git a/zkwebui/images/mOpen.png b/org.adempiere.ui.zk/images/mOpen.png
similarity index 100%
rename from zkwebui/images/mOpen.png
rename to org.adempiere.ui.zk/images/mOpen.png
diff --git a/zkwebui/images/mProcess.png b/org.adempiere.ui.zk/images/mProcess.png
similarity index 100%
rename from zkwebui/images/mProcess.png
rename to org.adempiere.ui.zk/images/mProcess.png
diff --git a/zkwebui/images/mReport.png b/org.adempiere.ui.zk/images/mReport.png
similarity index 100%
rename from zkwebui/images/mReport.png
rename to org.adempiere.ui.zk/images/mReport.png
diff --git a/zkwebui/images/mSetVariable.png b/org.adempiere.ui.zk/images/mSetVariable.png
similarity index 100%
rename from zkwebui/images/mSetVariable.png
rename to org.adempiere.ui.zk/images/mSetVariable.png
diff --git a/zkwebui/images/mUserChoice.png b/org.adempiere.ui.zk/images/mUserChoice.png
similarity index 100%
rename from zkwebui/images/mUserChoice.png
rename to org.adempiere.ui.zk/images/mUserChoice.png
diff --git a/zkwebui/images/mWindow.png b/org.adempiere.ui.zk/images/mWindow.png
similarity index 100%
rename from zkwebui/images/mWindow.png
rename to org.adempiere.ui.zk/images/mWindow.png
diff --git a/zkwebui/images/mWorkFlow.png b/org.adempiere.ui.zk/images/mWorkFlow.png
similarity index 100%
rename from zkwebui/images/mWorkFlow.png
rename to org.adempiere.ui.zk/images/mWorkFlow.png
diff --git a/zkwebui/images/mWorkbench.png b/org.adempiere.ui.zk/images/mWorkbench.png
similarity index 100%
rename from zkwebui/images/mWorkbench.png
rename to org.adempiere.ui.zk/images/mWorkbench.png
diff --git a/zkwebui/images/ns-collapse.png b/org.adempiere.ui.zk/images/ns-collapse.png
similarity index 100%
rename from zkwebui/images/ns-collapse.png
rename to org.adempiere.ui.zk/images/ns-collapse.png
diff --git a/zkwebui/images/ns-expand.png b/org.adempiere.ui.zk/images/ns-expand.png
similarity index 100%
rename from zkwebui/images/ns-expand.png
rename to org.adempiere.ui.zk/images/ns-expand.png
diff --git a/zkwebui/images/top.JPG b/org.adempiere.ui.zk/images/top.JPG
similarity index 100%
rename from zkwebui/images/top.JPG
rename to org.adempiere.ui.zk/images/top.JPG
diff --git a/zkwebui/images/uparrow.png b/org.adempiere.ui.zk/images/uparrow.png
similarity index 100%
rename from zkwebui/images/uparrow.png
rename to org.adempiere.ui.zk/images/uparrow.png
diff --git a/zkwebui/images/wfBack24.png b/org.adempiere.ui.zk/images/wfBack24.png
similarity index 100%
rename from zkwebui/images/wfBack24.png
rename to org.adempiere.ui.zk/images/wfBack24.png
diff --git a/zkwebui/images/wfEnd24.png b/org.adempiere.ui.zk/images/wfEnd24.png
similarity index 100%
rename from zkwebui/images/wfEnd24.png
rename to org.adempiere.ui.zk/images/wfEnd24.png
diff --git a/zkwebui/images/wfNext24.png b/org.adempiere.ui.zk/images/wfNext24.png
similarity index 100%
rename from zkwebui/images/wfNext24.png
rename to org.adempiere.ui.zk/images/wfNext24.png
diff --git a/zkwebui/images/wfStart24.png b/org.adempiere.ui.zk/images/wfStart24.png
similarity index 100%
rename from zkwebui/images/wfStart24.png
rename to org.adempiere.ui.zk/images/wfStart24.png
diff --git a/zkwebui/images/zip.png b/org.adempiere.ui.zk/images/zip.png
similarity index 100%
rename from zkwebui/images/zip.png
rename to org.adempiere.ui.zk/images/zip.png
diff --git a/zkwebui/index.zul b/org.adempiere.ui.zk/index.zul
similarity index 100%
rename from zkwebui/index.zul
rename to org.adempiere.ui.zk/index.zul
diff --git a/zkwebui/js/calc.js b/org.adempiere.ui.zk/js/calc.js
similarity index 100%
rename from zkwebui/js/calc.js
rename to org.adempiere.ui.zk/js/calc.js
diff --git a/zkwebui/js/layout.js b/org.adempiere.ui.zk/js/layout.js
similarity index 100%
rename from zkwebui/js/layout.js
rename to org.adempiere.ui.zk/js/layout.js
diff --git a/zkwebui/js/persist-min.js b/org.adempiere.ui.zk/js/persist-min.js
similarity index 100%
rename from zkwebui/js/persist-min.js
rename to org.adempiere.ui.zk/js/persist-min.js
diff --git a/zkwebui/js/report.js b/org.adempiere.ui.zk/js/report.js
similarity index 100%
rename from zkwebui/js/report.js
rename to org.adempiere.ui.zk/js/report.js
diff --git a/zkwebui/js/token.js b/org.adempiere.ui.zk/js/token.js
similarity index 100%
rename from zkwebui/js/token.js
rename to org.adempiere.ui.zk/js/token.js
diff --git a/zkwebui/plugin.xml b/org.adempiere.ui.zk/plugin.xml
similarity index 100%
rename from zkwebui/plugin.xml
rename to org.adempiere.ui.zk/plugin.xml
diff --git a/zkwebui/release_notes.html b/org.adempiere.ui.zk/release_notes.html
similarity index 100%
rename from zkwebui/release_notes.html
rename to org.adempiere.ui.zk/release_notes.html
diff --git a/zkwebui/schema/org.adempiere.webui.Form.exsd b/org.adempiere.ui.zk/schema/org.adempiere.webui.Form.exsd
similarity index 100%
rename from zkwebui/schema/org.adempiere.webui.Form.exsd
rename to org.adempiere.ui.zk/schema/org.adempiere.webui.Form.exsd
diff --git a/zkwebui/theme.zs b/org.adempiere.ui.zk/theme.zs
similarity index 100%
rename from zkwebui/theme.zs
rename to org.adempiere.ui.zk/theme.zs
diff --git a/zkwebui/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
similarity index 100%
rename from zkwebui/theme/default/css/theme.css.dsp
rename to org.adempiere.ui.zk/theme/default/css/theme.css.dsp
diff --git a/zkwebui/theme/default/css/themeie.css.dsp b/org.adempiere.ui.zk/theme/default/css/themeie.css.dsp
similarity index 100%
rename from zkwebui/theme/default/css/themeie.css.dsp
rename to org.adempiere.ui.zk/theme/default/css/themeie.css.dsp
diff --git a/zkwebui/theme/default/images/adtab-left-bg.png b/org.adempiere.ui.zk/theme/default/images/adtab-left-bg.png
similarity index 100%
rename from zkwebui/theme/default/images/adtab-left-bg.png
rename to org.adempiere.ui.zk/theme/default/images/adtab-left-bg.png
diff --git a/zkwebui/theme/default/images/adtab-right-bg.png b/org.adempiere.ui.zk/theme/default/images/adtab-right-bg.png
similarity index 100%
rename from zkwebui/theme/default/images/adtab-right-bg.png
rename to org.adempiere.ui.zk/theme/default/images/adtab-right-bg.png
diff --git a/zkwebui/theme/default/images/header-bg.png b/org.adempiere.ui.zk/theme/default/images/header-bg.png
similarity index 100%
rename from zkwebui/theme/default/images/header-bg.png
rename to org.adempiere.ui.zk/theme/default/images/header-bg.png
diff --git a/zkwebui/theme/default/images/header-logo.png b/org.adempiere.ui.zk/theme/default/images/header-logo.png
similarity index 100%
rename from zkwebui/theme/default/images/header-logo.png
rename to org.adempiere.ui.zk/theme/default/images/header-logo.png
diff --git a/zkwebui/theme/default/images/icon.png b/org.adempiere.ui.zk/theme/default/images/icon.png
similarity index 100%
rename from zkwebui/theme/default/images/icon.png
rename to org.adempiere.ui.zk/theme/default/images/icon.png
diff --git a/zkwebui/theme/default/images/login-box-bg.png b/org.adempiere.ui.zk/theme/default/images/login-box-bg.png
similarity index 100%
rename from zkwebui/theme/default/images/login-box-bg.png
rename to org.adempiere.ui.zk/theme/default/images/login-box-bg.png
diff --git a/zkwebui/theme/default/images/login-box-footer.png b/org.adempiere.ui.zk/theme/default/images/login-box-footer.png
similarity index 100%
rename from zkwebui/theme/default/images/login-box-footer.png
rename to org.adempiere.ui.zk/theme/default/images/login-box-footer.png
diff --git a/zkwebui/theme/default/images/login-box-header.png b/org.adempiere.ui.zk/theme/default/images/login-box-header.png
similarity index 100%
rename from zkwebui/theme/default/images/login-box-header.png
rename to org.adempiere.ui.zk/theme/default/images/login-box-header.png
diff --git a/zkwebui/theme/default/images/login-logo.png b/org.adempiere.ui.zk/theme/default/images/login-logo.png
similarity index 100%
rename from zkwebui/theme/default/images/login-logo.png
rename to org.adempiere.ui.zk/theme/default/images/login-logo.png
diff --git a/zkwebui/theme/default/login-info.zul b/org.adempiere.ui.zk/theme/default/login-info.zul
similarity index 100%
rename from zkwebui/theme/default/login-info.zul
rename to org.adempiere.ui.zk/theme/default/login-info.zul
diff --git a/zkwebui/theme/default/login-left.zul b/org.adempiere.ui.zk/theme/default/login-left.zul
similarity index 100%
rename from zkwebui/theme/default/login-left.zul
rename to org.adempiere.ui.zk/theme/default/login-left.zul
diff --git a/zkwebui/theme/default/login-links.zul b/org.adempiere.ui.zk/theme/default/login-links.zul
similarity index 100%
rename from zkwebui/theme/default/login-links.zul
rename to org.adempiere.ui.zk/theme/default/login-links.zul
diff --git a/zkwebui/theme/default/vendor-logo.zul b/org.adempiere.ui.zk/theme/default/vendor-logo.zul
similarity index 100%
rename from zkwebui/theme/default/vendor-logo.zul
rename to org.adempiere.ui.zk/theme/default/vendor-logo.zul
diff --git a/zkwebui/theme/default/version-info.zul b/org.adempiere.ui.zk/theme/default/version-info.zul
similarity index 100%
rename from zkwebui/theme/default/version-info.zul
rename to org.adempiere.ui.zk/theme/default/version-info.zul
diff --git a/zkwebui/timeout.zul b/org.adempiere.ui.zk/timeout.zul
similarity index 100%
rename from zkwebui/timeout.zul
rename to org.adempiere.ui.zk/timeout.zul
diff --git a/zkwebui/zul/activities.zul b/org.adempiere.ui.zk/zul/activities.zul
similarity index 100%
rename from zkwebui/zul/activities.zul
rename to org.adempiere.ui.zk/zul/activities.zul
diff --git a/zkwebui/zul/calendar.zul b/org.adempiere.ui.zk/zul/calendar.zul
similarity index 100%
rename from zkwebui/zul/calendar.zul
rename to org.adempiere.ui.zk/zul/calendar.zul
diff --git a/zkwebui/zul/favourites.zul b/org.adempiere.ui.zk/zul/favourites.zul
similarity index 100%
rename from zkwebui/zul/favourites.zul
rename to org.adempiere.ui.zk/zul/favourites.zul
diff --git a/zkwebui/zul/menu.zul b/org.adempiere.ui.zk/zul/menu.zul
similarity index 100%
rename from zkwebui/zul/menu.zul
rename to org.adempiere.ui.zk/zul/menu.zul
diff --git a/zkwebui/zul/performance.zul b/org.adempiere.ui.zk/zul/performance.zul
similarity index 100%
rename from zkwebui/zul/performance.zul
rename to org.adempiere.ui.zk/zul/performance.zul
diff --git a/zkwebui/zul/views.zul b/org.adempiere.ui.zk/zul/views.zul
similarity index 100%
rename from zkwebui/zul/views.zul
rename to org.adempiere.ui.zk/zul/views.zul
diff --git a/uibase/.classpath b/org.adempiere.ui/.classpath
similarity index 100%
rename from uibase/.classpath
rename to org.adempiere.ui/.classpath
diff --git a/uibase/.project b/org.adempiere.ui/.project
similarity index 95%
rename from uibase/.project
rename to org.adempiere.ui/.project
index 710a73f14b..343c3bc929 100644
--- a/uibase/.project
+++ b/org.adempiere.ui/.project
@@ -1,6 +1,6 @@
- uibase
+ org.adempiere.ui
diff --git a/uibase/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from uibase/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/uibase/.settings/org.eclipse.pde.core.prefs b/org.adempiere.ui/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from uibase/.settings/org.eclipse.pde.core.prefs
rename to org.adempiere.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/uibase/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
similarity index 92%
rename from uibase/META-INF/MANIFEST.MF
rename to org.adempiere.ui/META-INF/MANIFEST.MF
index 1bbcb4a543..f4962a02b4 100644
--- a/uibase/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: UI base
-Bundle-SymbolicName: org.adempiere.ui.base;singleton:=true
+Bundle-SymbolicName: org.adempiere.ui;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
diff --git a/uibase/build.properties b/org.adempiere.ui/build.properties
similarity index 100%
rename from uibase/build.properties
rename to org.adempiere.ui/build.properties
diff --git a/uibase/plugin.xml b/org.adempiere.ui/plugin.xml
similarity index 100%
rename from uibase/plugin.xml
rename to org.adempiere.ui/plugin.xml
diff --git a/uibase/schema/org.compiere.print.ReportViewerProvider.exsd b/org.adempiere.ui/schema/org.compiere.print.ReportViewerProvider.exsd
similarity index 100%
rename from uibase/schema/org.compiere.print.ReportViewerProvider.exsd
rename to org.adempiere.ui/schema/org.compiere.print.ReportViewerProvider.exsd
diff --git a/uibase/src/org/compiere/apps/ALoginRes.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_ar.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_ar.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_ar.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_ar.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_bg.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_bg.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_bg.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_bg.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_ca.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_ca.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_ca.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_ca.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_da.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_da.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_da.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_da.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_de.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_de.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_de.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_de.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_el.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_el.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_el.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_el.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_es.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_es.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_es.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_es.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_fa.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_fa.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_fa.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_fa.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_fr.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_fr.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_fr.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_fr.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_hr.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_hr.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_hr.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_hr.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_hu.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_hu.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_hu.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_hu.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_in.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_in.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_in.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_in.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_it.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_it.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_it.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_it.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_ja.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_ja.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_ja.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_ja.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_ml.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_ml.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_ml.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_ml.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_ms.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_ms.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_ms.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_ms.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_nl.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_nl.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_nl.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_nl.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_no.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_no.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_no.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_no.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_pl.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_pl.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_pl.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_pl.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_pt.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_pt.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_pt.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_pt.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_ro.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_ro.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_ro.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_ro.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_ru.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_ru.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_ru.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_ru.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_sl.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_sl.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_sl.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_sl.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_sr.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_sr.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_sr.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_sr.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_sv.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_sv.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_sv.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_sv.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_th.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_th.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_th.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_th.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_vi.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_vi.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_vi.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_vi.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_zh.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_zh.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_zh.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_zh.java
diff --git a/uibase/src/org/compiere/apps/ALoginRes_zh_CN.java b/org.adempiere.ui/src/org/compiere/apps/ALoginRes_zh_CN.java
similarity index 100%
rename from uibase/src/org/compiere/apps/ALoginRes_zh_CN.java
rename to org.adempiere.ui/src/org/compiere/apps/ALoginRes_zh_CN.java
diff --git a/uibase/src/org/compiere/apps/AbstractProcessCtl.java b/org.adempiere.ui/src/org/compiere/apps/AbstractProcessCtl.java
similarity index 100%
rename from uibase/src/org/compiere/apps/AbstractProcessCtl.java
rename to org.adempiere.ui/src/org/compiere/apps/AbstractProcessCtl.java
diff --git a/uibase/src/org/compiere/apps/IProcessParameter.java b/org.adempiere.ui/src/org/compiere/apps/IProcessParameter.java
similarity index 100%
rename from uibase/src/org/compiere/apps/IProcessParameter.java
rename to org.adempiere.ui/src/org/compiere/apps/IProcessParameter.java
diff --git a/uibase/src/org/compiere/apps/IStatusBar.java b/org.adempiere.ui/src/org/compiere/apps/IStatusBar.java
similarity index 100%
rename from uibase/src/org/compiere/apps/IStatusBar.java
rename to org.adempiere.ui/src/org/compiere/apps/IStatusBar.java
diff --git a/uibase/src/org/compiere/apps/form/Allocation.java b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/Allocation.java
rename to org.adempiere.ui/src/org/compiere/apps/form/Allocation.java
diff --git a/uibase/src/org/compiere/apps/form/Archive.java b/org.adempiere.ui/src/org/compiere/apps/form/Archive.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/Archive.java
rename to org.adempiere.ui/src/org/compiere/apps/form/Archive.java
diff --git a/uibase/src/org/compiere/apps/form/Charge.java b/org.adempiere.ui/src/org/compiere/apps/form/Charge.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/Charge.java
rename to org.adempiere.ui/src/org/compiere/apps/form/Charge.java
diff --git a/uibase/src/org/compiere/apps/form/GenForm.java b/org.adempiere.ui/src/org/compiere/apps/form/GenForm.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/GenForm.java
rename to org.adempiere.ui/src/org/compiere/apps/form/GenForm.java
diff --git a/uibase/src/org/compiere/apps/form/InOutGen.java b/org.adempiere.ui/src/org/compiere/apps/form/InOutGen.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/InOutGen.java
rename to org.adempiere.ui/src/org/compiere/apps/form/InOutGen.java
diff --git a/uibase/src/org/compiere/apps/form/InvoiceGen.java b/org.adempiere.ui/src/org/compiere/apps/form/InvoiceGen.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/InvoiceGen.java
rename to org.adempiere.ui/src/org/compiere/apps/form/InvoiceGen.java
diff --git a/uibase/src/org/compiere/apps/form/Match.java b/org.adempiere.ui/src/org/compiere/apps/form/Match.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/Match.java
rename to org.adempiere.ui/src/org/compiere/apps/form/Match.java
diff --git a/uibase/src/org/compiere/apps/form/Merge.java b/org.adempiere.ui/src/org/compiere/apps/form/Merge.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/Merge.java
rename to org.adempiere.ui/src/org/compiere/apps/form/Merge.java
diff --git a/uibase/src/org/compiere/apps/form/PayPrint.java b/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/PayPrint.java
rename to org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java
diff --git a/uibase/src/org/compiere/apps/form/PaySelect.java b/org.adempiere.ui/src/org/compiere/apps/form/PaySelect.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/PaySelect.java
rename to org.adempiere.ui/src/org/compiere/apps/form/PaySelect.java
diff --git a/uibase/src/org/compiere/apps/form/TreeMaintenance.java b/org.adempiere.ui/src/org/compiere/apps/form/TreeMaintenance.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/TreeMaintenance.java
rename to org.adempiere.ui/src/org/compiere/apps/form/TreeMaintenance.java
diff --git a/uibase/src/org/compiere/apps/form/TrxMaterial.java b/org.adempiere.ui/src/org/compiere/apps/form/TrxMaterial.java
similarity index 100%
rename from uibase/src/org/compiere/apps/form/TrxMaterial.java
rename to org.adempiere.ui/src/org/compiere/apps/form/TrxMaterial.java
diff --git a/uibase/src/org/compiere/apps/wf/MultilineLabelWidget.java b/org.adempiere.ui/src/org/compiere/apps/wf/MultilineLabelWidget.java
similarity index 100%
rename from uibase/src/org/compiere/apps/wf/MultilineLabelWidget.java
rename to org.adempiere.ui/src/org/compiere/apps/wf/MultilineLabelWidget.java
diff --git a/uibase/src/org/compiere/apps/wf/WFGraphLayout.java b/org.adempiere.ui/src/org/compiere/apps/wf/WFGraphLayout.java
similarity index 100%
rename from uibase/src/org/compiere/apps/wf/WFGraphLayout.java
rename to org.adempiere.ui/src/org/compiere/apps/wf/WFGraphLayout.java
diff --git a/uibase/src/org/compiere/apps/wf/WFNodeWidget.java b/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java
similarity index 100%
rename from uibase/src/org/compiere/apps/wf/WFNodeWidget.java
rename to org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java
diff --git a/uibase/src/org/compiere/apps/wf/WorkflowGraphScene.java b/org.adempiere.ui/src/org/compiere/apps/wf/WorkflowGraphScene.java
similarity index 100%
rename from uibase/src/org/compiere/apps/wf/WorkflowGraphScene.java
rename to org.adempiere.ui/src/org/compiere/apps/wf/WorkflowGraphScene.java
diff --git a/uibase/src/org/compiere/grid/CreateFrom.java b/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java
similarity index 100%
rename from uibase/src/org/compiere/grid/CreateFrom.java
rename to org.adempiere.ui/src/org/compiere/grid/CreateFrom.java
diff --git a/uibase/src/org/compiere/grid/CreateFromInvoice.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
similarity index 100%
rename from uibase/src/org/compiere/grid/CreateFromInvoice.java
rename to org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
diff --git a/uibase/src/org/compiere/grid/CreateFromRMA.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java
similarity index 100%
rename from uibase/src/org/compiere/grid/CreateFromRMA.java
rename to org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java
diff --git a/uibase/src/org/compiere/grid/CreateFromShipment.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
similarity index 100%
rename from uibase/src/org/compiere/grid/CreateFromShipment.java
rename to org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
diff --git a/uibase/src/org/compiere/grid/CreateFromStatement.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
similarity index 100%
rename from uibase/src/org/compiere/grid/CreateFromStatement.java
rename to org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java
diff --git a/uibase/src/org/compiere/grid/ICreateFrom.java b/org.adempiere.ui/src/org/compiere/grid/ICreateFrom.java
similarity index 100%
rename from uibase/src/org/compiere/grid/ICreateFrom.java
rename to org.adempiere.ui/src/org/compiere/grid/ICreateFrom.java
diff --git a/uibase/src/org/compiere/grid/ed/CityVO.java b/org.adempiere.ui/src/org/compiere/grid/ed/CityVO.java
similarity index 100%
rename from uibase/src/org/compiere/grid/ed/CityVO.java
rename to org.adempiere.ui/src/org/compiere/grid/ed/CityVO.java
diff --git a/uibase/src/org/compiere/install/Translation.java b/org.adempiere.ui/src/org/compiere/install/Translation.java
similarity index 100%
rename from uibase/src/org/compiere/install/Translation.java
rename to org.adempiere.ui/src/org/compiere/install/Translation.java
diff --git a/uibase/src/org/compiere/install/TranslationController.java b/org.adempiere.ui/src/org/compiere/install/TranslationController.java
similarity index 100%
rename from uibase/src/org/compiere/install/TranslationController.java
rename to org.adempiere.ui/src/org/compiere/install/TranslationController.java
diff --git a/uibase/src/org/compiere/install/TranslationHandler.java b/org.adempiere.ui/src/org/compiere/install/TranslationHandler.java
similarity index 100%
rename from uibase/src/org/compiere/install/TranslationHandler.java
rename to org.adempiere.ui/src/org/compiere/install/TranslationHandler.java
diff --git a/uibase/src/org/compiere/minigrid/ColumnInfo.java b/org.adempiere.ui/src/org/compiere/minigrid/ColumnInfo.java
similarity index 100%
rename from uibase/src/org/compiere/minigrid/ColumnInfo.java
rename to org.adempiere.ui/src/org/compiere/minigrid/ColumnInfo.java
diff --git a/uibase/src/org/compiere/minigrid/IDColumn.java b/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java
similarity index 100%
rename from uibase/src/org/compiere/minigrid/IDColumn.java
rename to org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java
diff --git a/uibase/src/org/compiere/minigrid/IMiniTable.java b/org.adempiere.ui/src/org/compiere/minigrid/IMiniTable.java
similarity index 100%
rename from uibase/src/org/compiere/minigrid/IMiniTable.java
rename to org.adempiere.ui/src/org/compiere/minigrid/IMiniTable.java
diff --git a/uibase/src/org/compiere/print/ReportCtl.java b/org.adempiere.ui/src/org/compiere/print/ReportCtl.java
similarity index 100%
rename from uibase/src/org/compiere/print/ReportCtl.java
rename to org.adempiere.ui/src/org/compiere/print/ReportCtl.java
diff --git a/uibase/src/org/compiere/print/ReportViewerProvider.java b/org.adempiere.ui/src/org/compiere/print/ReportViewerProvider.java
similarity index 100%
rename from uibase/src/org/compiere/print/ReportViewerProvider.java
rename to org.adempiere.ui/src/org/compiere/print/ReportViewerProvider.java
diff --git a/org.adempiere.webstore-feature/.project b/org.adempiere.webstore-feature/.project
new file mode 100644
index 0000000000..e8710a6c05
--- /dev/null
+++ b/org.adempiere.webstore-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.adempiere.webstore-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.adempiere.webstore-feature/build.properties b/org.adempiere.webstore-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.adempiere.webstore-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml
new file mode 100644
index 0000000000..69afd245e7
--- /dev/null
+++ b/org.adempiere.webstore-feature/feature.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webStore/.classpath b/org.adempiere.webstore/.classpath
similarity index 100%
rename from webStore/.classpath
rename to org.adempiere.webstore/.classpath
diff --git a/JasperReportsClient/.project b/org.adempiere.webstore/.project
similarity index 94%
rename from JasperReportsClient/.project
rename to org.adempiere.webstore/.project
index 3f933fbaf4..663e0863fe 100644
--- a/JasperReportsClient/.project
+++ b/org.adempiere.webstore/.project
@@ -1,6 +1,6 @@
- JasperReportsClient
+ org.adempiere.webstore
@@ -22,7 +22,7 @@
- org.eclipse.pde.PluginNatureorg.eclipse.jdt.core.javanature
+ org.eclipse.pde.PluginNature
diff --git a/webStore/.settings/com.genuitec.jboss.ide.eclipse.xdoclet.run.prefs b/org.adempiere.webstore/.settings/com.genuitec.jboss.ide.eclipse.xdoclet.run.prefs
similarity index 100%
rename from webStore/.settings/com.genuitec.jboss.ide.eclipse.xdoclet.run.prefs
rename to org.adempiere.webstore/.settings/com.genuitec.jboss.ide.eclipse.xdoclet.run.prefs
diff --git a/webStore/.settings/org.eclipse.core.resources.prefs b/org.adempiere.webstore/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from webStore/.settings/org.eclipse.core.resources.prefs
rename to org.adempiere.webstore/.settings/org.eclipse.core.resources.prefs
diff --git a/webStore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from webStore/.settings/org.eclipse.jdt.core.prefs
rename to org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
diff --git a/webStore/Adempiere120x60.gif b/org.adempiere.webstore/ADempiere120x60.gif
similarity index 100%
rename from webStore/Adempiere120x60.gif
rename to org.adempiere.webstore/ADempiere120x60.gif
diff --git a/webStore/AdemPiereInc120x60.gif b/org.adempiere.webstore/AdemPiereInc120x60.gif
similarity index 100%
rename from webStore/AdemPiereInc120x60.gif
rename to org.adempiere.webstore/AdemPiereInc120x60.gif
diff --git a/webStore/AdempiereERP.gif b/org.adempiere.webstore/AdempiereERP.gif
similarity index 100%
rename from webStore/AdempiereERP.gif
rename to org.adempiere.webstore/AdempiereERP.gif
diff --git a/webStore/AdempiereSKY.jpg b/org.adempiere.webstore/AdempiereSKY.jpg
similarity index 100%
rename from webStore/AdempiereSKY.jpg
rename to org.adempiere.webstore/AdempiereSKY.jpg
diff --git a/webStore/Background.gif b/org.adempiere.webstore/Background.gif
similarity index 100%
rename from webStore/Background.gif
rename to org.adempiere.webstore/Background.gif
diff --git a/webStore/C32.gif b/org.adempiere.webstore/C32.gif
similarity index 100%
rename from webStore/C32.gif
rename to org.adempiere.webstore/C32.gif
diff --git a/webStore/Calculator16.gif b/org.adempiere.webstore/Calculator16.gif
similarity index 100%
rename from webStore/Calculator16.gif
rename to org.adempiere.webstore/Calculator16.gif
diff --git a/webStore/Calendar16.gif b/org.adempiere.webstore/Calendar16.gif
similarity index 100%
rename from webStore/Calendar16.gif
rename to org.adempiere.webstore/Calendar16.gif
diff --git a/webStore/LogoSmall.gif b/org.adempiere.webstore/LogoSmall.gif
similarity index 100%
rename from webStore/LogoSmall.gif
rename to org.adempiere.webstore/LogoSmall.gif
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..0abdcbf0d9
--- /dev/null
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -0,0 +1,48 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.adempiere.webstore
+Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0",
+ org.adempiere.base;bundle-version="1.0.0",
+ org.adempiere.report.jasper.webapp;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Web-ContextPath: wstore
+Import-Package: javax.servlet;version="2.5.0",
+ javax.servlet.http;version="2.5.0",
+ javax.servlet.jsp;version="2.1.0",
+ javax.servlet.jsp.el;version="2.1.0",
+ javax.servlet.jsp.jstl.core;version="1.1.2",
+ javax.servlet.jsp.jstl.fmt;version="1.1.2",
+ javax.servlet.jsp.jstl.sql;version="1.1.2",
+ javax.servlet.jsp.jstl.tlv;version="1.1.2",
+ javax.servlet.jsp.resources;version="2.1.0",
+ javax.servlet.jsp.tagext;version="2.1.0",
+ javax.servlet.resources;version="2.5.0",
+ org.apache.ecs,
+ org.apache.ecs.xhtml,
+ org.apache.taglibs.standard;version="1.1.2",
+ org.apache.taglibs.standard.extra.spath;version="1.1.2",
+ org.apache.taglibs.standard.functions;version="1.1.2",
+ org.apache.taglibs.standard.lang.jstl;version="1.1.2",
+ org.apache.taglibs.standard.lang.jstl.parser;version="1.1.2",
+ org.apache.taglibs.standard.lang.jstl.test;version="1.1.2",
+ org.apache.taglibs.standard.lang.jstl.test.beans;version="1.1.2",
+ org.apache.taglibs.standard.lang.support;version="1.1.2",
+ org.apache.taglibs.standard.resources;version="1.1.2",
+ org.apache.taglibs.standard.tag.common.core;version="1.1.2",
+ org.apache.taglibs.standard.tag.common.fmt;version="1.1.2",
+ org.apache.taglibs.standard.tag.common.sql;version="1.1.2",
+ org.apache.taglibs.standard.tag.common.xml;version="1.1.2",
+ org.apache.taglibs.standard.tag.el.core;version="1.1.2",
+ org.apache.taglibs.standard.tag.el.fmt;version="1.1.2",
+ org.apache.taglibs.standard.tag.el.sql;version="1.1.2",
+ org.apache.taglibs.standard.tag.el.xml;version="1.1.2",
+ org.apache.taglibs.standard.tag.rt.core;version="1.1.2",
+ org.apache.taglibs.standard.tag.rt.fmt;version="1.1.2",
+ org.apache.taglibs.standard.tag.rt.sql;version="1.1.2",
+ org.apache.taglibs.standard.tag.rt.xml;version="1.1.2",
+ org.apache.taglibs.standard.tei;version="1.1.2",
+ org.apache.taglibs.standard.tlv;version="1.1.2"
+Export-Package: org.compiere.wstore
+Bundle-ClassPath: webstore.jar
diff --git a/webStore/WEB-INF/c.tld b/org.adempiere.webstore/WEB-INF/c.tld
similarity index 100%
rename from webStore/WEB-INF/c.tld
rename to org.adempiere.webstore/WEB-INF/c.tld
diff --git a/webStore/WEB-INF/fmt.tld b/org.adempiere.webstore/WEB-INF/fmt.tld
similarity index 100%
rename from webStore/WEB-INF/fmt.tld
rename to org.adempiere.webstore/WEB-INF/fmt.tld
diff --git a/webStore/WEB-INF/fn.tld b/org.adempiere.webstore/WEB-INF/fn.tld
similarity index 100%
rename from webStore/WEB-INF/fn.tld
rename to org.adempiere.webstore/WEB-INF/fn.tld
diff --git a/webStore/WEB-INF/jspf/footer.jspf b/org.adempiere.webstore/WEB-INF/jspf/footer.jspf
similarity index 100%
rename from webStore/WEB-INF/jspf/footer.jspf
rename to org.adempiere.webstore/WEB-INF/jspf/footer.jspf
diff --git a/webStore/WEB-INF/jspf/head.jspf b/org.adempiere.webstore/WEB-INF/jspf/head.jspf
similarity index 100%
rename from webStore/WEB-INF/jspf/head.jspf
rename to org.adempiere.webstore/WEB-INF/jspf/head.jspf
diff --git a/webStore/WEB-INF/jspf/header.jspf b/org.adempiere.webstore/WEB-INF/jspf/header.jspf
similarity index 100%
rename from webStore/WEB-INF/jspf/header.jspf
rename to org.adempiere.webstore/WEB-INF/jspf/header.jspf
diff --git a/webStore/WEB-INF/jspf/menu.jspf b/org.adempiere.webstore/WEB-INF/jspf/menu.jspf
similarity index 100%
rename from webStore/WEB-INF/jspf/menu.jspf
rename to org.adempiere.webstore/WEB-INF/jspf/menu.jspf
diff --git a/webStore/WEB-INF/jspf/page.jspf b/org.adempiere.webstore/WEB-INF/jspf/page.jspf
similarity index 100%
rename from webStore/WEB-INF/jspf/page.jspf
rename to org.adempiere.webstore/WEB-INF/jspf/page.jspf
diff --git a/webStore/WEB-INF/jspf/vendor.jspf b/org.adempiere.webstore/WEB-INF/jspf/vendor.jspf
similarity index 100%
rename from webStore/WEB-INF/jspf/vendor.jspf
rename to org.adempiere.webstore/WEB-INF/jspf/vendor.jspf
diff --git a/webStore/WEB-INF/sql.tld b/org.adempiere.webstore/WEB-INF/sql.tld
similarity index 100%
rename from webStore/WEB-INF/sql.tld
rename to org.adempiere.webstore/WEB-INF/sql.tld
diff --git a/webStore/WEB-INF/web.xml b/org.adempiere.webstore/WEB-INF/web.xml
similarity index 100%
rename from webStore/WEB-INF/web.xml
rename to org.adempiere.webstore/WEB-INF/web.xml
diff --git a/webStore/WEB-INF/webStore.tld b/org.adempiere.webstore/WEB-INF/webStore.tld
similarity index 100%
rename from webStore/WEB-INF/webStore.tld
rename to org.adempiere.webstore/WEB-INF/webStore.tld
diff --git a/webStore/WEB-INF/x.tld b/org.adempiere.webstore/WEB-INF/x.tld
similarity index 100%
rename from webStore/WEB-INF/x.tld
rename to org.adempiere.webstore/WEB-INF/x.tld
diff --git a/webStore/addressInfo.jsp b/org.adempiere.webstore/addressInfo.jsp
similarity index 100%
rename from webStore/addressInfo.jsp
rename to org.adempiere.webstore/addressInfo.jsp
diff --git a/webStore/advertisements.jsp b/org.adempiere.webstore/advertisements.jsp
similarity index 100%
rename from webStore/advertisements.jsp
rename to org.adempiere.webstore/advertisements.jsp
diff --git a/webStore/allAds.jsp b/org.adempiere.webstore/allAds.jsp
similarity index 100%
rename from webStore/allAds.jsp
rename to org.adempiere.webstore/allAds.jsp
diff --git a/webStore/amexCID.jpg b/org.adempiere.webstore/amexCID.jpg
similarity index 100%
rename from webStore/amexCID.jpg
rename to org.adempiere.webstore/amexCID.jpg
diff --git a/webStore/assetDownload.gif b/org.adempiere.webstore/assetDownload.gif
similarity index 100%
rename from webStore/assetDownload.gif
rename to org.adempiere.webstore/assetDownload.gif
diff --git a/webStore/assets.jsp b/org.adempiere.webstore/assets.jsp
similarity index 100%
rename from webStore/assets.jsp
rename to org.adempiere.webstore/assets.jsp
diff --git a/webStore/basket.gif b/org.adempiere.webstore/basket.gif
similarity index 100%
rename from webStore/basket.gif
rename to org.adempiere.webstore/basket.gif
diff --git a/webStore/basket.jsp b/org.adempiere.webstore/basket.jsp
similarity index 100%
rename from webStore/basket.jsp
rename to org.adempiere.webstore/basket.jsp
diff --git a/webStore/bbbPrivacy.gif b/org.adempiere.webstore/bbbPrivacy.gif
similarity index 100%
rename from webStore/bbbPrivacy.gif
rename to org.adempiere.webstore/bbbPrivacy.gif
diff --git a/webStore/bbbReliability.gif b/org.adempiere.webstore/bbbReliability.gif
similarity index 100%
rename from webStore/bbbReliability.gif
rename to org.adempiere.webstore/bbbReliability.gif
diff --git a/org.adempiere.webstore/build.properties b/org.adempiere.webstore/build.properties
new file mode 100644
index 0000000000..01fa88cf00
--- /dev/null
+++ b/org.adempiere.webstore/build.properties
@@ -0,0 +1,13 @@
+bin.includes = META-INF/,\
+ *.*,\
+ WEB-INF/,\
+ webstore.jar
+bin.excludes = src/**,\
+ build/**,\
+ .settings/**,\
+ .classpath,\
+ .project,\
+ build.properties
+jars.compile.order = webstore.jar
+output.webstore.jar = build/
+source.webstore.jar = src/
diff --git a/webStore/checkout.gif b/org.adempiere.webstore/checkout.gif
similarity index 100%
rename from webStore/checkout.gif
rename to org.adempiere.webstore/checkout.gif
diff --git a/webStore/commissionRuns.jsp b/org.adempiere.webstore/commissionRuns.jsp
similarity index 100%
rename from webStore/commissionRuns.jsp
rename to org.adempiere.webstore/commissionRuns.jsp
diff --git a/webStore/commissionedInvoices.jsp b/org.adempiere.webstore/commissionedInvoices.jsp
similarity index 100%
rename from webStore/commissionedInvoices.jsp
rename to org.adempiere.webstore/commissionedInvoices.jsp
diff --git a/webStore/confirm.jsp b/org.adempiere.webstore/confirm.jsp
similarity index 100%
rename from webStore/confirm.jsp
rename to org.adempiere.webstore/confirm.jsp
diff --git a/webStore/customize.html b/org.adempiere.webstore/customize.html
similarity index 100%
rename from webStore/customize.html
rename to org.adempiere.webstore/customize.html
diff --git a/webStore/emailVerify.jsp b/org.adempiere.webstore/emailVerify.jsp
similarity index 100%
rename from webStore/emailVerify.jsp
rename to org.adempiere.webstore/emailVerify.jsp
diff --git a/webStore/errorPage.jsp b/org.adempiere.webstore/errorPage.jsp
similarity index 100%
rename from webStore/errorPage.jsp
rename to org.adempiere.webstore/errorPage.jsp
diff --git a/webStore/expense.jsp b/org.adempiere.webstore/expense.jsp
similarity index 100%
rename from webStore/expense.jsp
rename to org.adempiere.webstore/expense.jsp
diff --git a/webStore/expenseLine.jsp b/org.adempiere.webstore/expenseLine.jsp
similarity index 100%
rename from webStore/expenseLine.jsp
rename to org.adempiere.webstore/expenseLine.jsp
diff --git a/webStore/expenses.jsp b/org.adempiere.webstore/expenses.jsp
similarity index 100%
rename from webStore/expenses.jsp
rename to org.adempiere.webstore/expenses.jsp
diff --git a/webStore/fade.jpg b/org.adempiere.webstore/fade.jpg
similarity index 100%
rename from webStore/fade.jpg
rename to org.adempiere.webstore/fade.jpg
diff --git a/webStore/favicon.ico b/org.adempiere.webstore/favicon.ico
similarity index 100%
rename from webStore/favicon.ico
rename to org.adempiere.webstore/favicon.ico
diff --git a/webStore/gardenworld-print.css b/org.adempiere.webstore/gardenworld-print.css
similarity index 100%
rename from webStore/gardenworld-print.css
rename to org.adempiere.webstore/gardenworld-print.css
diff --git a/webStore/gardenworld.css b/org.adempiere.webstore/gardenworld.css
similarity index 100%
rename from webStore/gardenworld.css
rename to org.adempiere.webstore/gardenworld.css
diff --git a/webStore/gwr_footertile.jpg b/org.adempiere.webstore/gwr_footertile.jpg
similarity index 100%
rename from webStore/gwr_footertile.jpg
rename to org.adempiere.webstore/gwr_footertile.jpg
diff --git a/webStore/gwr_header.jpg b/org.adempiere.webstore/gwr_header.jpg
similarity index 100%
rename from webStore/gwr_header.jpg
rename to org.adempiere.webstore/gwr_header.jpg
diff --git a/webStore/gwr_logo.gif b/org.adempiere.webstore/gwr_logo.gif
similarity index 100%
rename from webStore/gwr_logo.gif
rename to org.adempiere.webstore/gwr_logo.gif
diff --git a/webStore/help.gif b/org.adempiere.webstore/help.gif
similarity index 100%
rename from webStore/help.gif
rename to org.adempiere.webstore/help.gif
diff --git a/webStore/help.jsp b/org.adempiere.webstore/help.jsp
similarity index 100%
rename from webStore/help.jsp
rename to org.adempiere.webstore/help.jsp
diff --git a/webStore/index.html b/org.adempiere.webstore/index.html
similarity index 100%
rename from webStore/index.html
rename to org.adempiere.webstore/index.html
diff --git a/webStore/index.jsp b/org.adempiere.webstore/index.jsp
similarity index 100%
rename from webStore/index.jsp
rename to org.adempiere.webstore/index.jsp
diff --git a/webStore/info.jsp b/org.adempiere.webstore/info.jsp
similarity index 100%
rename from webStore/info.jsp
rename to org.adempiere.webstore/info.jsp
diff --git a/webStore/invoiceLines.jsp b/org.adempiere.webstore/invoiceLines.jsp
similarity index 100%
rename from webStore/invoiceLines.jsp
rename to org.adempiere.webstore/invoiceLines.jsp
diff --git a/webStore/invoices.jsp b/org.adempiere.webstore/invoices.jsp
similarity index 100%
rename from webStore/invoices.jsp
rename to org.adempiere.webstore/invoices.jsp
diff --git a/webStore/lock.gif b/org.adempiere.webstore/lock.gif
similarity index 100%
rename from webStore/lock.gif
rename to org.adempiere.webstore/lock.gif
diff --git a/webStore/login.jsp b/org.adempiere.webstore/login.jsp
similarity index 100%
rename from webStore/login.jsp
rename to org.adempiere.webstore/login.jsp
diff --git a/webStore/notes.jsp b/org.adempiere.webstore/notes.jsp
similarity index 100%
rename from webStore/notes.jsp
rename to org.adempiere.webstore/notes.jsp
diff --git a/webStore/orderDetails.jsp b/org.adempiere.webstore/orderDetails.jsp
similarity index 100%
rename from webStore/orderDetails.jsp
rename to org.adempiere.webstore/orderDetails.jsp
diff --git a/webStore/orders.jsp b/org.adempiere.webstore/orders.jsp
similarity index 100%
rename from webStore/orders.jsp
rename to org.adempiere.webstore/orders.jsp
diff --git a/webStore/paymentInfo.jsp b/org.adempiere.webstore/paymentInfo.jsp
similarity index 100%
rename from webStore/paymentInfo.jsp
rename to org.adempiere.webstore/paymentInfo.jsp
diff --git a/webStore/payments.jsp b/org.adempiere.webstore/payments.jsp
similarity index 100%
rename from webStore/payments.jsp
rename to org.adempiere.webstore/payments.jsp
diff --git a/webStore/pdf.gif b/org.adempiere.webstore/pdf.gif
similarity index 100%
rename from webStore/pdf.gif
rename to org.adempiere.webstore/pdf.gif
diff --git a/webStore/print-standard.css b/org.adempiere.webstore/print-standard.css
similarity index 100%
rename from webStore/print-standard.css
rename to org.adempiere.webstore/print-standard.css
diff --git a/webStore/registration.jsp b/org.adempiere.webstore/registration.jsp
similarity index 100%
rename from webStore/registration.jsp
rename to org.adempiere.webstore/registration.jsp
diff --git a/webStore/registrations.jsp b/org.adempiere.webstore/registrations.jsp
similarity index 100%
rename from webStore/registrations.jsp
rename to org.adempiere.webstore/registrations.jsp
diff --git a/webStore/request.jsp b/org.adempiere.webstore/request.jsp
similarity index 100%
rename from webStore/request.jsp
rename to org.adempiere.webstore/request.jsp
diff --git a/webStore/requestDetails.jsp b/org.adempiere.webstore/requestDetails.jsp
similarity index 100%
rename from webStore/requestDetails.jsp
rename to org.adempiere.webstore/requestDetails.jsp
diff --git a/webStore/requestTypes.jsp b/org.adempiere.webstore/requestTypes.jsp
similarity index 100%
rename from webStore/requestTypes.jsp
rename to org.adempiere.webstore/requestTypes.jsp
diff --git a/webStore/requests.jsp b/org.adempiere.webstore/requests.jsp
similarity index 100%
rename from webStore/requests.jsp
rename to org.adempiere.webstore/requests.jsp
diff --git a/webStore/requestsAll.jsp b/org.adempiere.webstore/requestsAll.jsp
similarity index 100%
rename from webStore/requestsAll.jsp
rename to org.adempiere.webstore/requestsAll.jsp
diff --git a/webStore/requests_sr.jsp b/org.adempiere.webstore/requests_sr.jsp
similarity index 100%
rename from webStore/requests_sr.jsp
rename to org.adempiere.webstore/requests_sr.jsp
diff --git a/webStore/rfqDetails.jsp b/org.adempiere.webstore/rfqDetails.jsp
similarity index 100%
rename from webStore/rfqDetails.jsp
rename to org.adempiere.webstore/rfqDetails.jsp
diff --git a/webStore/rfqs.jsp b/org.adempiere.webstore/rfqs.jsp
similarity index 100%
rename from webStore/rfqs.jsp
rename to org.adempiere.webstore/rfqs.jsp
diff --git a/webStore/robots.txt b/org.adempiere.webstore/robots.txt
similarity index 100%
rename from webStore/robots.txt
rename to org.adempiere.webstore/robots.txt
diff --git a/webStore/shipments.jsp b/org.adempiere.webstore/shipments.jsp
similarity index 100%
rename from webStore/shipments.jsp
rename to org.adempiere.webstore/shipments.jsp
diff --git a/org.adempiere.webstore/src/.hgignore b/org.adempiere.webstore/src/.hgignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/AdvertisementServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/AdvertisementServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/AdvertisementServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/AdvertisementServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/AssetServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/AssetServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/AssetServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/AssetServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/BasketServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/BasketServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/BasketServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/BasketServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/CheckOutLinkTag.java b/org.adempiere.webstore/src/org/compiere/wstore/CheckOutLinkTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/CheckOutLinkTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/CheckOutLinkTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/CheckOutServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/CheckOutServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/CheckOutServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/CheckOutServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/Click.java b/org.adempiere.webstore/src/org/compiere/wstore/Click.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/Click.java
rename to org.adempiere.webstore/src/org/compiere/wstore/Click.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/Counter.java b/org.adempiere.webstore/src/org/compiere/wstore/Counter.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/Counter.java
rename to org.adempiere.webstore/src/org/compiere/wstore/Counter.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/EMailServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/EMailServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/EMailServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/EMailServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/ExpenseServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/ExpenseServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/ExpenseServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/ExpenseServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/InfoLinkTag.java b/org.adempiere.webstore/src/org/compiere/wstore/InfoLinkTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/InfoLinkTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/InfoLinkTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/InfoServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/InfoServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/InfoServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/InfoServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/InvoiceServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/InvoiceServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/InvoiceServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/InvoiceServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/IssueReportServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/IssueReportServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/IssueReportServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/IssueReportServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/JSPEnv.java b/org.adempiere.webstore/src/org/compiere/wstore/JSPEnv.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/JSPEnv.java
rename to org.adempiere.webstore/src/org/compiere/wstore/JSPEnv.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LocationServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/LocationServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/LocationServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/LocationServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LocationTag.java b/org.adempiere.webstore/src/org/compiere/wstore/LocationTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/LocationTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/LocationTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LoginLinkTag.java b/org.adempiere.webstore/src/org/compiere/wstore/LoginLinkTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/LoginLinkTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/LoginLinkTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/LoginServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/LoginServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/LoginServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/LoginServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/MessageTag.java b/org.adempiere.webstore/src/org/compiere/wstore/MessageTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/MessageTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/MessageTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/NoteServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/NoteServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/NoteServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/NoteServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/OrderServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/OrderServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/OrderServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/OrderServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/PaymentServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/PaymentServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/PaymentServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/PaymentServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/PriceList.java b/org.adempiere.webstore/src/org/compiere/wstore/PriceList.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/PriceList.java
rename to org.adempiere.webstore/src/org/compiere/wstore/PriceList.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/PriceListProduct.java b/org.adempiere.webstore/src/org/compiere/wstore/PriceListProduct.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/PriceListProduct.java
rename to org.adempiere.webstore/src/org/compiere/wstore/PriceListProduct.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/PriceListTag.java b/org.adempiere.webstore/src/org/compiere/wstore/PriceListTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/PriceListTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/PriceListTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/ProductCategoryListTag.java b/org.adempiere.webstore/src/org/compiere/wstore/ProductCategoryListTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/ProductCategoryListTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/ProductCategoryListTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/ProductServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/ProductServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/ProductServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/ProductServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/RegistrationServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/RegistrationServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RequestOrderRefTag.java b/org.adempiere.webstore/src/org/compiere/wstore/RequestOrderRefTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/RequestOrderRefTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/RequestOrderRefTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RequestServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/RequestServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/RequestServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/RequestServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RequestTypeTag.java b/org.adempiere.webstore/src/org/compiere/wstore/RequestTypeTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/RequestTypeTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/RequestTypeTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/RfQServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/RfQServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/RfQServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/RfQServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/SearchServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/SearchServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/SearchServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/SearchServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/SingleItem.java b/org.adempiere.webstore/src/org/compiere/wstore/SingleItem.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/SingleItem.java
rename to org.adempiere.webstore/src/org/compiere/wstore/SingleItem.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/StoreFilter.java b/org.adempiere.webstore/src/org/compiere/wstore/StoreFilter.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/StoreFilter.java
rename to org.adempiere.webstore/src/org/compiere/wstore/StoreFilter.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/UpdateServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/UpdateServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/UpdateServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/UpdateServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WebBasket.java b/org.adempiere.webstore/src/org/compiere/wstore/WebBasket.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/WebBasket.java
rename to org.adempiere.webstore/src/org/compiere/wstore/WebBasket.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WebBasketLine.java b/org.adempiere.webstore/src/org/compiere/wstore/WebBasketLine.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/WebBasketLine.java
rename to org.adempiere.webstore/src/org/compiere/wstore/WebBasketLine.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WebOrder.java b/org.adempiere.webstore/src/org/compiere/wstore/WebOrder.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/WebOrder.java
rename to org.adempiere.webstore/src/org/compiere/wstore/WebOrder.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WorkflowServlet.java b/org.adempiere.webstore/src/org/compiere/wstore/WorkflowServlet.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/WorkflowServlet.java
rename to org.adempiere.webstore/src/org/compiere/wstore/WorkflowServlet.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/WorkflowTag.java b/org.adempiere.webstore/src/org/compiere/wstore/WorkflowTag.java
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/WorkflowTag.java
rename to org.adempiere.webstore/src/org/compiere/wstore/WorkflowTag.java
diff --git a/serverApps/src/main/servlet/org/compiere/wstore/adempiere.tld b/org.adempiere.webstore/src/org/compiere/wstore/adempiere.tld
similarity index 100%
rename from serverApps/src/main/servlet/org/compiere/wstore/adempiere.tld
rename to org.adempiere.webstore/src/org/compiere/wstore/adempiere.tld
diff --git a/webStore/standard-ie6.css b/org.adempiere.webstore/standard-ie6.css
similarity index 100%
rename from webStore/standard-ie6.css
rename to org.adempiere.webstore/standard-ie6.css
diff --git a/webStore/standard-print.css b/org.adempiere.webstore/standard-print.css
similarity index 100%
rename from webStore/standard-print.css
rename to org.adempiere.webstore/standard-print.css
diff --git a/webStore/standard.css b/org.adempiere.webstore/standard.css
similarity index 100%
rename from webStore/standard.css
rename to org.adempiere.webstore/standard.css
diff --git a/webStore/template.jsp b/org.adempiere.webstore/template.jsp
similarity index 100%
rename from webStore/template.jsp
rename to org.adempiere.webstore/template.jsp
diff --git a/webStore/test_1.jsp b/org.adempiere.webstore/test_1.jsp
similarity index 100%
rename from webStore/test_1.jsp
rename to org.adempiere.webstore/test_1.jsp
diff --git a/webStore/update.jsp b/org.adempiere.webstore/update.jsp
similarity index 100%
rename from webStore/update.jsp
rename to org.adempiere.webstore/update.jsp
diff --git a/webStore/visaCID.jpg b/org.adempiere.webstore/visaCID.jpg
similarity index 100%
rename from webStore/visaCID.jpg
rename to org.adempiere.webstore/visaCID.jpg
diff --git a/webStore/wfBack24.gif b/org.adempiere.webstore/wfBack24.gif
similarity index 100%
rename from webStore/wfBack24.gif
rename to org.adempiere.webstore/wfBack24.gif
diff --git a/webStore/wfEnd24.gif b/org.adempiere.webstore/wfEnd24.gif
similarity index 100%
rename from webStore/wfEnd24.gif
rename to org.adempiere.webstore/wfEnd24.gif
diff --git a/webStore/wfNext24.gif b/org.adempiere.webstore/wfNext24.gif
similarity index 100%
rename from webStore/wfNext24.gif
rename to org.adempiere.webstore/wfNext24.gif
diff --git a/webStore/wfStart24.gif b/org.adempiere.webstore/wfStart24.gif
similarity index 100%
rename from webStore/wfStart24.gif
rename to org.adempiere.webstore/wfStart24.gif
diff --git a/serverApps/src/web/wstore.js b/org.adempiere.webstore/wstore.js
similarity index 100%
rename from serverApps/src/web/wstore.js
rename to org.adempiere.webstore/wstore.js
diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/org.apache.ecs/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/pipo/.project b/org.apache.ecs/.project
similarity index 95%
rename from pipo/.project
rename to org.apache.ecs/.project
index 3c9fc47d88..fea7e8497c 100644
--- a/pipo/.project
+++ b/org.apache.ecs/.project
@@ -1,6 +1,6 @@
- pipo
+ org.apache.ecs
diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..a6abaa2b46
--- /dev/null
+++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Sep 27 12:11:10 MYT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.apache.ecs/.settings/org.eclipse.pde.core.prefs b/org.apache.ecs/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f533de1cc9
--- /dev/null
+++ b/org.apache.ecs/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 27 12:11:11 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..f57fa4ef11
--- /dev/null
+++ b/org.apache.ecs/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache ECS
+Bundle-SymbolicName: org.apache.ecs
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.apache.ecs.Activator
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.osgi.framework;version="1.3.0"
+Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
+ org.apache.ecs.filter;uses:="org.apache.ecs",
+ org.apache.ecs.storage,
+ org.apache.ecs.xhtml;uses:="org.apache.ecs",
+ org.apache.ecs.xml;uses:="org.apache.ecs"
diff --git a/tools/src/org/apache/ecs/ecs.properties b/org.apache.ecs/bin/org/apache/ecs/ecs.properties
similarity index 100%
rename from tools/src/org/apache/ecs/ecs.properties
rename to org.apache.ecs/bin/org/apache/ecs/ecs.properties
diff --git a/tools/src/org/apache/ecs/filter/package.html b/org.apache.ecs/bin/org/apache/ecs/filter/package.html
similarity index 100%
rename from tools/src/org/apache/ecs/filter/package.html
rename to org.apache.ecs/bin/org/apache/ecs/filter/package.html
diff --git a/tools/src/org/apache/ecs/package.html b/org.apache.ecs/bin/org/apache/ecs/package.html
similarity index 100%
rename from tools/src/org/apache/ecs/package.html
rename to org.apache.ecs/bin/org/apache/ecs/package.html
diff --git a/tools/src/org/apache/ecs/xml/package.html b/org.apache.ecs/bin/org/apache/ecs/xml/package.html
similarity index 100%
rename from tools/src/org/apache/ecs/xml/package.html
rename to org.apache.ecs/bin/org/apache/ecs/xml/package.html
diff --git a/org.apache.ecs/build.properties b/org.apache.ecs/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/org.apache.ecs/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/org.apache.ecs/src/org/apache/ecs/Activator.java b/org.apache.ecs/src/org/apache/ecs/Activator.java
new file mode 100644
index 0000000000..dc0a369ba7
--- /dev/null
+++ b/org.apache.ecs/src/org/apache/ecs/Activator.java
@@ -0,0 +1,30 @@
+package org.apache.ecs;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
diff --git a/tools/src/org/apache/ecs/AlignType.java b/org.apache.ecs/src/org/apache/ecs/AlignType.java
similarity index 100%
rename from tools/src/org/apache/ecs/AlignType.java
rename to org.apache.ecs/src/org/apache/ecs/AlignType.java
diff --git a/tools/src/org/apache/ecs/Attributes.java b/org.apache.ecs/src/org/apache/ecs/Attributes.java
similarity index 100%
rename from tools/src/org/apache/ecs/Attributes.java
rename to org.apache.ecs/src/org/apache/ecs/Attributes.java
diff --git a/tools/src/org/apache/ecs/ClearElement.java b/org.apache.ecs/src/org/apache/ecs/ClearElement.java
similarity index 100%
rename from tools/src/org/apache/ecs/ClearElement.java
rename to org.apache.ecs/src/org/apache/ecs/ClearElement.java
diff --git a/tools/src/org/apache/ecs/ConcreteElement.java b/org.apache.ecs/src/org/apache/ecs/ConcreteElement.java
similarity index 100%
rename from tools/src/org/apache/ecs/ConcreteElement.java
rename to org.apache.ecs/src/org/apache/ecs/ConcreteElement.java
diff --git a/tools/src/org/apache/ecs/Doctype.java b/org.apache.ecs/src/org/apache/ecs/Doctype.java
similarity index 100%
rename from tools/src/org/apache/ecs/Doctype.java
rename to org.apache.ecs/src/org/apache/ecs/Doctype.java
diff --git a/tools/src/org/apache/ecs/ECSDefaults.java b/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java
similarity index 100%
rename from tools/src/org/apache/ecs/ECSDefaults.java
rename to org.apache.ecs/src/org/apache/ecs/ECSDefaults.java
diff --git a/tools/src/org/apache/ecs/Element.java b/org.apache.ecs/src/org/apache/ecs/Element.java
similarity index 100%
rename from tools/src/org/apache/ecs/Element.java
rename to org.apache.ecs/src/org/apache/ecs/Element.java
diff --git a/tools/src/org/apache/ecs/ElementAttributes.java b/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java
similarity index 100%
rename from tools/src/org/apache/ecs/ElementAttributes.java
rename to org.apache.ecs/src/org/apache/ecs/ElementAttributes.java
diff --git a/tools/src/org/apache/ecs/ElementContainer.java b/org.apache.ecs/src/org/apache/ecs/ElementContainer.java
similarity index 100%
rename from tools/src/org/apache/ecs/ElementContainer.java
rename to org.apache.ecs/src/org/apache/ecs/ElementContainer.java
diff --git a/tools/src/org/apache/ecs/ElementRegistry.java b/org.apache.ecs/src/org/apache/ecs/ElementRegistry.java
similarity index 100%
rename from tools/src/org/apache/ecs/ElementRegistry.java
rename to org.apache.ecs/src/org/apache/ecs/ElementRegistry.java
diff --git a/tools/src/org/apache/ecs/Entities.java b/org.apache.ecs/src/org/apache/ecs/Entities.java
similarity index 100%
rename from tools/src/org/apache/ecs/Entities.java
rename to org.apache.ecs/src/org/apache/ecs/Entities.java
diff --git a/tools/src/org/apache/ecs/Filter.java b/org.apache.ecs/src/org/apache/ecs/Filter.java
similarity index 100%
rename from tools/src/org/apache/ecs/Filter.java
rename to org.apache.ecs/src/org/apache/ecs/Filter.java
diff --git a/tools/src/org/apache/ecs/FocusEvents.java b/org.apache.ecs/src/org/apache/ecs/FocusEvents.java
similarity index 100%
rename from tools/src/org/apache/ecs/FocusEvents.java
rename to org.apache.ecs/src/org/apache/ecs/FocusEvents.java
diff --git a/tools/src/org/apache/ecs/FormEvents.java b/org.apache.ecs/src/org/apache/ecs/FormEvents.java
similarity index 100%
rename from tools/src/org/apache/ecs/FormEvents.java
rename to org.apache.ecs/src/org/apache/ecs/FormEvents.java
diff --git a/tools/src/org/apache/ecs/GenericElement.java b/org.apache.ecs/src/org/apache/ecs/GenericElement.java
similarity index 100%
rename from tools/src/org/apache/ecs/GenericElement.java
rename to org.apache.ecs/src/org/apache/ecs/GenericElement.java
diff --git a/tools/src/org/apache/ecs/HtmlColor.java b/org.apache.ecs/src/org/apache/ecs/HtmlColor.java
similarity index 100%
rename from tools/src/org/apache/ecs/HtmlColor.java
rename to org.apache.ecs/src/org/apache/ecs/HtmlColor.java
diff --git a/tools/src/org/apache/ecs/KeyEvents.java b/org.apache.ecs/src/org/apache/ecs/KeyEvents.java
similarity index 100%
rename from tools/src/org/apache/ecs/KeyEvents.java
rename to org.apache.ecs/src/org/apache/ecs/KeyEvents.java
diff --git a/tools/src/org/apache/ecs/MouseEvents.java b/org.apache.ecs/src/org/apache/ecs/MouseEvents.java
similarity index 100%
rename from tools/src/org/apache/ecs/MouseEvents.java
rename to org.apache.ecs/src/org/apache/ecs/MouseEvents.java
diff --git a/tools/src/org/apache/ecs/MultiPartElement.java b/org.apache.ecs/src/org/apache/ecs/MultiPartElement.java
similarity index 100%
rename from tools/src/org/apache/ecs/MultiPartElement.java
rename to org.apache.ecs/src/org/apache/ecs/MultiPartElement.java
diff --git a/tools/src/org/apache/ecs/PageEvents.java b/org.apache.ecs/src/org/apache/ecs/PageEvents.java
similarity index 100%
rename from tools/src/org/apache/ecs/PageEvents.java
rename to org.apache.ecs/src/org/apache/ecs/PageEvents.java
diff --git a/tools/src/org/apache/ecs/Printable.java b/org.apache.ecs/src/org/apache/ecs/Printable.java
similarity index 100%
rename from tools/src/org/apache/ecs/Printable.java
rename to org.apache.ecs/src/org/apache/ecs/Printable.java
diff --git a/tools/src/org/apache/ecs/SinglePartElement.java b/org.apache.ecs/src/org/apache/ecs/SinglePartElement.java
similarity index 100%
rename from tools/src/org/apache/ecs/SinglePartElement.java
rename to org.apache.ecs/src/org/apache/ecs/SinglePartElement.java
diff --git a/tools/src/org/apache/ecs/StringElement.java b/org.apache.ecs/src/org/apache/ecs/StringElement.java
similarity index 100%
rename from tools/src/org/apache/ecs/StringElement.java
rename to org.apache.ecs/src/org/apache/ecs/StringElement.java
diff --git a/tools/src/org/apache/ecs/XhtmlDocument.java b/org.apache.ecs/src/org/apache/ecs/XhtmlDocument.java
similarity index 100%
rename from tools/src/org/apache/ecs/XhtmlDocument.java
rename to org.apache.ecs/src/org/apache/ecs/XhtmlDocument.java
diff --git a/tools/src/org/apache/ecs/XhtmlFrameSetDocument.java b/org.apache.ecs/src/org/apache/ecs/XhtmlFrameSetDocument.java
similarity index 100%
rename from tools/src/org/apache/ecs/XhtmlFrameSetDocument.java
rename to org.apache.ecs/src/org/apache/ecs/XhtmlFrameSetDocument.java
diff --git a/org.apache.ecs/src/org/apache/ecs/ecs.properties b/org.apache.ecs/src/org/apache/ecs/ecs.properties
new file mode 100644
index 0000000000..fdbd8114eb
--- /dev/null
+++ b/org.apache.ecs/src/org/apache/ecs/ecs.properties
@@ -0,0 +1,16 @@
+filter_state=false
+filter_attribute_state=false
+attribute_equality_sign="="
+begin_start_modifier=" "
+end_start_modifier=" "
+begin_end_modifier=" "
+end_end_modifier=" "
+attribute_quote_char="
+attribute_quote=true
+end_element=true
+codeset=UTF-8
+position=4
+case_type=3
+start_tag=<
+end_tag=>
+pretty_print=true
diff --git a/tools/src/org/apache/ecs/filter/CharacterFilter.java b/org.apache.ecs/src/org/apache/ecs/filter/CharacterFilter.java
similarity index 100%
rename from tools/src/org/apache/ecs/filter/CharacterFilter.java
rename to org.apache.ecs/src/org/apache/ecs/filter/CharacterFilter.java
diff --git a/tools/src/org/apache/ecs/filter/NullFilter.java b/org.apache.ecs/src/org/apache/ecs/filter/NullFilter.java
similarity index 100%
rename from tools/src/org/apache/ecs/filter/NullFilter.java
rename to org.apache.ecs/src/org/apache/ecs/filter/NullFilter.java
diff --git a/tools/src/org/apache/ecs/filter/StringFilter.java b/org.apache.ecs/src/org/apache/ecs/filter/StringFilter.java
similarity index 100%
rename from tools/src/org/apache/ecs/filter/StringFilter.java
rename to org.apache.ecs/src/org/apache/ecs/filter/StringFilter.java
diff --git a/tools/src/org/apache/ecs/filter/WordFilter.java b/org.apache.ecs/src/org/apache/ecs/filter/WordFilter.java
similarity index 100%
rename from tools/src/org/apache/ecs/filter/WordFilter.java
rename to org.apache.ecs/src/org/apache/ecs/filter/WordFilter.java
diff --git a/org.apache.ecs/src/org/apache/ecs/filter/package.html b/org.apache.ecs/src/org/apache/ecs/filter/package.html
new file mode 100644
index 0000000000..37af5ac9a8
--- /dev/null
+++ b/org.apache.ecs/src/org/apache/ecs/filter/package.html
@@ -0,0 +1,2 @@
+
+
diff --git a/org.apache.ecs/src/org/apache/ecs/package.html b/org.apache.ecs/src/org/apache/ecs/package.html
new file mode 100644
index 0000000000..218bd1d0db
--- /dev/null
+++ b/org.apache.ecs/src/org/apache/ecs/package.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+Provides for....
+
+
+
+