Bug 536874: make workbench buildable by maven (#172)
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/.gitignore b/.gitignore
index 3a367cf..28e5a89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@
class/
classes/
!/jpa/org.eclipse.persistence.jpa/src
-!/utils/eclipselink.utils.workbench.test/mappingsplugin/resource
run/
build/
reports/
@@ -33,12 +32,7 @@
/eclipselink.zip
/eclipselink-src.zip
foundation/targets/target.oracle/oracle.libs/*.jar
-utils/eclipselink.utils.workbench.lib/mw/
-utils/eclipselink.utils.workbench.lib/mwtest/
-utils/eclipselink.utils.workbench.test/logs/
-utils/eclipselink.utils.workbench/logs/
test_*.properties
.sonar
/coverage-report/
/jacoco.out
-jsonb/.gradle
diff --git a/utils/eclipselink.utils.workbench.lib/.classpath b/utils/eclipselink.utils.workbench.lib/.classpath
deleted file mode 100644
index 0bc6d93..0000000
--- a/utils/eclipselink.utils.workbench.lib/.classpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="output" path="antlr/classes"/>
-</classpath>
diff --git a/utils/eclipselink.utils.workbench.lib/.project b/utils/eclipselink.utils.workbench.lib/.project
deleted file mode 100644
index 705bec8..0000000
--- a/utils/eclipselink.utils.workbench.lib/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>eclipselink.utils.workbench.lib</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/utils/eclipselink.utils.workbench.lib/.settings/org.eclipse.jdt.core.prefs b/utils/eclipselink.utils.workbench.lib/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/utils/eclipselink.utils.workbench.lib/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/utils/eclipselink.utils.workbench.lib/compile/ant.jar b/utils/eclipselink.utils.workbench.lib/compile/ant.jar
deleted file mode 100644
index 3a67607..0000000
--- a/utils/eclipselink.utils.workbench.lib/compile/ant.jar
+++ /dev/null
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.lib/compile/package-rename.jar b/utils/eclipselink.utils.workbench.lib/compile/package-rename.jar
deleted file mode 100644
index d9218ca..0000000
--- a/utils/eclipselink.utils.workbench.lib/compile/package-rename.jar
+++ /dev/null
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.lib/compile/xercesImpl.jar b/utils/eclipselink.utils.workbench.lib/compile/xercesImpl.jar
deleted file mode 100644
index e0a4c2e..0000000
--- a/utils/eclipselink.utils.workbench.lib/compile/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.lib/run/connector.jar b/utils/eclipselink.utils.workbench.lib/run/connector.jar
deleted file mode 100644
index 6a43dc6..0000000
--- a/utils/eclipselink.utils.workbench.lib/run/connector.jar
+++ /dev/null
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.lib/run/persistence.jar b/utils/eclipselink.utils.workbench.lib/run/persistence.jar
deleted file mode 100644
index 1a1b232..0000000
--- a/utils/eclipselink.utils.workbench.lib/run/persistence.jar
+++ /dev/null
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.lib/source/ant_src.zip b/utils/eclipselink.utils.workbench.lib/source/ant_src.zip
deleted file mode 100644
index 6685482..0000000
--- a/utils/eclipselink.utils.workbench.lib/source/ant_src.zip
+++ /dev/null
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.test/.classpath b/utils/eclipselink.utils.workbench.test/.classpath
deleted file mode 100644
index e94090c..0000000
--- a/utils/eclipselink.utils.workbench.test/.classpath
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="src" path="utility/source"/>
- <classpathentry kind="src" path="uitools/source"/>
- <classpathentry kind="src" path="framework/source"/>
- <classpathentry kind="src" path="platformsplugin/source"/>
- <classpathentry kind="src" path="mappingsplugin/source"/>
- <classpathentry kind="src" path="scplugin/source"/>
- <classpathentry combineaccessrules="false" kind="src" path="/eclipselink.utils.workbench"/>
- <classpathentry kind="lib" path="framework/resource"/>
- <classpathentry kind="lib" path="mappingsplugin/resource"/>
- <classpathentry kind="lib" path="scplugin/resource"/>
- <classpathentry kind="lib" path="/eclipselink.utils.workbench.lib/compile/ant.jar"/>
- <classpathentry kind="lib" path="/eclipselink.utils.workbench.lib/run/connector.jar"/>
- <classpathentry kind="lib" path="/eclipselink.utils.workbench.lib/compile/xercesImpl.jar"/>
- <classpathentry kind="var" path="ECLIPSELINK_HOME/eclipselink.jar" sourcepath="/ECLIPSELINK_SRC_JAR"/>
- <classpathentry kind="lib" path="/eclipselink.utils.workbench.lib/run/persistence.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="/eclipselink.utils.workbench.lib/compile/package-rename.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.nosql"/>
- <classpathentry kind="output" path="class"/>
-</classpath>
diff --git a/utils/eclipselink.utils.workbench.test/.project b/utils/eclipselink.utils.workbench.test/.project
deleted file mode 100644
index 81fda0a..0000000
--- a/utils/eclipselink.utils.workbench.test/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>eclipselink.utils.workbench.test</name>
- <comment></comment>
- <projects>
- <project>mwdev</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/utils/eclipselink.utils.workbench.test/.settings/org.eclipse.jdt.core.prefs b/utils/eclipselink.utils.workbench.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/utils/eclipselink.utils.workbench.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/utils/eclipselink.utils.workbench.test/EclipseLink Workbench Test.launch b/utils/eclipselink.utils.workbench.test/EclipseLink Workbench Test.launch
deleted file mode 100644
index 47e7109..0000000
--- a/utils/eclipselink.utils.workbench.test/EclipseLink Workbench Test.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="eclipselink.utils.workbench.test" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="eclipselink.utils.workbench.test"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench/config" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench/iconlib/resource" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench.test/framework/resource" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench.test/mappingsplugin/resource" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench.test/platformsplugin/source" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench.test/scplugin/resource" path="3" type="2"/> "/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.persistence.tools.workbench.test.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eclipselink.utils.workbench.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M"/>
-</launchConfiguration>
diff --git a/utils/eclipselink.utils.workbench.test/build.properties b/utils/eclipselink.utils.workbench.test/build.properties
deleted file mode 100644
index a1b313d..0000000
--- a/utils/eclipselink.utils.workbench.test/build.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_productName=EclipseLink MW Test
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_buildLogDir=${basedir}/logs
-_publishDir=${basedir}
-
-# Defines for build directories.
-libDir=${basedir}/../eclipselink.utils.workbench.lib/mwtest
-utilityDir=${basedir}/utility
-uitoolsDir=${basedir}/uitools
-frameworkDir=${basedir}/framework
-platformspluginDir=${basedir}/platformsplugin
-mappingspluginDir=${basedir}/mappingsplugin
-scpluginDir=${basedir}/scplugin
-
-# Define for eclipselink.jar location
-_eclipselinkJar=../../../eclipselink.jar
-
-# Defined jarfile names.
-workbench.jarfile=workbench_test.jar
-workbench.jarfile.src=workbench_test_src.jar
-
-# JUnit classpath
-# Update the following whenever /mwtest/.classpath changes.
-junit.classpath= \
- ${basedir}/../mwdev/jlib/mw/elmwcore.jar; \
- ${basedir}/../mwdev/jlib/mw/eclipselinkmw.jar; \
- ${basedir}/../mwdev/config; \
- ${basedir}/jlib/mwtest/workbench_test.jar; \
- ${_eclipselinkJar}; \
- ${basedir}/jlib/compile/packageRename.jar; \
- ${basedir}/jlib/compile/ant.jar; \
- ${junit.lib}; \
- ${basedir}/uitools/resource;\
- ${basedir}/framework/resource; \
- ${basedir}/mappingsplugin/resource; \
- ${basedir}/scplugin/resource; \
- ${basedir}/jlib/jdbc; \
- ${basedir}/jlib/run/connector.jar;
diff --git a/utils/eclipselink.utils.workbench.test/build.xml b/utils/eclipselink.utils.workbench.test/build.xml
deleted file mode 100644
index 103752c..0000000
--- a/utils/eclipselink.utils.workbench.test/build.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="eclipselink.utils.workbench.test" default="all" basedir=".">
-
- <!-- =================================================================== -->
- <!-- High level targets -->
- <!-- =================================================================== -->
-
- <target name="all" depends="clean, build"/>
- <target name="build" depends="init, build-component-libs, jar-workbench"/>
-
- <!-- =================================================================== -->
- <!-- Initialization -->
- <!-- =================================================================== -->
-
- <target name="init">
- <dirname property="mwtest.build.location_temp" file="${ant.file.eclipselink.utils.workbench.test}"/>
- <pathconvert targetos="unix" property="mwtest.build.location">
- <path>
- <pathelement location="${mwtest.build.location_temp}"/>
- </path>
- </pathconvert>
- <tstamp>
- <format property="_TodayMD" pattern="MMdd"/>
- <format property="_TodayDMonthY" pattern="dd, MMMMM yyyy"/>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
- <property file="${user.home}/build.properties"/>
- <property name="extensions.depend.dir" value="../${core_test.2.base.dir}/extension.lib.external"/>
- <property name="junit.lib" value="${extensions.depend.dir}/junit.jar"/>
- <echo message="user.home ='${user.home}'"/>
- <echo message="test.properties ='${test.properties}'"/>
- <echo message="extensions.depend.dir ='${extensions.depend.dir}'"/>
- <echo message="junit.lib ='${junit.lib}'"/>
-
- <property file="${mwtest.build.location}/build.properties"/>
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="version.string" value="${release.version}.qualifier"/>
-
- <echo message="mwtest.build.location = '${mwtest.build.location}'"/>
- <echo message="release.designation = '${release.designation}'"/>
- <echo message="release.version = '${release.version}'"/>
- <echo message="BuildDate.BuildTime = '${build.date}.${build.time}'"/>
- <echo message="java.version = '${java.version}'"/>
- <echo message="os.name = '${os.name}'"/>
- <echo message="os.arch = '${os.arch}'"/>
- <echo message="os.version = '${os.version}'"/>
- <echo message="stop.on.error = '${stop.on.error}'"/>
- <echo message="optimize.code = '${optimize.code}'"/>
- <echo message="report.deprecation = '${report.deprecation}'"/>
- <echo message="javac.debug = '${javac.debug}'"/>
- <echo message="javac.debuglevel = '${javac.debuglevel}'"/>
- <echo message="target.jvm = '${target.jvm}'"/>
- <echo message="java_home = '${java.home}/..'"/>
-
- <mkdir dir="${_buildLogDir}"/>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
-
- <target name="clean" depends="init">
- <ant antfile="build.xml" dir="${utilityDir}" target="clean"/>
- <ant antfile="build.xml" dir="${uitoolsDir}" target="clean"/>
- <ant antfile="build.xml" dir="${frameworkDir}" target="clean"/>
- <ant antfile="build.xml" dir="${platformspluginDir}" target="clean"/>
- <ant antfile="build.xml" dir="${mappingspluginDir}" target="clean"/>
- <ant antfile="build.xml" dir="${scpluginDir}" target="clean"/>
- <delete file="${libDir}/${workbench.jarfile}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Build -->
- <!-- =================================================================== -->
-
- <target name="build-component-libs" depends="init">
- <ant antfile="build.xml" dir="${utilityDir}" target="build-all" output="${_buildLogDir}\utility.log"/>
- <ant antfile="build.xml" dir="${uitoolsDir}" target="build-all" output="${_buildLogDir}\uitools.log"/>
- <ant antfile="build.xml" dir="${frameworkDir}" target="build-all" output="${_buildLogDir}\framework.log"/>
- <ant antfile="build.xml" dir="${platformspluginDir}" target="build-all" output="${_buildLogDir}\platformsplugin.log"/>
- <ant antfile="build.xml" dir="${mappingspluginDir}" target="build-all" output="${_buildLogDir}\mappingsplugin.log"/>
- <ant antfile="build.xml" dir="${scpluginDir}" target="build-all" output="${_buildLogDir}\scplugin.log"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- misc -->
- <!-- =================================================================== -->
-
- <target name="compile-results" unless="build.failed" depends="init">
- </target>
-
- <!-- =================================================================== -->
- <!-- JARs -->
- <!-- =================================================================== -->
-
- <target name="jar-workbench" depends="init">
- <echo message="Implementation-Version: ${version.string}"/>
- <jar jarfile="${libDir}/${workbench.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="TopLink Workbench Tests" />
- </manifest>
- <zipgroupfileset dir="${libDir}">
- <include name="utility_test.jar"/>
- <include name="uitools_test.jar"/>
- <include name="framework_test.jar"/>
- <include name="platformsplugin_test.jar"/>
- <include name="scplugin_test.jar"/>
- <include name="mappingsplugin_test.jar"/>
- </zipgroupfileset>
- </jar>
- </target>
-
- <target name="jar-workbench-src" depends="init">
- <echo message="Implementation-Version: ${version.string}"/>
- <jar jarfile="${libDir}/${workbench.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="TopLink Workbench Tests (source)" />
- </manifest>
- <zipgroupfileset dir="${libDir}">
- <include name="utility_test_src.jar"/>
- <include name="uitools_test_src.jar"/>
- <include name="framework_test_src.jar"/>
- <include name="platformsplugin_test_src.jar"/>
- <include name="scplugin_test_src.jar"/>
- <include name="mappingsplugin_test_src.jar"/>
- </zipgroupfileset>
- </jar>
- </target>
-
- <!-- =================================================================== -->
- <!-- JUnit tests -->
- <!-- =================================================================== -->
-
- <target name="test-all" depends="init">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.AllTests" />
- </junit>
- </target>
-
- <!-- use this target to run a single test case -->
- <target name="test-scratch" depends="init">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.mappingsplugin.ExportRuntimeProjectJavaSourceCommandLineTests" />
- </junit>
- </target>
-
- <!-- use this target to run a single sub-suite -->
- <target name="test-scratch-suite" depends="test-uitools"/>
-
- <target name="test-utility" depends="init">
- <ant antfile="build.xml" dir="${utilityDir}" target="test-all" >
- <property name="junit.classpath" value="${junit.classpath}" />
- </ant>
- </target>
-
- <target name="test-uitools" depends="init">
- <ant antfile="build.xml" dir="${uitoolsDir}" target="test-all" >
- <property name="junit.classpath" value="${junit.classpath}" />
- </ant>
- </target>
-
- <target name="test-framework" depends="init">
- <ant antfile="build.xml" dir="${frameworkDir}" target="test-all" >
- <property name="junit.classpath" value="${junit.classpath}" />
- </ant>
- </target>
-
- <target name="test-platformsplugin" depends="init">
- <ant antfile="build.xml" dir="${platformspluginDir}" target="test-all" >
- <property name="junit.classpath" value="${junit.classpath}" />
- </ant>
- </target>
-
- <target name="test-scplugin" depends="init">
- <ant antfile="build.xml" dir="${scpluginDir}" target="test-all" >
- <property name="junit.classpath" value="${junit.classpath}" />
- </ant>
- </target>
-
- <target name="test-mappingsplugin" depends="init">
- <ant antfile="build.xml" dir="${mappingspluginDir}" target="test-all" >
- <property name="junit.classpath" value="${junit.classpath}" />
- </ant>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench.test/framework/build.properties b/utils/eclipselink.utils.workbench.test/framework/build.properties
deleted file mode 100644
index 15ee459..0000000
--- a/utils/eclipselink.utils.workbench.test/framework/build.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Framework Library Tests
-_productName=EclipseLink
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib
-_mwdevLibDir=${_libDir}/mw
-_jarDestDir=${_libDir}/mwtest
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-framework.jarfile=framework_test.jar
-framework.jarfile.src=framework_test_src.jar
-
-# Defines for build directories.
-compile.framework.resources=${_rootResourceDir}
-compile.framework.srcdir=${_rootSourceDir}
-compile.framework.destdir=${_classesDestDir}
-compile.framework.classpath= \
- ${_jarDestDir}/utility_test.jar; \
- ${_mwdevLibDir}/framework.jar; \
- ${_mwdevLibDir}/uitools.jar; \
- ${_mwdevLibDir}/utility.jar; \
- ${junit.lib}
diff --git a/utils/eclipselink.utils.workbench.test/framework/build.xml b/utils/eclipselink.utils.workbench.test/framework/build.xml
deleted file mode 100644
index f0cc939..0000000
--- a/utils/eclipselink.utils.workbench.test/framework/build.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Framework Library Tests" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-framework, jar-framework"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- <condition property="junit.classpath.exist" >
- <isset property="junit.classpath"/>
- </condition>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${framework.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${framework.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-framework" depends="properties-init">
- <mkdir dir="${compile.framework.destdir}"/>
- <javac
- classpath="${compile.framework.classpath}"
- srcdir="${compile.framework.srcdir}"
- destdir="${compile.framework.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-framework" depends="jar-framework-lib, jar-framework-src"/>
-
- <target name="jar-framework-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${framework.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${framework.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink Framework Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.framework" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.framework.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-framework-src" depends="properties-init">
- <delete file="${_jarDestDir}/${framework.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${framework.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink Framework Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.framework" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.framework.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
- <!-- =================================================================== -->
- <!-- JUnit tests - run this target from the master build project only. -->
- <!-- =================================================================== -->
-
- <target name="checkClasspath" depends="properties-init" unless="junit.classpath.exist">
- <echo message="Run the test.all target from the master build project only." />
- <fail>Run the master build project</fail>
- </target>
-
- <target name="test-all" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.framework.AllFrameworkTests" />
- </junit>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/build.properties b/utils/eclipselink.utils.workbench.test/mappingsplugin/build.properties
deleted file mode 100644
index bce650c..0000000
--- a/utils/eclipselink.utils.workbench.test/mappingsplugin/build.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Mappings Plug-in Tests
-_productName=EclipseLink
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib
-_mwdevLibDir=${_libDir}/mw
-_jarDestDir=${_libDir}/mwtest
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Define for eclipselink.jar location
-_eclipselinkJar=../../../eclipselink.jar
-
-# Defined jarfile names.
-mappingsplugin.jarfile=mappingsplugin_test.jar
-mappingsplugin.jarfile.src=mappingsplugin_test_src.jar
-
-# Defines for build directories.
-compile.mappingsplugin.resources=${_rootResourceDir}
-compile.mappingsplugin.srcdir=${_rootSourceDir}
-compile.mappingsplugin.destdir=${_classesDestDir}
-compile.mappingsplugin.classpath= \
- ${_jarDestDir}/utility_test.jar; \
- ${_jarDestDir}/framework_test.jar; \
- ${_mwdevLibDir}/mappingsplugin.jar; \
- ${_mwdevLibDir}/framework.jar; \
- ${_mwdevLibDir}/uitools.jar; \
- ${_mwdevLibDir}/cmpmigrator.jar; \
- ${_mwdevLibDir}/mappingsio.jar; \
- ${_mwdevLibDir}/mappingsmodel.jar; \
- ${_mwdevLibDir}/platformsmodel.jar; \
- ${_mwdevLibDir}/utility.jar; \
- ${_eclipselinkJar}; \
- ${_libDir}/compile/package-rename.jar; \
- ${junit.lib}
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/build.xml b/utils/eclipselink.utils.workbench.test/mappingsplugin/build.xml
deleted file mode 100644
index bcc4a73..0000000
--- a/utils/eclipselink.utils.workbench.test/mappingsplugin/build.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Mappings Plug-in Tests" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-mappingsplugin, jar-mappingsplugin"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- <condition property="junit.classpath.exist" >
- <isset property="junit.classpath"/>
- </condition>
- <property name="custom.tasks.lib" value="${basedir}/../../../buildsystem/ant_customizations.jar"/>
- <property name="custom.selectbundle.task.class" value="org.eclipse.persistence.buildtools.ant.taskdefs.SelectBundle"/>
- <taskdef name="selectbundle" classname="${custom.selectbundle.task.class}" classpath="${custom.tasks.lib}"/>
-
- <selectbundle basename="org.eclipse.persistence.nosql" directory="${basedir}/../../../plugins" separator="_"
- criterion="[2.0.0,9.0.0)" property="oep.nosql.lib" includepath="true"
- />
- <echo message="oep.nosql.lib ='${oep.nosql.lib}'"/>
-
- <path id="compile.mappingsplugin.path">
- <pathelement path="${_jarDestDir}/utility_test.jar"/>
- <pathelement path="${_jarDestDir}/framework_test.jar"/>
- <pathelement path="${_mwdevLibDir}/mappingsplugin.jar"/>
- <pathelement path="${_mwdevLibDir}/framework.jar"/>
- <pathelement path="${_mwdevLibDir}/uitools.jar"/>
- <pathelement path="${_mwdevLibDir}/cmpmigrator.jar"/>
- <pathelement path="${_mwdevLibDir}/mappingsio.jar"/>
- <pathelement path="${_mwdevLibDir}/mappingsmodel.jar"/>
- <pathelement path="${_mwdevLibDir}/platformsmodel.jar"/>
- <pathelement path="${_mwdevLibDir}/utility.jar"/>
- <pathelement path="${_eclipselinkJar}"/>
- <pathelement path="${_libDir}/compile/package-rename.jar"/>
- <pathelement path="${_libDir}/compile/xercesImpl.jar"/>
- <pathelement path="${junit.lib}"/>
- <pathelement path="${oep.nosql.lib}"/>
- </path>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-mappingsplugin" depends="properties-init">
- <mkdir dir="${compile.mappingsplugin.destdir}"/>
- <javac
- srcdir="${compile.mappingsplugin.srcdir}"
- destdir="${compile.mappingsplugin.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- classpathref="compile.mappingsplugin.path"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-mappingsplugin" depends="jar-mappingsplugin-lib, jar-mappingsplugin-src"/>
-
- <target name="jar-mappingsplugin-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${mappingsplugin.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink Mappings Plug-in Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.mappingsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.mappingsplugin.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-mappingsplugin-src" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${mappingsplugin.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink Mappings Plug-in Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.mappingsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.mappingsplugin.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
- <!-- =================================================================== -->
- <!-- JUnit tests - run this target from the master build project only. -->
- <!-- =================================================================== -->
-
- <target name="test-all" depends="test-mappingsmodel,
- test-mappingsplugin,
- test-mappingsio"/>
-
- <target name="checkClasspath" depends="properties-init" unless="junit.classpath.exist">
- <echo message="Run this target from the master build project only." />
- <fail>Run the master build project</fail>
- </target>
-
- <target name="test-mappingsmodel" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.mappingsmodel.AllMappingsModelTests" />
- </junit>
- </target>
-
- <target name="test-mappingsplugin" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.mappingsplugin.AllMappingsPluginTests" />
- </junit>
- </target>
-
- <target name="test-mappingsio" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.mappingsio.AllMappingsIOTests" />
- </junit>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/build.properties b/utils/eclipselink.utils.workbench.test/platformsplugin/build.properties
deleted file mode 100644
index 42c6e7b..0000000
--- a/utils/eclipselink.utils.workbench.test/platformsplugin/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Platforms Plug-in Tests
-_productName=EclipseLink
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib
-_mwdevLibDir=${_libDir}/mw
-_jarDestDir=${_libDir}/mwtest
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-platformsplugin.jarfile=platformsplugin_test.jar
-platformsplugin.jarfile.src=platformsplugin_test_src.jar
-
-# Defines for build directories.
-compile.platformsplugin.resources=${_rootResourceDir}
-compile.platformsplugin.srcdir=${_rootSourceDir}
-compile.platformsplugin.destdir=${_classesDestDir}
-compile.platformsplugin.classpath= \
- ${_jarDestDir}/utility_test.jar; \
- ${_jarDestDir}/framework_test.jar; \
- ${_mwdevLibDir}/platformsplugin.jar; \
- ${_mwdevLibDir}/platformsmodel.jar; \
- ${_mwdevLibDir}/framework.jar; \
- ${_mwdevLibDir}/uitools.jar; \
- ${_mwdevLibDir}/utility.jar; \
- ${junit.lib}
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/build.xml b/utils/eclipselink.utils.workbench.test/platformsplugin/build.xml
deleted file mode 100644
index 5fcb986..0000000
--- a/utils/eclipselink.utils.workbench.test/platformsplugin/build.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Platforms Plug-in Tests" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-platformsplugin, jar-platformsplugin"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- <condition property="junit.classpath.exist" >
- <isset property="junit.classpath"/>
- </condition>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${platformsplugin.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${platformsplugin.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-platformsplugin" depends="properties-init">
- <mkdir dir="${compile.platformsplugin.destdir}"/>
- <javac
- classpath="${compile.platformsplugin.classpath}"
- srcdir="${compile.platformsplugin.srcdir}"
- destdir="${compile.platformsplugin.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-platformsplugin" depends="jar-platformsplugin-lib, jar-platformsplugin-src"/>
-
- <target name="jar-platformsplugin-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${platformsplugin.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${platformsplugin.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink Platforms Plug-in Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.platformsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.platformsplugin.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-platformsplugin-src" depends="properties-init">
- <delete file="${_jarDestDir}/${platformsplugin.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${platformsplugin.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink Platforms Plug-in Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.platformsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.platformsplugin.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
- <!-- =================================================================== -->
- <!-- JUnit tests - run this target from the master build project only. -->
- <!-- =================================================================== -->
-
- <target name="checkClasspath" depends="properties-init" unless="junit.classpath.exist">
- <echo message="Run the test-all target from the master build project only." />
- <fail>Run the master build project</fail>
- </target>
-
- <target name="test-all" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.platformsplugin.AllPlatformsPluginTests" />
- </junit>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/build.properties b/utils/eclipselink.utils.workbench.test/scplugin/build.properties
deleted file mode 100644
index 700a3c6..0000000
--- a/utils/eclipselink.utils.workbench.test/scplugin/build.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench SC Plug-in Tests
-_productName=EclipseLink
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib
-_mwdevLibDir=${_libDir}/mw
-_jarDestDir=${_libDir}/mwtest
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Define for eclipselink.jar location
-_eclipselinkJar=../../../eclipselink.jar
-
-# Defined jarfile names.
-scplugin.jarfile=scplugin_test.jar
-scplugin.jarfile.src=scplugin_test_src.jar
-
-# Defines for build directories.
-compile.scplugin.resources=${_rootResourceDir}
-compile.scplugin.srcdir=${_rootSourceDir}
-compile.scplugin.destdir=${_classesDestDir}
-compile.scplugin.classpath= \
- ${_jarDestDir}/utility_test.jar; \
- ${_mwdevLibDir}/scplugin.jar; \
- ${_mwdevLibDir}/framework.jar; \
- ${_mwdevLibDir}/uitools.jar; \
- ${_mwdevLibDir}/platformsmodel.jar; \
- ${_mwdevLibDir}/utility.jar; \
- ${_eclipselinkJar}; \
- ${junit.lib}
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/build.xml b/utils/eclipselink.utils.workbench.test/scplugin/build.xml
deleted file mode 100644
index a5ce853..0000000
--- a/utils/eclipselink.utils.workbench.test/scplugin/build.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build SC Plug-in Tests" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-scplugin, jar-scplugin"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- <condition property="junit.classpath.exist" >
- <isset property="junit.classpath"/>
- </condition>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${scplugin.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${scplugin.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-scplugin" depends="properties-init">
- <mkdir dir="${compile.scplugin.destdir}"/>
- <javac
- classpath="${compile.scplugin.classpath}"
- srcdir="${compile.scplugin.srcdir}"
- destdir="${compile.scplugin.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-scplugin" depends="jar-scplugin-lib, jar-scplugin-src"/>
-
- <target name="jar-scplugin-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${scplugin.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${scplugin.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink SC Plug-in Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.scplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.scplugin.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-scplugin-src" depends="properties-init">
- <delete file="${_jarDestDir}/${scplugin.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${scplugin.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink SC Plug-in Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.scplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.scplugin.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
- <!-- =================================================================== -->
- <!-- JUnit tests - run this target from the master build project only. -->
- <!-- =================================================================== -->
-
- <target name="checkClasspath" depends="properties-init" unless="junit.classpath.exist">
- <echo message="Run the test-all target from the master build project only." />
- <fail>Run the master build project</fail>
- </target>
-
- <target name="test-all" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.scplugin.AllSCTests" />
- </junit>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench.test/uitools/build.properties b/utils/eclipselink.utils.workbench.test/uitools/build.properties
deleted file mode 100644
index ec76244..0000000
--- a/utils/eclipselink.utils.workbench.test/uitools/build.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Workbench UITools Library Tests
-_productName=EclipseLink
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib
-_mwdevLibDir=${_libDir}/mw
-_jarDestDir=${_libDir}/mwtest
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-uitools.jarfile=uitools_test.jar
-uitools.jarfile.src=uitools_test_src.jar
-
-# Defines for build directories.
-compile.uitools.resources=${_rootResourceDir}
-compile.uitools.srcdir=${_rootSourceDir}
-compile.uitools.destdir=${_classesDestDir}
-compile.uitools.classpath= \
- ${_jarDestDir}/utility_test.jar; \
- ${_mwdevLibDir}/uitools.jar; \
- ${_mwdevLibDir}/utility.jar; \
- ${junit.lib}
diff --git a/utils/eclipselink.utils.workbench.test/uitools/build.xml b/utils/eclipselink.utils.workbench.test/uitools/build.xml
deleted file mode 100644
index 3fa4922..0000000
--- a/utils/eclipselink.utils.workbench.test/uitools/build.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build UITools Library Tests" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-uitools, jar-uitools"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- <condition property="junit.classpath.exist" >
- <isset property="junit.classpath"/>
- </condition>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${uitools.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${uitools.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-uitools" depends="properties-init">
- <mkdir dir="${compile.uitools.destdir}"/>
- <javac
- classpath="${compile.uitools.classpath}"
- srcdir="${compile.uitools.srcdir}"
- destdir="${compile.uitools.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-uitools" depends="jar-uitools-lib, jar-uitools-src"/>
-
- <target name="jar-uitools-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${uitools.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${uitools.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink UITools Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.uitools" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.uitools.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-uitools-src" depends="properties-init">
- <delete file="${_jarDestDir}/${uitools.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${uitools.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="EclipseLink UITools Tests" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.uitools" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- </manifest>
- <fileset
- dir="${compile.uitools.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
- <!-- =================================================================== -->
- <!-- JUnit tests - run this target from the master build project only. -->
- <!-- =================================================================== -->
-
- <target name="checkClasspath" depends="properties-init" unless="junit.classpath.exist">
- <echo message="Run the test-all target from the master build project only." />
- <fail>Run the master build project</fail>
- </target>
-
- <target name="test-all" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.uitools.AllUIToolsTests" />
- </junit>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench.test/utility/build.properties b/utils/eclipselink.utils.workbench.test/utility/build.properties
deleted file mode 100644
index 73945c7..0000000
--- a/utils/eclipselink.utils.workbench.test/utility/build.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Workbench Utility Library Tests
-_productName=EclipseLink
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib
-_mwdevLibDir=${_libDir}/mw
-_jarDestDir=${_libDir}/mwtest
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-utility.jarfile=utility_test.jar
-utility.jarfile.src=utility_test_src.jar
-
-# Defines for build directories.
-compile.utility.resources=${_rootResourceDir}
-compile.utility.srcdir=${_rootSourceDir}
-compile.utility.destdir=${_classesDestDir}
-compile.utility.classpath= \
- ${_mwdevLibDir}/utility.jar; \
- ${junit.lib}
diff --git a/utils/eclipselink.utils.workbench.test/utility/build.xml b/utils/eclipselink.utils.workbench.test/utility/build.xml
deleted file mode 100644
index ba8678c..0000000
--- a/utils/eclipselink.utils.workbench.test/utility/build.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Utility Library Tests" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-utility, jar-utility"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- <condition property="junit.classpath.exist" >
- <isset property="junit.classpath"/>
- </condition>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${utility.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${utility.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-utility" depends="properties-init">
- <mkdir dir="${compile.utility.destdir}"/>
- <javac
- classpath="${compile.utility.classpath}"
- srcdir="${compile.utility.srcdir}"
- destdir="${compile.utility.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-utility" depends="jar-utility-lib, jar-utility-src"/>
-
- <target name="jar-utility-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${utility.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${utility.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.utility" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.utility.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-utility-src" depends="properties-init">
- <delete file="${_jarDestDir}/${utility.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${utility.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="test.org.eclipse.persistence.workbench.utility" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.utility.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
- <!-- =================================================================== -->
- <!-- JUnit tests - run this target from the master build project only. -->
- <!-- =================================================================== -->
-
- <target name="checkClasspath" depends="properties-init" unless="junit.classpath.exist">
- <echo message="Run the test-all target from the master build project only." />
- <fail>Run the master build project</fail>
- </target>
-
- <target name="test-all" depends="checkClasspath">
- <junit>
- <classpath path="${junit.classpath}" />
- <formatter type="brief" usefile="false" />
- <test name="test.org.eclipse.persistence.workbench.utility.AllUtilityTests" />
- </junit>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/.classpath b/utils/eclipselink.utils.workbench/.classpath
deleted file mode 100644
index 0c78541..0000000
--- a/utils/eclipselink.utils.workbench/.classpath
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="src" path="utility/source"/>
- <classpathentry kind="src" path="uitools/source"/>
- <classpathentry kind="src" path="framework/source"/>
- <classpathentry kind="src" path="platformsmodel/source"/>
- <classpathentry kind="src" path="platformsplugin/source"/>
- <classpathentry kind="src" path="mappingsmodel/source"/>
- <classpathentry kind="src" path="mappingsio/source"/>
- <classpathentry kind="src" path="mappingsplugin/source"/>
- <classpathentry kind="src" path="scplugin/source"/>
- <classpathentry kind="lib" path="config"/>
- <classpathentry kind="lib" path="iconlib/resource"/>
- <classpathentry kind="lib" path="/eclipselink.utils.workbench.lib/compile/ant.jar" sourcepath="/eclipselink.utils.workbench.lib/source/ant_src.zip"/>
- <classpathentry kind="lib" path="/eclipselink.utils.workbench.lib/compile/xercesImpl.jar"/>
- <classpathentry kind="var" path="ECLIPSELINK_HOME/eclipselink.jar" sourcepath="/ECLIPSELINK_SRC_JAR"/>
- <classpathentry kind="output" path="class"/>
-</classpath>
diff --git a/utils/eclipselink.utils.workbench/.project b/utils/eclipselink.utils.workbench/.project
deleted file mode 100644
index 8bb23b4..0000000
--- a/utils/eclipselink.utils.workbench/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>eclipselink.utils.workbench</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/utils/eclipselink.utils.workbench/.settings/org.eclipse.jdt.core.prefs b/utils/eclipselink.utils.workbench/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/utils/eclipselink.utils.workbench/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/utils/eclipselink.utils.workbench/EclipseLink Workbench.launch b/utils/eclipselink.utils.workbench/EclipseLink Workbench.launch
deleted file mode 100644
index ea8cbb8..0000000
--- a/utils/eclipselink.utils.workbench/EclipseLink Workbench.launch
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/Main.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="eclipselink.utils.workbench" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="eclipselink.utils.workbench"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench/config" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench/iconlib/resource" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/eclipselink.utils.workbench.lib/run/connector.jar" path="3" type="2"/> "/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.persistence.tools.workbench.Main"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eclipselink.utils.workbench"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswing.aatext=true -Xmx1024M"/>
-</launchConfiguration>
diff --git a/utils/eclipselink.utils.workbench/build.properties b/utils/eclipselink.utils.workbench/build.properties
deleted file mode 100644
index 0e15b30..0000000
--- a/utils/eclipselink.utils.workbench/build.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_VendorString=EclipseLink Project
-_CopyrightString=Copyright (c) 1998, ${CurYear}, ${_VendorString}. All rights reserved.
-_productName=EclipseLink Workbench
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_buildLogDir=${basedir}/logs
-_publishDir=${basedir}
-
-#Library specific manifest entries
-# Note: manifest lines can contain a maximum of 71 characters of data
-# longer lines must be continued on the line below by starting
-# the line with a single space. This makes defining things like
-# classpaths VERY interesting, because property files are parsed
-# line by line. So theoretically special characters need to be
-# inserted to get the multiple specs to play nice, however, in
-# practice it doesn't work.
-workbench.manifest.basepackage=org.eclipse.persistence.workbench
-workbench.manifest.libraryName=Workbench
-workbench.manifest.mainclass=org.eclipse.persistence.workbench.Main
-workbenchcore.manifest.basepackage=org.eclipse.persistence.workbench
-workbenchcore.manifest.libraryName=Workbench Core Library
-
-# Define for eclipselink.jar location
-_eclipselinkJar=../../../eclipselink.jar
-
-# Defines for build directories.
-libDir=${basedir}/../eclipselink.utils.workbench.lib/mw
-iconlibDir=${basedir}/iconlib
-utilityDir=${basedir}/utility
-uitoolsDir=${basedir}/uitools
-frameworkDir=${basedir}/framework
-platformsmodelDir=${basedir}/platformsmodel
-platformspluginDir=${basedir}/platformsplugin
-mappingsmodelDir=${basedir}/mappingsmodel
-mappingsioDir=${basedir}/mappingsio
-mappingspluginDir=${basedir}/mappingsplugin
-scpluginDir=${basedir}/scplugin
-
-# Defined jarfile names.
-mwcore.jarfile=elmwcore.jar
-mwcore.src.jarfile=elmwcore_src.jar
-workbench.jarfile=eclipselinkmw.jar
-workbench.src.jarfile=eclipselinkmw_src.jar
diff --git a/utils/eclipselink.utils.workbench/build.xml b/utils/eclipselink.utils.workbench/build.xml
deleted file mode 100644
index e52fd23..0000000
--- a/utils/eclipselink.utils.workbench/build.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="eclipselink.utils.workbench" default="all" basedir=".">
-
- <!-- =================================================================== -->
- <!-- High level targets -->
- <!-- =================================================================== -->
-
- <target name="all" depends="clean, build"/>
- <target name="build" depends="init, build-component-libs, build-workbench"/>
- <target name="build-workbench" depends="jar-mwcore, jar-workbench"/>
-
- <!-- =================================================================== -->
- <!-- Initialization -->
- <!-- =================================================================== -->
-
- <target name="init">
- <dirname property="mw.build.location_temp" file="${ant.file.eclipselink.utils.workbench}"/>
- <pathconvert targetos="unix" property="mw.build.location">
- <path>
- <pathelement location="${mw.build.location_temp}"/>
- </path>
- </pathconvert>
- <tstamp>
- <format property="_TodayMD" pattern="MMdd"/>
- <format property="_TodayDMonthY" pattern="dd, MMMMM yyyy"/>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- <format property="CurYear" pattern="yyyy"/>
- </tstamp>
- <property environment="env"/>
- <property file="${mw.build.location}/build.properties"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
-
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
-
- <echo message="mw.build.location = '${mw.build.location}'"/>
- <echo message="release.designation = '${release.designation}'"/>
- <echo message="release.version = '${release.version}'"/>
- <echo message="BuildDate.BuildTime = '${build.date}.${build.time}'"/>
- <echo message="java.version = '${java.version}'"/>
- <echo message="os.name = '${os.name}'"/>
- <echo message="os.arch = '${os.arch}'"/>
- <echo message="os.version = '${os.version}'"/>
- <echo message="stop.on.error = '${stop.on.error}'"/>
- <echo message="optimize.code = '${optimize.code}'"/>
- <echo message="report.deprecation = '${report.deprecation}'"/>
- <echo message="javac.debug = '${javac.debug}'"/>
- <echo message="javac.debuglevel = '${javac.debuglevel}'"/>
- <echo message="target.jvm = '${target.jvm}'"/>
- <echo message="java_home = '${java.home}/..'"/>
-
- <mkdir dir="${_buildLogDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
-
- <target name="clean" depends="init">
- <ant antfile="build.xml" dir="${iconlibDir}" target="clean"/>
- <ant antfile="build.xml" dir="${utilityDir}" target="clean"/>
- <ant antfile="build.xml" dir="${uitoolsDir}" target="clean"/>
- <ant antfile="build.xml" dir="${frameworkDir}" target="clean"/>
- <ant antfile="build.xml" dir="${platformsmodelDir}" target="clean"/>
- <ant antfile="build.xml" dir="${platformspluginDir}" target="clean"/>
- <ant antfile="build.xml" dir="${mappingsmodelDir}" target="clean"/>
- <ant antfile="build.xml" dir="${mappingsioDir}" target="clean"/>
- <ant antfile="build.xml" dir="${mappingspluginDir}" target="clean"/>
- <ant antfile="build.xml" dir="${scpluginDir}" target="clean"/>
- <delete file="${libDir}/${mwcore.jarfile}"/>
- <delete file="${libDir}/${workbench.jarfile}"/>
- <delete file="${libDir}/${mwcore.src.jarfile}"/>
- <delete file="${libDir}/${workbench.src.jarfile}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Build -->
- <!-- =================================================================== -->
-
- <target name="build-component-libs" depends="init">
- <ant antfile="build.xml" dir="${iconlibDir}" target="build-all" output="${_buildLogDir}\iconlib.log"/>
- <ant antfile="build.xml" dir="${utilityDir}" target="build-all" output="${_buildLogDir}\utility.log"/>
- <ant antfile="build.xml" dir="${uitoolsDir}" target="build-all" output="${_buildLogDir}\uitools.log"/>
- <ant antfile="build.xml" dir="${frameworkDir}" target="build-all" output="${_buildLogDir}\framework.log"/>
- <ant antfile="build.xml" dir="${platformsmodelDir}" target="build-all" output="${_buildLogDir}\platformsmodel.log"/>
- <ant antfile="build.xml" dir="${platformspluginDir}" target="build-all" output="${_buildLogDir}\platformsplugin.log"/>
- <ant antfile="build.xml" dir="${mappingsmodelDir}" target="build-all" output="${_buildLogDir}\mappingsmodel.log"/>
- <ant antfile="build.xml" dir="${mappingsioDir}" target="build-all" output="${_buildLogDir}\mappingsio.log"/>
- <ant antfile="build.xml" dir="${mappingspluginDir}" target="build-all" output="${_buildLogDir}\mappingsplugin.log"/>
- <ant antfile="build.xml" dir="${scpluginDir}" target="build-all" output="${_buildLogDir}\scplugin.log"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- misc -->
- <!-- =================================================================== -->
-
- <target name="compile-results" unless="build.failed" depends="init">
- </target>
-
- <!-- =================================================================== -->
- <!-- JARs -->
- <!-- =================================================================== -->
-
- <target name="jar-mwcore" depends="init, jar-mwcore-src">
- <echo message="Implementation-Version: ${version.string}"/>
- <jar jarfile="${libDir}/${mwcore.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="${_VendorString}" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="${workbenchcore.manifest.basepackage}" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="${_VendorString}" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${workbenchcore.manifest.libraryName}" />
- </manifest>
- <zipgroupfileset dir="${libDir}">
- <include name="utility.jar"/>
- <include name="platformsmodel.jar"/>
- <include name="mappingsmodel.jar"/>
- <include name="mappingsio.jar"/>
- </zipgroupfileset>
- </jar>
- </target>
- <target name="jar-mwcore-src">
- <echo message="Implementation-Version: ${version.string}"/>
- <jar jarfile="${libDir}/${mwcore.src.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="${_VendorString}" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="${workbenchcore.manifest.basepackage}" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="${_VendorString}" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${workbenchcore.manifest.libraryName}" />
- </manifest>
- <zipgroupfileset dir="${libDir}">
- <include name="utility_src.jar"/>
- <include name="platformsmodel_src.jar"/>
- <include name="mappingsmodel_src.jar"/>
- <include name="mappingsio_src.jar"/>
- </zipgroupfileset>
- </jar>
- </target>
-
- <target name="jar-workbench" depends="init, jar-workbench-src">
- <echo message="Implementation-Version: ${version.string}"/>
- <jar jarfile="${libDir}/${workbench.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="${_VendorString}" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="${workbench.manifest.basepackage}" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="${_VendorString}" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${workbench.manifest.libraryName}" />
- <attribute name="Main-Class" value="${workbench.manifest.mainclass}" />
- </manifest>
- <zipgroupfileset dir="${libDir}">
- <include name="iconlib.jar"/>
- <include name="uitools.jar"/>
- <include name="framework.jar"/>
- <include name="platformsplugin.jar"/>
- <include name="mappingsplugin.jar"/>
- <include name="scplugin.jar"/>
- </zipgroupfileset>
- </jar>
- </target>
- <target name="jar-workbench-src">
- <echo message="Implementation-Version: ${version.string}"/>
- <jar jarfile="${libDir}/${workbench.src.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="${_VendorString}" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="${workbench.manifest.basepackage}" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="${_VendorString}" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${workbench.manifest.libraryName}" />
- <attribute name="Main-Class" value="${workbench.manifest.mainclass}" />
- </manifest>
- <zipgroupfileset dir="${libDir}">
- <include name="uitools_src.jar"/>
- <include name="framework_src.jar"/>
- <include name="platformsplugin_src.jar"/>
- <include name="mappingsplugin_src.jar"/>
- <include name="scplugin_src.jar"/>
- </zipgroupfileset>
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/config/pom.xml b/utils/eclipselink.utils.workbench/config/pom.xml
new file mode 100644
index 0000000..f7170d8
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/config/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.config</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Config Files Library</name>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/config/platforms.dpr b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms.dpr
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms.dpr
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms.dpr
diff --git a/utils/eclipselink.utils.workbench/config/platforms/attunity.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/attunity.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/attunity.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/attunity.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/cloudscape.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/cloudscape.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/cloudscape.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/cloudscape.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/db2.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/db2.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/db2.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/db2.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/dbase.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/dbase.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/dbase.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/dbase.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/derby.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/derby.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/derby.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/derby.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/hsql.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/hsql.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/hsql.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/hsql.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/informix.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/informix.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/informix.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/informix.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/javadb.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/javadb.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/javadb.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/javadb.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/msaccess.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/msaccess.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/msaccess.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/msaccess.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/mysql.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/mysql.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/mysql.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/mysql.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/mysql4.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/mysql4.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/mysql4.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/mysql4.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/oracle.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/oracle.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/oracle10g.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle10g.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/oracle10g.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle10g.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/oracle11.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle11.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/oracle11.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle11.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/oracle8i.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle8i.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/oracle8i.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle8i.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/oracle9i.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle9i.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/oracle9i.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/oracle9i.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/other.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/other.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/other.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/other.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/pointbase.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/pointbase.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/pointbase.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/pointbase.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/postgresql.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/postgresql.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/postgresql.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/postgresql.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/sqlanywhere.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/sqlanywhere.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/sqlanywhere.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/sqlanywhere.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/sqlserver.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/sqlserver.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/sqlserver.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/sqlserver.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/sybase.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/sybase.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/sybase.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/sybase.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/timesten.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/timesten.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/timesten.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/timesten.xml
diff --git a/utils/eclipselink.utils.workbench/config/platforms/timesten7.xml b/utils/eclipselink.utils.workbench/config/src/main/resources/platforms/timesten7.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/platforms/timesten7.xml
rename to utils/eclipselink.utils.workbench/config/src/main/resources/platforms/timesten7.xml
diff --git a/utils/eclipselink.utils.workbench/config/workbench.ico b/utils/eclipselink.utils.workbench/config/src/main/resources/workbench.ico
similarity index 100%
rename from utils/eclipselink.utils.workbench/config/workbench.ico
rename to utils/eclipselink.utils.workbench/config/src/main/resources/workbench.ico
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/distribution/pom.xml b/utils/eclipselink.utils.workbench/distribution/pom.xml
new file mode 100644
index 0000000..8ad5c78
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/distribution/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.distribution</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>EclipseLink Workbench Distribution</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>elmwcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselinkmw</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>javax.resource-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>workbench</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>stage</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/stage</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/distribution/src/main/assembly/assembly.xml b/utils/eclipselink.utils.workbench/distribution/src/main/assembly/assembly.xml
new file mode 100644
index 0000000..cf444d8
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/distribution/src/main/assembly/assembly.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>zip-bundle</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>workbench</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>bin/*.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>workbench</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>bin/*.sh</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>workbench/jlib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>xerces:xercesImpl</include>
+ <include>javax.resource:javax.resource-api</include>
+ <include>org.eclipse.persistence:javax.persistence</include>
+ <include>org.eclipse.persistence:elmwcore</include>
+ <include>org.eclipse.persistence:eclipselinkmw</include>
+ <include>org.eclipse.persistence:eclipselink</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>workbench/config</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.eclipse.persistence:workbench.config</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/setenv.cmd b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/setenv.cmd
new file mode 100644
index 0000000..4f45771
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/setenv.cmd
@@ -0,0 +1,46 @@
+@REM
+@REM Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+@REM
+@REM This program and the accompanying materials are made available under the
+@REM terms of the Eclipse Public License v. 2.0 which is available at
+@REM http://www.eclipse.org/legal/epl-2.0,
+@REM or the Eclipse Distribution License v. 1.0 which is available at
+@REM http://www.eclipse.org/org/documents/edl-v10.php.
+@REM
+@REM SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+@REM
+
+@REM User MUST set DRIVER_CLASSPATH to point to their desired driver jar(s), such as JDBC and J2C. For example:
+@REM set DRIVER_CLASSPATH=c:\some_dir\jdbc\ojdbc14.jar;c:\some_other_dir\j2c\aqapi.jar
+@REM
+@REM Note: DRIVER_CLASSPATH should NOT contain any classes for your persistent business objects - these are
+@REM configured in the Mapping Workbench project.
+
+@REM User MUST set JAVA_HOME to point a supported JRE. If none
+@REM is provided for INSTALL_JAVA_HOME then the system JAVA_HOME
+@REM value will be used
+set INSTALL_JAVA_HOME=%s_jreDirectory%
+if "%JAVA_HOME%"=="" (
+ set JAVA_HOME=%INSTALL_JAVA_HOME%
+)
+
+@REM Please do not change any of the following lines:
+
+set _FIXPATH=
+call :fixpath "%DRIVER_CLASSPATH%"
+set DRIVER_CLASSPATH=%_FIXPATH:~1%
+set _FIXPATH=
+call :fixpath "%JAVA_HOME%"
+set JAVA_HOME=%_FIXPATH:~1%
+goto :EOF
+
+:fixpath
+if not %1.==. (
+ for /f "tokens=1* delims=;" %%a in (%1) do (
+ call :shortfilename "%%a" & call :fixpath "%%b"
+ )
+)
+goto :EOF
+:shortfilename
+for %%i in (%1) do set _FIXPATH=%_FIXPATH%;%%~fsi
+goto :EOF
diff --git a/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/setenv.sh b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/setenv.sh
new file mode 100644
index 0000000..2915975
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/setenv.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0,
+# or the Eclipse Distribution License v. 1.0 which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+#
+
+# User MUST set DRIVER_CLASSPATH to point to their desired driver jar(s), such as JDBC and J2C. For example:
+# DRIVER_CLASSPATH=/some_dir/jdbc/ojdbc14.jar:/some_other_dir/j2c/aqapi.jar; export DRIVER_CLASSPATH
+#
+# Note: DRIVER_CLASSPATH should NOT contain any classes for your persistent business objects - these are
+# configured in the Mapping Workbench project.
+
+# User MUST set INSTALL_JAVA_HOME to point a supported JRE. If none
+# is provided for INSTALL_JAVA_HOME then the system JAVA_HOME
+# value will be used
+INSTALL_JAVA_HOME=%s_jreDirectory%;
+if [ "${JAVA_HOME}" = '' ]; then
+ JAVA_HOME=$INSTALL_JAVA_HOME; export JAVA_HOME
+fi
diff --git a/utils/eclipselink.utils.workbench/bin/workbench.cmd b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/workbench.cmd
similarity index 84%
rename from utils/eclipselink.utils.workbench/bin/workbench.cmd
rename to utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/workbench.cmd
index 53de676..98d26ac 100644
--- a/utils/eclipselink.utils.workbench/bin/workbench.cmd
+++ b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/workbench.cmd
@@ -12,7 +12,7 @@
@echo off
setlocal
-call "%~dp0../../../bin/setenv.cmd"
+call "%~dp0setenv.cmd"
@REM User may increase Java memory setting(s) if desired:
set JVM_ARGS=-Xmx256m
@@ -23,11 +23,11 @@
set THIS=%_FIXPATH:~1%
set CLASSPATH=%THIS%..\jlib\xercesImpl.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\connector.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\..\..\jlib\eclipselink.jar
+set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\javax.resource-api.jar
+set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\eclipselink.jar
set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\elmwcore.jar
set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\eclipselinkmw.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\..\..\jlib\jpa\javax.persistence_1.0.0.jar
+set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\javax.persistence.jar
set CLASSPATH=%CLASSPATH%;%THIS%..\config
set CLASSPATH=%CLASSPATH%;%DRIVER_CLASSPATH%
diff --git a/utils/eclipselink.utils.workbench/bin/workbench.sh b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/workbench.sh
similarity index 82%
rename from utils/eclipselink.utils.workbench/bin/workbench.sh
rename to utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/workbench.sh
index c959162..c67551b 100755
--- a/utils/eclipselink.utils.workbench/bin/workbench.sh
+++ b/utils/eclipselink.utils.workbench/distribution/src/main/resources/bin/workbench.sh
@@ -11,18 +11,18 @@
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
#
-. `dirname $0`/../../../bin/setenv.sh
+. `dirname $0`/setenv.sh
# User may increase Java memory setting(s) if desired:
JVM_ARGS=-Xmx256m
# Please do not change any of the following lines:
CLASSPATH=`dirname $0`/../jlib/xercesImpl.jar:\
-`dirname $0`/../jlib/connector.jar:\
-`dirname $0`/../../../jlib/eclipselink.jar:\
+`dirname $0`/../jlib/javax.resource-api.jar:\
+`dirname $0`/../jlib/eclipselink.jar:\
`dirname $0`/../jlib/elmwcore.jar:\
`dirname $0`/../jlib/eclipselinkmw.jar:\
-`dirname $0`/../../../jlib/jpa/javax.persistence_1.0.0.jar:\
+`dirname $0`/../jlib/javax.persistence.jar:\
`dirname $0`/../config:\
${DRIVER_CLASSPATH}
diff --git a/utils/eclipselink.utils.workbench/readme.html b/utils/eclipselink.utils.workbench/distribution/src/main/resources/readme.html
similarity index 100%
rename from utils/eclipselink.utils.workbench/readme.html
rename to utils/eclipselink.utils.workbench/distribution/src/main/resources/readme.html
diff --git a/utils/eclipselink.utils.workbench/eclipselinkmw/pom.xml b/utils/eclipselink.utils.workbench/eclipselinkmw/pom.xml
new file mode 100644
index 0000000..673e9af
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/eclipselinkmw/pom.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselinkmw</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Workbench</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.iconlib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.uitools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsplugin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsplugin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.scplugin</artifactId>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <mf.implementation.title>org.eclipse.persistence.workbench</mf.implementation.title>
+ <mf.library.designation>Workbench</mf.library.designation>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.eclipse.persistence.workbench.Main</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.eclipse.persistence:workbench.iconlib</include>
+ <include>org.eclipse.persistence:workbench.uitools</include>
+ <include>org.eclipse.persistence:workbench.framework</include>
+ <include>org.eclipse.persistence:workbench.platformsplugin</include>
+ <include>org.eclipse.persistence:workbench.mappingsplugin</include>
+ <include>org.eclipse.persistence:workbench.scplugin</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/elmwcore/pom.xml b/utils/eclipselink.utils.workbench/elmwcore/pom.xml
new file mode 100644
index 0000000..a11cf2c
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/elmwcore/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>elmwcore</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Workbench Core</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsmodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsmodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsio</artifactId>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <mf.implementation.title>org.eclipse.persistence.workbench</mf.implementation.title>
+ <mf.library.designation>Workbench Core Library</mf.library.designation>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.eclipse.persistence:workbench.utility</include>
+ <include>org.eclipse.persistence:workbench.platformsmodel</include>
+ <include>org.eclipse.persistence:workbench.mappingsmodel</include>
+ <include>org.eclipse.persistence:workbench.mappingsio</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/framework/build.properties b/utils/eclipselink.utils.workbench/framework/build.properties
deleted file mode 100644
index acbef95..0000000
--- a/utils/eclipselink.utils.workbench/framework/build.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Framework Library
-_productName=EclipseLink
-release.version=3.0.0
-javac.version=1.8
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-framework.jarfile=framework.jar
-framework.jarfile.src=framework_src.jar
-
-# Defines for build directories.
-compile.framework.resources=${_rootResourceDir}
-compile.framework.srcdir=${_rootSourceDir}
-compile.framework.destdir=${_classesDestDir}
-compile.framework.classpath= \
- ${_jarDestDir}/uitools.jar; \
- ${_jarDestDir}/utility.jar
diff --git a/utils/eclipselink.utils.workbench/framework/build.xml b/utils/eclipselink.utils.workbench/framework/build.xml
deleted file mode 100644
index 8483ad6..0000000
--- a/utils/eclipselink.utils.workbench/framework/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Framework Library" default="build.all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-framework, jar-framework"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${framework.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${framework.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-framework" depends="properties-init">
- <mkdir dir="${compile.framework.destdir}"/>
- <javac
- classpath="${compile.framework.classpath}"
- srcdir="${compile.framework.srcdir}"
- destdir="${compile.framework.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-framework" depends="jar-framework-lib, jar-framework-src"/>
-
- <target name="jar-framework-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${framework.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${framework.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.framework" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.framework.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-framework-src" depends="properties-init">
- <delete file="${_jarDestDir}/${framework.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${framework.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.framework" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.framework.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/framework/pom.xml b/utils/eclipselink.utils.workbench/framework/pom.xml
new file mode 100644
index 0000000..01ed356
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/framework/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Framework Library</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.uitools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org.eclipse.persistence.tools.workbench.test.framework.AllFrameworkTests</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/Main.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/Main.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/Main.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/Main.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/AbstractApplication.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/AbstractApplication.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/AbstractApplication.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/AbstractApplication.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/Application.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/Application.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/Application.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/Application.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/NodeManager.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/NodeManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/NodeManager.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/NodeManager.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/OpenException.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/OpenException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/OpenException.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/OpenException.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/Plugin.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/Plugin.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/Plugin.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/Plugin.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/PluginFactory.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/PluginFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/PluginFactory.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/PluginFactory.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/UnsupportedFileException.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/UnsupportedFileException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/UnsupportedFileException.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/UnsupportedFileException.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/AbstractEnablableFrameworkAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/AbstractEnablableFrameworkAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/AbstractEnablableFrameworkAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/AbstractEnablableFrameworkAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/AbstractFrameworkAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/AbstractFrameworkAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/AbstractFrameworkAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/AbstractFrameworkAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/AbstractToggleFrameworkAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/AbstractToggleFrameworkAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/AbstractToggleFrameworkAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/AbstractToggleFrameworkAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/ActionRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/ActionRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/ActionRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/ActionRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/FrameworkAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/FrameworkAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/FrameworkAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/FrameworkAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/ToggleFrameworkAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/ToggleFrameworkAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/action/ToggleFrameworkAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/action/ToggleFrameworkAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/AbstractApplicationNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/AbstractApplicationNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/AbstractApplicationNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/AbstractApplicationNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/AbstractPreferencesNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/AbstractPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/AbstractPreferencesNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/AbstractPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/AccessibleNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/AccessibleNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/AccessibleNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/AccessibleNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ActionContainer.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ActionContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ActionContainer.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ActionContainer.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ActiveIconBuilder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ActiveIconBuilder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ActiveIconBuilder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ActiveIconBuilder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ApplicationNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ApplicationNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ApplicationNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ApplicationNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblem.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblem.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblem.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblemContainer.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblemContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblemContainer.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ApplicationProblemContainer.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ButtonDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ButtonDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ButtonDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ButtonDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ButtonGroupDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ButtonGroupDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ButtonGroupDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ButtonGroupDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ComponentContainerDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ComponentContainerDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ComponentContainerDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ComponentContainerDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ComponentDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ComponentDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ComponentDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ComponentDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ComponentGroupDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ComponentGroupDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ComponentGroupDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ComponentGroupDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/CompositeIconBuilder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/CompositeIconBuilder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/CompositeIconBuilder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/CompositeIconBuilder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/DefaultApplicationProblem.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/DefaultApplicationProblem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/DefaultApplicationProblem.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/DefaultApplicationProblem.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/DropDownToolBarButtonDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/DropDownToolBarButtonDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/DropDownToolBarButtonDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/DropDownToolBarButtonDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/EditorNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/EditorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/EditorNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/EditorNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/GroupContainerDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/GroupContainerDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/GroupContainerDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/GroupContainerDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/IconBuilder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/IconBuilder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/IconBuilder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/IconBuilder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MenuDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MenuDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MenuDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MenuDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MenuGroupDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MenuGroupDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MenuGroupDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MenuGroupDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MenuItemDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MenuItemDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MenuItemDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MenuItemDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MergeableContainer.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MergeableContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/MergeableContainer.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/MergeableContainer.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/NavigatorSelectionModel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/NavigatorSelectionModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/NavigatorSelectionModel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/NavigatorSelectionModel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/PreferencesNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/PreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/PreferencesNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/PreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/RootMenuDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/RootMenuDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/RootMenuDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/RootMenuDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/SelectionActionsPolicy.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/SelectionActionsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/SelectionActionsPolicy.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/SelectionActionsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/SimpleIconBuilder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/SimpleIconBuilder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/SimpleIconBuilder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/SimpleIconBuilder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItem.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItem.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItem.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItemDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItemDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItemDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleMenuItemDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButton.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButton.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButton.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButton.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButtonDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButtonDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButtonDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToggleToolBarButtonDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonGroupDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonGroupDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonGroupDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToolBarButtonGroupDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToolBarDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToolBarDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/app/ToolBarDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/app/ToolBarDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/AbstractApplicationContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/AbstractApplicationContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/AbstractApplicationContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/AbstractApplicationContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/AbstractPreferencesContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/AbstractPreferencesContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/AbstractPreferencesContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/AbstractPreferencesContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/AbstractWorkbenchContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/AbstractWorkbenchContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/AbstractWorkbenchContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/AbstractWorkbenchContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWorkbenchContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWorkbenchContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWorkbenchContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWorkbenchContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWrapper.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWrapper.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ApplicationContextWrapper.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/DefaultWorkbenchContextHolder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/DefaultWorkbenchContextHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/DefaultWorkbenchContextHolder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/DefaultWorkbenchContextHolder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryApplicationContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryApplicationContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryApplicationContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryApplicationContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryPreferencesContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryPreferencesContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryPreferencesContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ExpandedResourceRepositoryPreferencesContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContextWrapper.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContextWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContextWrapper.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/PreferencesContextWrapper.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesApplicationContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesApplicationContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesApplicationContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesApplicationContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/RedirectedPreferencesContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ShellWorkbenchContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ShellWorkbenchContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/ShellWorkbenchContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/ShellWorkbenchContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/SimpleWorkbenchContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/SimpleWorkbenchContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/SimpleWorkbenchContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/SimpleWorkbenchContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WindowWorkbenchContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WindowWorkbenchContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WindowWorkbenchContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WindowWorkbenchContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextHolder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextHolder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextHolder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextWrapper.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextWrapper.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/context/WorkbenchContextWrapper.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/DefaultHelpManager.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/DefaultHelpManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/DefaultHelpManager.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/DefaultHelpManager.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpFacade.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpFacade.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpFacade.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpFacade.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpManager.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpManager.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpManager.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpManagerConfig.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpManagerConfig.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpManagerConfig.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpManagerConfig.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesPage.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesPage.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDWindowAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDWindowAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDWindowAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/HelpTopicIDWindowAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/InternalHelpManager.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/InternalHelpManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/InternalHelpManager.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/InternalHelpManager.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/NullHelpManager.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/NullHelpManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/help/NullHelpManager.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/help/NullHelpManager.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/AboutAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/AboutAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/AboutAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/AboutAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/AboutDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/AboutDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/AboutDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/AboutDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/AbstractEditorView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/AbstractEditorView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/AbstractEditorView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/AbstractEditorView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/CloseAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/CloseAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/CloseAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/CloseAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/CloseAllAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/CloseAllAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/CloseAllAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/CloseAllAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/DevelopmentConsoleAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/DevelopmentConsoleAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/DevelopmentConsoleAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/DevelopmentConsoleAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/EditorView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/EditorView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/EditorView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/EditorView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/EmptySelectionPseudoNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/EmptySelectionPseudoNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/EmptySelectionPseudoNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/EmptySelectionPseudoNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ExamplesAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ExamplesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ExamplesAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ExamplesAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ExitAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ExitAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ExitAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ExitAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkActionRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkActionRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkActionRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkActionRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkApplication.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkApplication.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkApplication.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkApplication.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkConsole.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkConsole.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkConsole.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkConsole.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkExceptionDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkExceptionDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkExceptionDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkExceptionDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkIconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkIconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkIconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkIconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandler.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandler.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandler.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandlerDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandlerDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandlerDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkLogHandlerDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkNodeManager.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkNodeManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkNodeManager.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkNodeManager.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkPreferencesContext.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkPreferencesContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkPreferencesContext.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkPreferencesContext.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkResourceBundle.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkResourceBundle.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkRootNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkRootNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkRootNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/FrameworkRootNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesPage.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesPage.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/GeneralPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/GoToAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/GoToAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/GoToAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/GoToAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/HelpAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/HelpAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/HelpAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/HelpAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/HomeAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/HomeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/HomeAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/HomeAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/JavaDocAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/JavaDocAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/JavaDocAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/JavaDocAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/JavaHeapInformationAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/JavaHeapInformationAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/JavaHeapInformationAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/JavaHeapInformationAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/MultiSelectionPseudoNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/MultiSelectionPseudoNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/MultiSelectionPseudoNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/MultiSelectionPseudoNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/NavigatorView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/NavigatorView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/NavigatorView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/NavigatorView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/NewWindowAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/NewWindowAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/NewWindowAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/NewWindowAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/OpenAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/OpenAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/OpenAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/OpenAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/OpenRecentFileAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/OpenRecentFileAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/OpenRecentFileAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/OpenRecentFileAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesEditorView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesEditorView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesEditorView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesEditorView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesNavigatorView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesNavigatorView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesNavigatorView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesNavigatorView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/PreferencesView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ProblemReportAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ProblemReportAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ProblemReportAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ProblemReportAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsViewHelpAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsViewHelpAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsViewHelpAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ProblemsViewHelpAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ReleaseNotesAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ReleaseNotesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ReleaseNotesAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ReleaseNotesAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/RunnableProjectLoader.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/RunnableProjectLoader.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/RunnableProjectLoader.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/RunnableProjectLoader.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveAllAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveAllAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveAllAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveAllAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveAsAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveAsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveAsAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveAsAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveModifiedProjectsDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveModifiedProjectsDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SaveModifiedProjectsDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SaveModifiedProjectsDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ShowProblemsAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ShowProblemsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ShowProblemsAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ShowProblemsAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SynchronousProblemsAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SynchronousProblemsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/SynchronousProblemsAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/SynchronousProblemsAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ThreadBrowserAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ThreadBrowserAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/ThreadBrowserAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/ThreadBrowserAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/UsersGuideAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/UsersGuideAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/UsersGuideAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/UsersGuideAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WelcomeAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WelcomeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WelcomeAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WelcomeAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchCloseAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchCloseAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchCloseAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchCloseAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAsAction.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAsAction.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchSaveAsAction.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchWindow.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchWindow.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchWindow.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkbenchWindow.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkspaceView.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkspaceView.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/internal/WorkspaceView.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/internal/WorkspaceView.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/AbstractIconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/AbstractIconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/AbstractIconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/AbstractIconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/AcceleratorRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/AcceleratorRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/AcceleratorRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/AcceleratorRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultAcceleratorRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultAcceleratorRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultAcceleratorRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultAcceleratorRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultIconRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultIconRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultIconRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultIconRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultMnemonicRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultMnemonicRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultMnemonicRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultMnemonicRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultResourceRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultResourceRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultResourceRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultResourceRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultStringRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultStringRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/DefaultStringRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/DefaultStringRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/IconRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/IconRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/IconRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/IconRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/IconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/IconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/IconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/IconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingAcceleratorException.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingAcceleratorException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingAcceleratorException.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingAcceleratorException.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingIconException.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingIconException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingIconException.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingIconException.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingMnemonicException.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingMnemonicException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingMnemonicException.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingMnemonicException.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingResourceException.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingResourceException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingResourceException.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingResourceException.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingStringException.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingStringException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MissingStringException.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MissingStringException.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MnemonicRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MnemonicRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/MnemonicRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/MnemonicRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/ResourceBundleStringRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/ResourceBundleStringRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/ResourceBundleStringRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/ResourceBundleStringRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepositoryWrapper.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepositoryWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepositoryWrapper.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/ResourceRepositoryWrapper.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/StringRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/StringRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/resources/StringRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/resources/StringRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassChooserPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionAdapter.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionAdapter.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNodeContainer.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNodeContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNodeContainer.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionNodeContainer.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackageNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackageNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackageNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackageNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackagePoolNode.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackagePoolNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackagePoolNode.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionPackagePoolNode.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepositoryFactory.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepositoryFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepositoryFactory.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClassDescriptionRepositoryFactory.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescription.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescription.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescription.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescriptionRepository.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescriptionRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescriptionRepository.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/ClasspathClassDescriptionRepository.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultClassDescriptionAdapter.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultClassDescriptionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultClassDescriptionAdapter.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultClassDescriptionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooser.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooser.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooser.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooserDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooserDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/DefaultListChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/JavaClassClassDescriptionAdapter.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/JavaClassClassDescriptionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/JavaClassClassDescriptionAdapter.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/JavaClassClassDescriptionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/MultipleClassChooserDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/MultipleClassChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/MultipleClassChooserDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/MultipleClassChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/NodeChooserDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/NodeChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/chooser/NodeChooserDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/chooser/NodeChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractValidatingDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractValidatingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractValidatingDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/AbstractValidatingDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/ExceptionDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/ExceptionDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/ExceptionDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/ExceptionDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/NewNameDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/NewNameDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/NewNameDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/NewNameDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/TextAreaDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/TextAreaDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/TextAreaDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/TextAreaDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/WaitDialog.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/WaitDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/dialog/WaitDialog.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/dialog/WaitDialog.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPropertiesPage.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPropertiesPage.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractSubjectPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractSubjectPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractSubjectPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/AbstractSubjectPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/ComponentBuilder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/ComponentBuilder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/ComponentBuilder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/ComponentBuilder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/EmptyPropertiesPage.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/EmptyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/EmptyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/EmptyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/ScrollablePropertiesPage.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/ScrollablePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/ScrollablePropertiesPage.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/ScrollablePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/TabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/TabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/TabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/TabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/TitledPropertiesPage.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/TitledPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/ui/view/TitledPropertiesPage.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/ui/view/TitledPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledBorder.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledBorder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledBorder.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledBorder.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AccessibleTitledPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListSplitPane.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListSplitPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListSplitPane.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveListSplitPane.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemovePanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemovePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemovePanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemovePanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveTablePanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveTablePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveTablePanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/AddRemoveTablePanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/CheckList.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/CheckList.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/CheckList.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/CheckList.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/ClasspathPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/ClasspathPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/ClasspathPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/ClasspathPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/ComponentAligner.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/ComponentAligner.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/ComponentAligner.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/ComponentAligner.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/CursorConstants.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/CursorConstants.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/CursorConstants.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/CursorConstants.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickMouseListener.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickMouseListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickMouseListener.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickMouseListener.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickTrigger.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickTrigger.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickTrigger.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DoubleClickTrigger.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DropDownButton.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DropDownButton.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DropDownButton.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DropDownButton.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DualListSelectorPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DualListSelectorPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/DualListSelectorPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/DualListSelectorPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooser.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooser.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooser.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooserPanel.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooserPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooserPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/FileChooserPanel.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/GridLayout.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/GridLayout.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/GridLayout.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/GridLayout.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/GroupBox.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/GroupBox.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/GroupBox.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/GroupBox.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/LabeledTextFieldWithDefault.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/LabeledTextFieldWithDefault.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/LabeledTextFieldWithDefault.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/LabeledTextFieldWithDefault.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/NoneSelectedCellRendererAdapter.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/NoneSelectedCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/NoneSelectedCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/NoneSelectedCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/OSplitPane.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/OSplitPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/OSplitPane.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/OSplitPane.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/Pane.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/Pane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/Pane.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/Pane.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/RegexpDocument.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/RegexpDocument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/RegexpDocument.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/RegexpDocument.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/RigidBox.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/RigidBox.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/RigidBox.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/RigidBox.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/Spacer.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/Spacer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/Spacer.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/Spacer.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/SwingComponentFactory.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/SwingComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/SwingComponentFactory.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/SwingComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/SwingTools.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/SwingTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/SwingTools.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/SwingTools.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/TriStateBooleanCellRendererAdapter.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/TriStateBooleanCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/TriStateBooleanCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/TriStateBooleanCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsIconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsIconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsIconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsIconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsResourceBundle.java b/utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/framework/source/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsResourceBundle.java
rename to utils/eclipselink.utils.workbench/framework/src/main/java/org/eclipse/persistence/tools/workbench/framework/uitools/UIToolsResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/AbstractApplicationTests.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/AbstractApplicationTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/AbstractApplicationTests.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/AbstractApplicationTests.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/AllFrameworkTests.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/AllFrameworkTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/AllFrameworkTests.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/AllFrameworkTests.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/TestWorkbenchContext.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/TestWorkbenchContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/TestWorkbenchContext.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/TestWorkbenchContext.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/AllFrameworkResourcesTests.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/AllFrameworkResourcesTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/AllFrameworkResourcesTests.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/AllFrameworkResourcesTests.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/IconRepositoryTests.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/IconRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/IconRepositoryTests.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/IconRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/StringRepositoryTests.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/StringRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/StringRepositoryTests.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/StringRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/TestIconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/TestIconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/TestIconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/TestIconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/TestResourceBundle.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/TestResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/resources/TestResourceBundle.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/resources/TestResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserDialogUITest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserDialogUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserDialogUITest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserDialogUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserPanelUITest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserPanelUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserPanelUITest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassChooserPanelUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphBrowser.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphBrowser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphBrowser.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphBrowser.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphPanel.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphPanel.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/ClassDependencyGraphPanel.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/DefaultListChooserUITest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/DefaultListChooserUITest.java
similarity index 99%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/DefaultListChooserUITest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/DefaultListChooserUITest.java
index a13db0c..01796fe 100644
--- a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/DefaultListChooserUITest.java
+++ b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/DefaultListChooserUITest.java
@@ -43,7 +43,6 @@
import org.eclipse.persistence.tools.workbench.test.framework.TestWorkbenchContext;
import com.sun.java.swing.plaf.motif.MotifLookAndFeel;
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
import org.eclipse.persistence.tools.workbench.framework.context.ApplicationContext;
import org.eclipse.persistence.tools.workbench.framework.context.WorkbenchContext;
@@ -287,7 +286,7 @@ private JComboBox buildLookAndFeelComboBox() {
private ListValueModel buildLookAndFeelListValue() {
List lookAndFeelValues = new ArrayList();
lookAndFeelValues.add(MetalLookAndFeel.class.getName());
- lookAndFeelValues.add(WindowsLookAndFeel.class.getName());
+ lookAndFeelValues.add("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
lookAndFeelValues.add(MotifLookAndFeel.class.getName());
lookAndFeelValues.add("oracle.bali.ewt.olaf.OracleLookAndFeel"); // remove compile-time dependency on OLAF
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/MultipleClassChooserDialogUITest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/MultipleClassChooserDialogUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/MultipleClassChooserDialogUITest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/chooser/MultipleClassChooserDialogUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/NewNameDialogUITest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/NewNameDialogUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/NewNameDialogUITest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/NewNameDialogUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/TextAreaDialogUITest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/TextAreaDialogUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/TextAreaDialogUITest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/dialog/TextAreaDialogUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/AllFrameworkUIToolsTests.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/AllFrameworkUIToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/AllFrameworkUIToolsTests.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/AllFrameworkUIToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/ComponentAlignerTest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/ComponentAlignerTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/ComponentAlignerTest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/ComponentAlignerTest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/SpacerTest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/SpacerTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/SpacerTest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/SpacerTest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/TriStateBooleanCellRendererAdapterTest.java b/utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/TriStateBooleanCellRendererAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/source/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/TriStateBooleanCellRendererAdapterTest.java
rename to utils/eclipselink.utils.workbench/framework/src/test/java/org/eclipse/persistence/tools/workbench/test/framework/ui/tools/TriStateBooleanCellRendererAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/framework/resource/icons/mw.gif b/utils/eclipselink.utils.workbench/framework/src/test/resources/icons/mw.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/resource/icons/mw.gif
rename to utils/eclipselink.utils.workbench/framework/src/test/resources/icons/mw.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.test/framework/resource/jars/build.jar.cmd b/utils/eclipselink.utils.workbench/framework/src/test/resources/jars/build.jar.cmd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/resource/jars/build.jar.cmd
rename to utils/eclipselink.utils.workbench/framework/src/test/resources/jars/build.jar.cmd
diff --git a/utils/eclipselink.utils.workbench.test/framework/resource/jars/test.jar b/utils/eclipselink.utils.workbench/framework/src/test/resources/jars/test.jar
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/resource/jars/test.jar
rename to utils/eclipselink.utils.workbench/framework/src/test/resources/jars/test.jar
Binary files differ
diff --git a/utils/eclipselink.utils.workbench.test/framework/resource/jars/test.manifest.txt b/utils/eclipselink.utils.workbench/framework/src/test/resources/jars/test.manifest.txt
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/framework/resource/jars/test.manifest.txt
rename to utils/eclipselink.utils.workbench/framework/src/test/resources/jars/test.manifest.txt
diff --git a/utils/eclipselink.utils.workbench/iconlib/build.properties b/utils/eclipselink.utils.workbench/iconlib/build.properties
deleted file mode 100644
index 24f31de..0000000
--- a/utils/eclipselink.utils.workbench/iconlib/build.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Icon Library
-_productName=Eclipse Project
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-iconlib.jarfile=iconlib.jar
-
-# Defines for build directories.
-compile.iconlib.resources=${_rootResourceDir}
diff --git a/utils/eclipselink.utils.workbench/iconlib/build.xml b/utils/eclipselink.utils.workbench/iconlib/build.xml
deleted file mode 100644
index ec854f7..0000000
--- a/utils/eclipselink.utils.workbench/iconlib/build.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Icon Library" default="build.all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="off"/>
- <property name="target.jvm" value="${javac.version}"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- </target>
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="jar-iconlib"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete file="${_jarDestDir}/${iconlib.jarfile}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-iconlib" depends="properties-init">
- <delete file="${_jarDestDir}/${iconlib.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${iconlib.jarfile}" compress="false">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.iconlib" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- </manifest>
- <fileset
- dir="${compile.iconlib.resources}"
- includes="**"
- excludes="**/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/iconlib/pom.xml b/utils/eclipselink.utils.workbench/iconlib/pom.xml
new file mode 100644
index 0000000..2431536
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/iconlib/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.iconlib</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Icons Library</name>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/DataSources.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/DataSources.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/DataSources.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/DataSources.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.connected.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.connected.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.connected.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.connected.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.connecting.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.connecting.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.connecting.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.connecting.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.error.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.error.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.error.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.error.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.large.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.large.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.large.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.large.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.new.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.new.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.new.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.new.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.remove.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.remove.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Database.remove.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Database.remove.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Login.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Login.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Login.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Login.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Logout.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Logout.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Logout.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Logout.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.add.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.add.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.add.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.add.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.addFromDatabase.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.addFromDatabase.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.addFromDatabase.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.addFromDatabase.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.remove.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.remove.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/database/Table.remove.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/database/Table.remove.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/edit/Copy.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/edit/Copy.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/edit/Copy.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/edit/Copy.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/edit/Delete.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/edit/Delete.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/edit/Delete.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/edit/Delete.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.close.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.close.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.close.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.close.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.closeAll.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.closeAll.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.closeAll.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.closeAll.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.export.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.export.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.export.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.export.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.import.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.import.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.import.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.import.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.large.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.large.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.large.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.large.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.open.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.open.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.open.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.open.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.save.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.save.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.save.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.save.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.saveAll.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.saveAll.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.saveAll.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.saveAll.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.saveAs.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.saveAs.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.saveAs.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.saveAs.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.large.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.large.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.large.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.large.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.multi.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.multi.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.multi.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.multi.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.multi.refresh.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.multi.refresh.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.multi.refresh.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.multi.refresh.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.new.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.new.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.new.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.new.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.refresh.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.refresh.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/File.xml.refresh.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/File.xml.refresh.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Folder.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Folder.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Folder.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Folder.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.export.ejb-jar.xml.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.export.ejb-jar.xml.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.export.ejb-jar.xml.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.export.ejb-jar.xml.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.import.ejb-jar.xml.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.import.ejb-jar.xml.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.import.ejb-jar.xml.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.import.ejb-jar.xml.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.new.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.new.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.new.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.new.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.remove.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.remove.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Project.remove.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Project.remove.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Projects.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Projects.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/file/Projects.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/file/Projects.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.default.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.default.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.default.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.default.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.interface.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.interface.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.interface.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.interface.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.new.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.new.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.new.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.new.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.private.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.private.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.private.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.private.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.protected.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.protected.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.protected.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.protected.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.public.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.public.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.public.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.public.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.refresh.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.refresh.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.refresh.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.refresh.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.remove.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.remove.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Class.remove.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Class.remove.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.default.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.default.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.default.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.default.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.private.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.private.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.private.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.private.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.protected.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.protected.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.protected.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.protected.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.public.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.public.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Field.public.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Field.public.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Inherited.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Inherited.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Inherited.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Inherited.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.default.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.default.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.default.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.default.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.private.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.private.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.private.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.private.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.protected.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.protected.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.protected.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.protected.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.public.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.public.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Method.public.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Method.public.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.new.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.new.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.new.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.new.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.open.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.open.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.open.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.open.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.remove.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.remove.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/meta/Package.remove.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/meta/Package.remove.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Add.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Add.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Add.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Add.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Approve.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Approve.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Approve.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Approve.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Bean.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Bean.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Bean.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Bean.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Error.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Error.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Error.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Error.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Error.large.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Error.large.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Error.large.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Error.large.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Exit.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Exit.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Exit.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Exit.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Forward.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Forward.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Forward.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Forward.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Ignore.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Ignore.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Ignore.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Ignore.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Preferences.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Preferences.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Preferences.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Preferences.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Problems.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Problems.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Problems.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Problems.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/ProblemsReport.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/ProblemsReport.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/ProblemsReport.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/ProblemsReport.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Refresh.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Refresh.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Refresh.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Refresh.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Remove.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Remove.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Remove.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Remove.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Rename.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Rename.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Rename.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Rename.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Stop.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Stop.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Stop.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Stop.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Text.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Text.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Text.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Text.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Warning.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Warning.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Warning.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Warning.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Warning.large.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Warning.large.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Warning.large.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Warning.large.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Warning.small.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Warning.small.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/Warning.small.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/Warning.small.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/shuttleLeft.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/shuttleLeft.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/shuttleLeft.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/shuttleLeft.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/shuttleRight.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/shuttleRight.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/basic/misc/shuttleRight.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/basic/misc/shuttleRight.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/logo/MappingWorkbench.about.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/MappingWorkbench.about.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/logo/MappingWorkbench.about.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/MappingWorkbench.about.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/logo/MappingWorkbench.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/MappingWorkbench.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/logo/MappingWorkbench.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/MappingWorkbench.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/logo/MappingWorkbench.large.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/MappingWorkbench.large.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/logo/MappingWorkbench.large.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/MappingWorkbench.large.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/logo/splash.screen.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/splash.screen.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/logo/splash.screen.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/logo/splash.screen.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.advancedProperties.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.advancedProperties.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.advancedProperties.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.advancedProperties.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.aggregate.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.aggregate.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.aggregate.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.aggregate.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.bean.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.bean.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.bean.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.bean.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.class.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.class.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.class.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.class.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.convert.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.convert.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.convert.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.convert.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.eis.composite.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.eis.composite.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.eis.composite.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.eis.composite.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.eis.root.bean.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.eis.root.bean.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.eis.root.bean.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.eis.root.bean.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.eis.root.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.eis.root.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.eis.root.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.eis.root.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.interface.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.interface.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.interface.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.interface.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.ox.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.ox.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/descriptor/Descriptor.ox.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/descriptor/Descriptor.ox.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.aggregate.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.aggregate.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.aggregate.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.aggregate.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.anyAttribute.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.anyAttribute.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.anyAttribute.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.anyAttribute.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.anyCollection.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.anyCollection.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.anyCollection.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.anyCollection.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.anyObject.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.anyObject.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.anyObject.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.anyObject.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.collectionReference.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.collectionReference.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.collectionReference.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.collectionReference.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.composite.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.composite.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.composite.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.composite.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.compositeCollection.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.compositeCollection.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.compositeCollection.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.compositeCollection.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directCollection.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directCollection.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directCollection.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directCollection.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directMap.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directMap.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directMap.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directMap.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directToField.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directToField.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directToField.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directToField.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directToXmlType.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directToXmlType.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.directToXmlType.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.directToXmlType.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.eisOneToMany.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.eisOneToMany.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.eisOneToMany.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.eisOneToMany.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.eisOneToOne.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.eisOneToOne.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.eisOneToOne.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.eisOneToOne.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.holder.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.holder.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.holder.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.holder.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.manyToMany.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.manyToMany.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.manyToMany.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.manyToMany.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.mixedXmlContent.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.mixedXmlContent.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.mixedXmlContent.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.mixedXmlContent.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.objectReference.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.objectReference.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.objectReference.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.objectReference.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.objectType.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.objectType.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.objectType.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.objectType.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.oneToMany.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.oneToMany.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.oneToMany.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.oneToMany.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.oneToOne.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.oneToOne.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.oneToOne.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.oneToOne.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.remove.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.remove.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.remove.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.remove.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.serialized.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.serialized.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.serialized.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.serialized.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.transformation.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.transformation.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.transformation.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.transformation.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.typeConversion.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.typeConversion.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.typeConversion.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.typeConversion.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.unmapped.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.unmapped.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.unmapped.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.unmapped.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.variableOneToOne.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.variableOneToOne.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.variableOneToOne.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.variableOneToOne.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlDirect.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlDirect.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlDirect.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlDirect.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlDirectCollection.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlDirectCollection.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlDirectCollection.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlDirectCollection.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlDirectMap.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlDirectMap.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlDirectMap.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlDirectMap.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlFragment.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlFragment.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlFragment.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlFragment.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlFragmentCollection.png b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlFragmentCollection.png
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/mapping/Mapping.xmlFragmentCollection.png
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/mapping/Mapping.xmlFragmentCollection.png
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/Automap.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/Automap.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/Automap.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/Automap.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/GenerateJava.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/GenerateJava.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/GenerateJava.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/GenerateJava.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/GenerateXML.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/GenerateXML.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/GenerateXML.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/GenerateXML.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/Synchronize.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/Synchronize.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/misc/Synchronize.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/misc/Synchronize.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.afterLoading.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.afterLoading.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.afterLoading.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.afterLoading.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.caching.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.caching.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.caching.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.caching.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.copy.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.copy.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.copy.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.copy.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.defaults.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.defaults.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.defaults.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.defaults.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.events.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.events.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.events.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.events.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.inheritance.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.inheritance.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.inheritance.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.inheritance.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.instantiation.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.instantiation.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.instantiation.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.instantiation.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.interfaceAlias.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.interfaceAlias.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.interfaceAlias.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.interfaceAlias.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.locking.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.locking.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.locking.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.locking.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.multiTableInfo.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.multiTableInfo.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.multiTableInfo.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.multiTableInfo.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.sequencing.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.sequencing.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.sequencing.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.sequencing.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.tableGeneration.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.tableGeneration.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/policy/Policy.tableGeneration.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/policy/Policy.tableGeneration.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/project/Project.eis.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/project/Project.eis.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/project/Project.eis.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/project/Project.eis.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/project/Project.ox.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/project/Project.ox.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/project/Project.ox.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/project/Project.ox.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/project/Project.relational.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/project/Project.relational.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/project/Project.relational.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/project/Project.relational.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/query/QueryKey.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/query/QueryKey.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/query/QueryKey.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/query/QueryKey.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/mw/query/QueryKey.userDefined.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/query/QueryKey.userDefined.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/mw/query/QueryKey.userDefined.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/mw/query/QueryKey.userDefined.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.add.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.add.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.add.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.add.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.read.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.read.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.read.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.read.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.sequence.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.sequence.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.sequence.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.sequence.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.write.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.write.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/ConnectionPool.write.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/ConnectionPool.write.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.add.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.add.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.add.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.add.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.broker.add.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.broker.add.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.broker.add.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.broker.add.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.broker.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.broker.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.broker.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.broker.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.database.database.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.database.database.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.database.database.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.database.database.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.database.eis.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.database.eis.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.database.eis.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.database.eis.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.database.xml.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.database.xml.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.database.xml.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.database.xml.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.server.database.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.server.database.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.server.database.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.server.database.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.server.eis.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.server.eis.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.server.eis.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.server.eis.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.server.xml.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.server.xml.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/Session.server.xml.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/Session.server.xml.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/iconlib/resource/sc/TopLinkSessions.gif b/utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/TopLinkSessions.gif
similarity index 100%
rename from utils/eclipselink.utils.workbench/iconlib/resource/sc/TopLinkSessions.gif
rename to utils/eclipselink.utils.workbench/iconlib/src/main/resources/sc/TopLinkSessions.gif
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/mappingsio/build.properties b/utils/eclipselink.utils.workbench/mappingsio/build.properties
deleted file mode 100644
index bee06d0..0000000
--- a/utils/eclipselink.utils.workbench/mappingsio/build.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Mappings IO
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-mappingsio.jarfile=mappingsio.jar
-mappingsio.jarfile.src=mappingsio_src.jar
-
-# Defines for build directories.
-compile.mappingsio.resources=${_rootResourceDir}
-compile.mappingsio.srcdir=${_rootSourceDir}
-compile.mappingsio.destdir=${_classesDestDir}
-compile.mappingsio.classpath= \
- ${_jarDestDir}/mappingsmodel.jar; \
- ${_jarDestDir}/utility.jar; \
- ${_eclipselinkJar}
diff --git a/utils/eclipselink.utils.workbench/mappingsio/build.xml b/utils/eclipselink.utils.workbench/mappingsio/build.xml
deleted file mode 100644
index 21a27c3..0000000
--- a/utils/eclipselink.utils.workbench/mappingsio/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Mappings Plug-in" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-mappingsio, jar-mappingsio"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsio.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsio.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-mappingsio" depends="properties-init">
- <mkdir dir="${compile.mappingsio.destdir}"/>
- <javac
- classpath="${compile.mappingsio.classpath}"
- srcdir="${compile.mappingsio.srcdir}"
- destdir="${compile.mappingsio.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-mappingsio" depends="jar-mappingsio-lib, jar-mappingsio-src"/>
-
- <target name="jar-mappingsio-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsio.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${mappingsio.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.mappingsio" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.mappingsio.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-mappingsio-src" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsio.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${mappingsio.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.mappingsio" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.mappingsio.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/mappingsio/pom.xml b/utils/eclipselink.utils.workbench/mappingsio/pom.xml
new file mode 100644
index 0000000..11fceea
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/mappingsio/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsio</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Mappings IO</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsmodel</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundEvent.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundEvent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundEvent.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundEvent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundListener.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundListener.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/FileNotFoundListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/LegacyProjectReadCallback.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/LegacyProjectReadCallback.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/LegacyProjectReadCallback.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/LegacyProjectReadCallback.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ProjectIOManager.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ProjectIOManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ProjectIOManager.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ProjectIOManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ProjectReader.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ProjectReader.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ProjectReader.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ProjectReader.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ProjectWriter.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ProjectWriter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ProjectWriter.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ProjectWriter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ReadOnlyFilesException.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ReadOnlyFilesException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/ReadOnlyFilesException.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/ReadOnlyFilesException.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/LegacyIOFacade.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/LegacyIOFacade.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/LegacyIOFacade.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/LegacyIOFacade.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60IOManager.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60IOManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60IOManager.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60IOManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60Reader.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60Reader.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60Reader.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/Project60Reader.java
diff --git a/utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/UnsupportedAccessorOperationException50.java b/utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/UnsupportedAccessorOperationException50.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsio/source/org/eclipse/persistence/tools/workbench/mappingsio/legacy/UnsupportedAccessorOperationException50.java
rename to utils/eclipselink.utils.workbench/mappingsio/src/main/java/org/eclipse/persistence/tools/workbench/mappingsio/legacy/UnsupportedAccessorOperationException50.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/build.properties b/utils/eclipselink.utils.workbench/mappingsmodel/build.properties
deleted file mode 100644
index 7f2ec77..0000000
--- a/utils/eclipselink.utils.workbench/mappingsmodel/build.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Mappings Model
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-mappingsmodel.jarfile=mappingsmodel.jar
-mappingsmodel.jarfile.src=mappingsmodel_src.jar
-
-# Defines for build directories.
-compile.mappingsmodel.resources=${_rootResourceDir}
-compile.mappingsmodel.srcdir=${_rootSourceDir}
-compile.mappingsmodel.destdir=${_classesDestDir}
-compile.mappingsmodel.classpath= \
- ${_jarDestDir}/platformsmodel.jar; \
- ${_jarDestDir}/utility.jar; \
- ${_libDir}/compile/xercesImpl.jar; \
- ${_eclipselinkJar}
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/build.xml b/utils/eclipselink.utils.workbench/mappingsmodel/build.xml
deleted file mode 100644
index ed25231..0000000
--- a/utils/eclipselink.utils.workbench/mappingsmodel/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Mappings Model" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-mappingsmodel, jar-mappingsmodel"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsmodel.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsmodel.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-mappingsmodel" depends="properties-init">
- <mkdir dir="${compile.mappingsmodel.destdir}"/>
- <javac
- classpath="${compile.mappingsmodel.classpath}"
- srcdir="${compile.mappingsmodel.srcdir}"
- destdir="${compile.mappingsmodel.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-mappingsmodel" depends="jar-mappingsmodel-lib, jar-mappingsmodel-src"/>
-
- <target name="jar-mappingsmodel-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsmodel.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${mappingsmodel.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.mappingsmodel" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.mappingsmodel.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-mappingsmodel-src" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsmodel.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${mappingsmodel.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.mappingsmodel" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.mappingsmodel.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/pom.xml b/utils/eclipselink.utils.workbench/mappingsmodel/pom.xml
new file mode 100644
index 0000000..81fd9ce
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/mappingsmodel/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsmodel</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Mappings Model</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.oracle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsmodel</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWDataField.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWDataField.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWDataField.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWDataField.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWError.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWError.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWError.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWError.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWModel.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWModel.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWModel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNode.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNode.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNominative.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNominative.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNominative.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWNominative.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWQueryKey.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWQueryKey.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/MWQueryKey.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/MWQueryKey.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/ProblemConstants.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/ProblemConstants.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/ProblemConstants.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/ProblemConstants.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/ProjectSubFileComponentContainer.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/ProjectSubFileComponentContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/ProjectSubFileComponentContainer.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/ProjectSubFileComponentContainer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOption.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOption.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOption.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOption.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOptionSet.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOptionSet.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOptionSet.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/TopLinkOptionSet.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/ColumnStringHolder.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/ColumnStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/ColumnStringHolder.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/ColumnStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/DatabaseTypeHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/DatabaseTypeHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/DatabaseTypeHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/DatabaseTypeHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumn.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumn.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumn.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumn.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumnPair.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumnPair.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumnPair.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWColumnPair.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWDatabase.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWDatabase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWDatabase.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWDatabase.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpec.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpec.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpec.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpec.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpecHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpecHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpecHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWLoginSpecHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWReference.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWReference.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWReference.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWReference.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWTable.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWTable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWTable.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/MWTable.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/TableStringHolder.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/TableStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/db/TableStringHolder.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/db/TableStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureContainer.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureContainer.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureContainer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureEvent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureEvent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureEvent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureEvent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureListener.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureListener.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorCreationFailureListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorStringHolder.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorStringHolder.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/DescriptorStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/InterfaceDescriptorCreationException.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/InterfaceDescriptorCreationException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/InterfaceDescriptorCreationException.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/InterfaceDescriptorCreationException.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractClassIndicatorPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractClassIndicatorPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractClassIndicatorPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractClassIndicatorPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractDescriptorPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractDescriptorPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractDescriptorPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractDescriptorPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractTransactionalPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractTransactionalPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractTransactionalPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAbstractTransactionalPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyAdditionException.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyAdditionException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyAdditionException.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyAdditionException.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyRemovalException.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyRemovalException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyRemovalException.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWAdvancedPropertyRemovalException.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCacheExpiry.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCacheExpiry.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCacheExpiry.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCacheExpiry.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCachingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCachingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCachingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWCachingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorExtractionMethodPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorExtractionMethodPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorExtractionMethodPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorExtractionMethodPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorFieldPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorFieldPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorFieldPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorFieldPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorValue.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorValue.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorValue.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWClassIndicatorValue.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAdvancedPropertyException.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAdvancedPropertyException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAdvancedPropertyException.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAdvancedPropertyException.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAfterLoadingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAfterLoadingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAfterLoadingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorAfterLoadingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCacheExpiry.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCacheExpiry.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCacheExpiry.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCacheExpiry.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCachingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCachingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCachingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCachingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCopyPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCopyPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCopyPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorCopyPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorEventsPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorEventsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorEventsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorEventsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInheritancePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInheritancePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInheritancePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInheritancePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInstantiationPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInstantiationPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInstantiationPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInstantiationPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInterfaceAliasPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInterfaceAliasPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInterfaceAliasPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorInterfaceAliasPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorLockingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorLockingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorLockingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorLockingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWDescriptorPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInheritancePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInheritancePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInheritancePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInheritancePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInterfaceAliasDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInterfaceAliasDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInterfaceAliasDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWInterfaceAliasDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWLockingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWLockingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWLockingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWLockingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWMappingDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWMappingDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWMappingDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWMappingDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullCachingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullCachingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullCachingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullCachingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullClassIndicatorPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullClassIndicatorPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullClassIndicatorPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullClassIndicatorPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullDescriptorPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullDescriptorPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullDescriptorPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullDescriptorPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullInheritancePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullInheritancePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullInheritancePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullInheritancePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullLockingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullLockingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullLockingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullLockingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullTransactionalPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullTransactionalPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullTransactionalPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWNullTransactionalPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWProjectDefaultCacheExpiry.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWProjectDefaultCacheExpiry.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWProjectDefaultCacheExpiry.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWProjectDefaultCacheExpiry.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWRefreshCachePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWRefreshCachePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWRefreshCachePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWRefreshCachePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicyInsertFieldReturnOnlyFlag.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicyInsertFieldReturnOnlyFlag.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicyInsertFieldReturnOnlyFlag.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWReturningPolicyInsertFieldReturnOnlyFlag.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTransactionalPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTypeNames.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTypeNames.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTypeNames.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/MWTypeNames.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWAggregateDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWAggregateDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWAggregateDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWAggregateDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWDescriptorMultiTableInfoPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWDescriptorMultiTableInfoPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWDescriptorMultiTableInfoPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWDescriptorMultiTableInfoPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWInterfaceDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWInterfaceDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWInterfaceDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWInterfaceDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWJoinFetchableMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWJoinFetchableMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWJoinFetchableMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWJoinFetchableMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassIndicatorFieldPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassIndicatorFieldPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassIndicatorFieldPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalClassIndicatorFieldPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptorInheritancePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptorInheritancePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptorInheritancePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalDescriptorInheritancePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalPrimaryKeyPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalPrimaryKeyPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalPrimaryKeyPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalPrimaryKeyPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicyInsertFieldReturnOnlyFlag.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicyInsertFieldReturnOnlyFlag.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicyInsertFieldReturnOnlyFlag.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalReturningPolicyInsertFieldReturnOnlyFlag.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalTransactionalPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalTransactionalPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalTransactionalPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWRelationalTransactionalPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWSecondaryTableHolder.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWSecondaryTableHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWSecondaryTableHolder.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWSecondaryTableHolder.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptorLockingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptorLockingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptorLockingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWTableDescriptorLockingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWUserDefinedQueryKey.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWUserDefinedQueryKey.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWUserDefinedQueryKey.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/relational/MWUserDefinedQueryKey.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWCompositeEisDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWCompositeEisDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWCompositeEisDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWCompositeEisDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorInheritancePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorInheritancePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorInheritancePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorInheritancePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorLockingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorLockingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorLockingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisDescriptorLockingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicyInsertFieldReturnOnlyFlag.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicyInsertFieldReturnOnlyFlag.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicyInsertFieldReturnOnlyFlag.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisReturningPolicyInsertFieldReturnOnlyFlag.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisTransactionalPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisTransactionalPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisTransactionalPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWEisTransactionalPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorInheritancePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorInheritancePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorInheritancePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorInheritancePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorLockingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorLockingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorLockingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXDescriptorLockingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXTransactionalPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXTransactionalPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXTransactionalPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWOXTransactionalPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWRootEisDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWRootEisDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWRootEisDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWRootEisDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlClassIndicatorFieldPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlClassIndicatorFieldPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlClassIndicatorFieldPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlClassIndicatorFieldPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptorInheritancePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptorInheritancePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptorInheritancePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlDescriptorInheritancePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlPrimaryKeyPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlPrimaryKeyPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlPrimaryKeyPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/descriptor/xml/MWXmlPrimaryKeyPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWDescriptorGenerator.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWDescriptorGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWDescriptorGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWDescriptorGenerator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWRelationshipHolder.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWRelationshipHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWRelationshipHolder.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/generation/MWRelationshipHolder.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWAttributeHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWAttributeHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWAttributeHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWAttributeHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWClassHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWClassHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWClassHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWClassHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnPairHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnPairHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnPairHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWColumnPairHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorQueryParameterHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorQueryParameterHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorQueryParameterHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWDescriptorQueryParameterHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMappingHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMappingHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMappingHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMappingHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMethodHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMethodHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMethodHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWMethodHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWNamedSchemaComponentHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWNamedSchemaComponentHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWNamedSchemaComponentHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWNamedSchemaComponentHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryKeyHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryKeyHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryKeyHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryKeyHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryableHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryableHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryableHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWQueryableHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWReferenceHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWReferenceHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWReferenceHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWReferenceHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWTableHandle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWTableHandle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWTableHandle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/MWTableHandle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/QName.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/QName.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/QName.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/handles/QName.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/DefaultingContainerClass.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/DefaultingContainerClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/DefaultingContainerClass.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/DefaultingContainerClass.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWAbstractReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWAbstractReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWAbstractReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWAbstractReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWClassBasedTransformer.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWClassBasedTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWClassBasedTransformer.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWClassBasedTransformer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWCollectionContainerPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWCollectionContainerPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWCollectionContainerPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWCollectionContainerPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWContainerPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverterMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverterMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverterMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWConverterMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDefaultNullValuePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDefaultNullValuePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDefaultNullValuePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDefaultNullValuePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectContainerMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectContainerMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectContainerMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectContainerMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapContainerPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapContainerPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapContainerPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapContainerPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWDirectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWFieldTransformerAssociation.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWFieldTransformerAssociation.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWFieldTransformerAssociation.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWFieldTransformerAssociation.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableContainerMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableContainerMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableContainerMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableContainerMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWIndirectableMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWLegacyUnmappedMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWLegacyUnmappedMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWLegacyUnmappedMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWLegacyUnmappedMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWListContainerPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWListContainerPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWListContainerPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWListContainerPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapContainerPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMappingFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMappingFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMappingFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMappingFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMethodBasedTransformer.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMethodBasedTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMethodBasedTransformer.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWMethodBasedTransformer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullNullValuePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullNullValuePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullNullValuePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullNullValuePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullTransformer.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullTransformer.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullTransformer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullValuePolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullValuePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullValuePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWNullValuePolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWObjectTypeConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWObjectTypeConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWObjectTypeConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWObjectTypeConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWProxyIndirectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWProxyIndirectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWProxyIndirectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWProxyIndirectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceObjectMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceObjectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceObjectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWReferenceObjectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSerializedObjectConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSerializedObjectConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSerializedObjectConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSerializedObjectConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSetContainerPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSetContainerPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSetContainerPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWSetContainerPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformationMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformationMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformationMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformationMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformer.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformer.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTransformer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConversionConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConversionConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConversionConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConversionConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MWTypeConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MappingStringHolder.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MappingStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MappingStringHolder.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/MappingStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateFieldDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateFieldDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateFieldDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateFieldDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateRuntimeFieldNameGenerator.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateRuntimeFieldNameGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateRuntimeFieldNameGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/AggregateRuntimeFieldNameGenerator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAbstractTableReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAbstractTableReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAbstractTableReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAbstractTableReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregateMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregateMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregateMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregateMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregatePathToColumn.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregatePathToColumn.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregatePathToColumn.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWAggregatePathToColumn.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionOrdering.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionOrdering.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionOrdering.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWCollectionOrdering.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWColumnQueryKeyPair.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWColumnQueryKeyPair.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWColumnQueryKeyPair.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWColumnQueryKeyPair.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToFieldMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToFieldMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToFieldMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToFieldMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToXmlTypeMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToXmlTypeMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToXmlTypeMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWDirectToXmlTypeMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWManyToManyMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWManyToManyMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWManyToManyMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWManyToManyMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToManyMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToManyMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToManyMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToManyMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToOneMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToOneMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToOneMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWOneToOneMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectContainerMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectContainerMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectContainerMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectContainerMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalDirectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalFieldTransformerAssociation.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalFieldTransformerAssociation.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalFieldTransformerAssociation.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalFieldTransformerAssociation.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalMappingFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalMappingFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalMappingFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalMappingFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTransformationMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTransformationMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTransformationMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTransformationMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTypeConversionConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTypeConversionConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTypeConversionConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWRelationalTypeConversionConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWTableReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWTableReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWTableReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWTableReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWVariableOneToOneMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWVariableOneToOneMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWVariableOneToOneMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/relational/MWVariableOneToOneMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractAnyMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractAnyMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractAnyMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractAnyMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractCompositeMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractCompositeMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractCompositeMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractCompositeMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlDirectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAbstractXmlReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyAttributeMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyAttributeMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyAttributeMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyAttributeMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyObjectMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyObjectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyObjectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAnyObjectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAttributeContainerAccessor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAttributeContainerAccessor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAttributeContainerAccessor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWAttributeContainerAccessor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeObjectMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeObjectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeObjectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWCompositeObjectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWContainerAccessor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWContainerAccessor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWContainerAccessor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWContainerAccessor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisMappingFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisMappingFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisMappingFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisMappingFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToManyMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToManyMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToManyMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToManyMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToOneMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToOneMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToOneMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisOneToOneMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWEisReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWMethodContainerAccessor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWMethodContainerAccessor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWMethodContainerAccessor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWMethodContainerAccessor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWNullContainerAccessor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWNullContainerAccessor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWNullContainerAccessor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWNullContainerAccessor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWOXMappingFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWOXMappingFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWOXMappingFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWOXMappingFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlCollectionReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlCollectionReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlCollectionReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlCollectionReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlDirectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlElementTypeableMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlElementTypeableMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlElementTypeableMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlElementTypeableMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldPair.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldPair.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldPair.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldPair.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldTransformerAssociation.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldTransformerAssociation.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldTransformerAssociation.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFieldTransformerAssociation.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentCollectionMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentCollectionMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentCollectionMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentCollectionMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlFragmentMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMappingFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMappingFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMappingFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlMappingFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlObjectReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlObjectReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlObjectReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlObjectReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlReferenceMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlReferenceMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlReferenceMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlReferenceMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTransformationMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTransformationMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTransformationMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTransformationMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTypeConversionConverter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTypeConversionConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTypeConversionConverter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXmlTypeConversionConverter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXpathedMapping.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXpathedMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXpathedMapping.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/mapping/xml/MWXpathedMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/AbstractMWClassRefreshPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/AbstractMWClassRefreshPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/AbstractMWClassRefreshPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/AbstractMWClassRefreshPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/DefaultMWClassRefreshPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/DefaultMWClassRefreshPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/DefaultMWClassRefreshPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/DefaultMWClassRefreshPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureContainer.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureContainer.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureContainer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureEvent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureEvent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureEvent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureEvent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureListener.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureListener.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/ExternalClassLoadFailureListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAccessorCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAccessorCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAccessorCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAccessorCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAddMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAddMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAddMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWAddMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClass.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClass.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClass.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassAttribute.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassAttribute.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassAttribute.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRefreshPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRefreshPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRefreshPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRefreshPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRepository.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRepository.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWContainerAccessorCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWContainerAccessorCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWContainerAccessorCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWContainerAccessorCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWDefaultMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWDefaultMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWDefaultMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWDefaultMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWEjbCreateMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWEjbCreateMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWEjbCreateMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWEjbCreateMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWGetMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWGetMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWGetMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWGetMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethod.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethod.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethod.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethod.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodParameter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodParameter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodParameter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWMethodParameter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifiable.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifiable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifiable.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifiable.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifier.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifier.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWModifier.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWRemoveMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWRemoveMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWRemoveMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWRemoveMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWSetMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWSetMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWSetMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWSetMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWTypeDeclaration.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWTypeDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWTypeDeclaration.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWTypeDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueGetMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueGetMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueGetMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueGetMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueSetMethodCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueSetMethodCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueSetMethodCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWValueSetMethodCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWZeroArgumentConstructorCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWZeroArgumentConstructorCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWZeroArgumentConstructorCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/meta/MWZeroArgumentConstructorCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWNullCachingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWNullCachingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWNullCachingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWNullCachingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProject.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProject.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProject.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProjectDefaultsPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProjectDefaultsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProjectDefaultsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWProjectDefaultsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectCachingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectCachingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectCachingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectCachingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectDefaultsPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectDefaultsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectDefaultsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/MWTransactionalProjectDefaultsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProject.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProject.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProject.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProjectDefaultsPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProjectDefaultsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProjectDefaultsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWRelationalProjectDefaultsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWSequencingPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWSequencingPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWSequencingPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWSequencingPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWTableGenerationPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWTableGenerationPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWTableGenerationPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/relational/MWTableGenerationPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisLoginSpec.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisLoginSpec.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisLoginSpec.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisLoginSpec.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProject.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProject.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProject.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProjectDefaultsPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProjectDefaultsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProjectDefaultsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWEisProjectDefaultsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProject.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProject.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProject.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProjectDefaultsPolicy.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProjectDefaultsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProjectDefaultsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWOXProjectDefaultsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWProperty.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWProperty.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWProperty.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWProperty.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWXmlProject.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWXmlProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWXmlProject.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/project/xml/MWXmlProject.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureInOutputArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureInOutputArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureInOutputArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractProcedureInOutputArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractReadQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractReadQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractReadQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWAbstractReadQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedure.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedure.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInOutputArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInOutputArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInOutputArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedInOutputArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedOutputArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedOutputArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedOutputArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureNamedOutputArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInOutputArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInOutputArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInOutputArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedInOutputArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedOutputArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedOutputArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedOutputArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWProcedureUnamedOutputArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryManager.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryManager.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryParameter.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryParameter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryParameter.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryParameter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryable.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryable.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWQueryable.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadAllQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadAllQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadAllQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadAllQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadObjectQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadObjectQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadObjectQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadObjectQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/MWReadQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractCustomQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractCustomQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractCustomQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractCustomQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractRelationalReadQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractRelationalReadQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractRelationalReadQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAbstractRelationalReadQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAttributeItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAttributeItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAttributeItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAttributeItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAutoGeneratedQueryFormat.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAutoGeneratedQueryFormat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAutoGeneratedQueryFormat.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWAutoGeneratedQueryFormat.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBasicExpression.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBasicExpression.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBasicExpression.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBasicExpression.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBatchReadItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBatchReadItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBatchReadItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWBatchReadItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCompoundExpression.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCompoundExpression.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCompoundExpression.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCompoundExpression.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadAllQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadAllQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadAllQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadAllQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadObjectQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadObjectQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadObjectQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWCustomReadObjectQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWDeleteQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWDeleteQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWDeleteQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWDeleteQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWEJBQLQueryFormat.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWEJBQLQueryFormat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWEJBQLQueryFormat.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWEJBQLQueryFormat.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpression.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpression.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpression.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpression.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpressionQueryFormat.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpressionQueryFormat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpressionQueryFormat.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWExpressionQueryFormat.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWGroupingItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWGroupingItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWGroupingItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWGroupingItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWInsertQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWInsertQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWInsertQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWInsertQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWJoinedItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWJoinedItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWJoinedItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWJoinedItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWLiteralArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWLiteralArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWLiteralArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWLiteralArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWNullArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWNullArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWNullArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWNullArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderableQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderableQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderableQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderableQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderingItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderingItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderingItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWOrderingItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryFormat.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryFormat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryFormat.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryFormat.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryParameterArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryParameterArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryParameterArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryParameterArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgument.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgument.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgument.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgument.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentElement.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentElement.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentElement.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentElement.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentParent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentParent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentParent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWQueryableArgumentParent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQueryManager.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQueryManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQueryManager.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalQueryManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadAllQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadAllQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadAllQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadAllQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadObjectQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadObjectQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadObjectQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadObjectQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalReadQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalSpecificQueryOptions.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalSpecificQueryOptions.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalSpecificQueryOptions.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWRelationalSpecificQueryOptions.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportAttributeItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportAttributeItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportAttributeItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportAttributeItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportOrderingItem.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportOrderingItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportOrderingItem.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportOrderingItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWReportQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWSQLQueryFormat.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWSQLQueryFormat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWSQLQueryFormat.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWSQLQueryFormat.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStoredProcedureQueryFormat.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStoredProcedureQueryFormat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStoredProcedureQueryFormat.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStoredProcedureQueryFormat.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStringQueryFormat.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStringQueryFormat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStringQueryFormat.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWStringQueryFormat.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWUpdateQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWUpdateQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWUpdateQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/MWUpdateQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Ordering.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Ordering.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Ordering.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Ordering.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Undoable.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Undoable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Undoable.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/relational/Undoable.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWAbstractEisReadQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWAbstractEisReadQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWAbstractEisReadQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWAbstractEisReadQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisInteraction.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisInteraction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisInteraction.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisInteraction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisQueryManager.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisQueryManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisQueryManager.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisQueryManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadAllQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadAllQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadAllQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadAllQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadObjectQuery.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadObjectQuery.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadObjectQuery.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWEisReadObjectQuery.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWOXQueryManager.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWOXQueryManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWOXQueryManager.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/query/xml/MWOXQueryManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ClasspathResourceSpecification.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ClasspathResourceSpecification.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ClasspathResourceSpecification.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ClasspathResourceSpecification.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/FileResourceSpecification.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/FileResourceSpecification.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/FileResourceSpecification.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/FileResourceSpecification.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceException.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceException.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceException.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceSpecification.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceSpecification.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceSpecification.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/ResourceSpecification.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/UrlResourceSpecification.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/UrlResourceSpecification.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/UrlResourceSpecification.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/resource/UrlResourceSpecification.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractNamedSchemaComponent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractNamedSchemaComponent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractNamedSchemaComponent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractNamedSchemaComponent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractParticle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractParticle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractParticle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractParticle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaComponent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaComponent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaComponent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaComponent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaModel.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaModel.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/AbstractSchemaModel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ComplexContent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ComplexContent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ComplexContent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ComplexContent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Content.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Content.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Content.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Content.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/EmptyContent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/EmptyContent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/EmptyContent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/EmptyContent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitAttributeDeclaration.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitAttributeDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitAttributeDeclaration.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitAttributeDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitComplexTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitComplexTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitComplexTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitComplexTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitElementDeclaration.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitElementDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitElementDeclaration.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitElementDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitModelGroup.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitModelGroup.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitModelGroup.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitModelGroup.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSchemaTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSchemaTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSchemaTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSchemaTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSimpleTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSimpleTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSimpleTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ExplicitSimpleTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraint.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraint.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraint.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraint.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraintDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraintDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraintDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/IdentityConstraintDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyIdentityConstraint.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyIdentityConstraint.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyIdentityConstraint.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyIdentityConstraint.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyRefIdentityConstraint.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyRefIdentityConstraint.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyRefIdentityConstraint.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/KeyRefIdentityConstraint.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWAttributeDeclaration.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWAttributeDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWAttributeDeclaration.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWAttributeDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWComplexTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWComplexTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWComplexTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWComplexTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWElementDeclaration.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWElementDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWElementDeclaration.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWElementDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroup.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroup.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroup.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroup.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroupDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroupDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroupDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWModelGroupDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamedSchemaComponent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamedSchemaComponent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamedSchemaComponent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamedSchemaComponent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamespace.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamespace.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamespace.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWNamespace.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWParticle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWParticle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWParticle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWParticle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaComponent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaComponent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaComponent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaComponent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaContextComponent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaContextComponent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaContextComponent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaContextComponent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaModel.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaModel.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaModel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSchemaTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSimpleTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSimpleTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSimpleTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWSimpleTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchema.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchema.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchema.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchema.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchemaRepository.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchemaRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchemaRepository.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXmlSchemaRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXpathableSchemaComponent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXpathableSchemaComponent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXpathableSchemaComponent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/MWXpathableSchemaComponent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ModelGroupDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ModelGroupDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ModelGroupDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ModelGroupDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/NullParticle.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/NullParticle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/NullParticle.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/NullParticle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ParticleTerm.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ParticleTerm.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ParticleTerm.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ParticleTerm.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedAttributeDeclaration.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedAttributeDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedAttributeDeclaration.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedAttributeDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedComplexTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedComplexTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedComplexTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedComplexTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedElementDeclaration.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedElementDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedElementDeclaration.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedElementDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedModelGroup.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedModelGroup.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedModelGroup.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedModelGroup.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSchemaTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSchemaTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSchemaTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSchemaTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSimpleTypeDefinition.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSimpleTypeDefinition.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSimpleTypeDefinition.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/ReferencedSimpleTypeDefinition.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SchemaComponentReference.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SchemaComponentReference.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SchemaComponentReference.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SchemaComponentReference.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SimpleContent.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SimpleContent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SimpleContent.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/SimpleContent.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/UniqueIdentityConstraint.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/UniqueIdentityConstraint.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/UniqueIdentityConstraint.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/UniqueIdentityConstraint.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Wildcard.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Wildcard.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Wildcard.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/Wildcard.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/XercesTools.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/XercesTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/XercesTools.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/schema/XercesTools.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/DefaultSPIManager.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/DefaultSPIManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/DefaultSPIManager.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/DefaultSPIManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SPIManager.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SPIManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SPIManager.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SPIManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SimpleSPIManager.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SimpleSPIManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SimpleSPIManager.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/SimpleSPIManager.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalColumn.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalColumn.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalColumn.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalColumn.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabase.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabase.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabase.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabaseFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabaseFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabaseFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalDatabaseFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKey.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKey.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKey.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKey.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKeyColumnPair.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKeyColumnPair.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKeyColumnPair.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalForeignKeyColumnPair.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTable.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTable.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTable.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTableDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTableDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTableDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/ExternalTableDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/TableDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/TableDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/TableDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/TableDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalColumn.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalColumn.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalColumn.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalColumn.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabase.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabase.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabase.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabaseFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabaseFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabaseFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalDatabaseFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKey.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKey.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKey.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKey.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKeyColumnPair.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKeyColumnPair.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKeyColumnPair.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalForeignKeyColumnPair.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTable.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTable.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTable.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTableDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTableDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTableDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/db/jdbc/JDBCExternalTableDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ClassDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ClassDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ClassDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ClassDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClass.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClass.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClass.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassNotFoundException.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassNotFoundException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassNotFoundException.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassNotFoundException.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepository.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepository.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepositoryFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepositoryFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepositoryFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalClassRepositoryFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalConstructor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalConstructor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalConstructor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalConstructor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalField.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalField.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalField.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalField.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMember.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMember.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMember.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMember.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMethod.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMethod.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMethod.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/ExternalMethod.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClass.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClass.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClass.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClassDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClassDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClassDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/PrimitiveExternalClassDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClass.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClass.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClass.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepository.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepository.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalConstructor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalConstructor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalConstructor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalConstructor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalField.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalField.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalField.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalField.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMember.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMember.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMember.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMember.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMethod.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMethod.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMethod.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classfile/CFExternalMethod.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/AbstractCLExternalClassRepository.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/AbstractCLExternalClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/AbstractCLExternalClassRepository.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/AbstractCLExternalClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClass.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClass.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClass.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassDescription.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassDescription.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassDescription.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryFactory.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryFactory.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalConstructor.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalConstructor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalConstructor.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalConstructor.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalField.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalField.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalField.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalField.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMember.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMember.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMember.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMember.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMethod.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMethod.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMethod.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/CLExternalMethod.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/SystemCLExternalClassRepository.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/SystemCLExternalClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/SystemCLExternalClassRepository.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/SystemCLExternalClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/URLCLExternalClassRepository.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/URLCLExternalClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/URLCLExternalClassRepository.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/spi/meta/classloader/URLCLExternalClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlField.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlField.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlField.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlField.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlNode.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlNode.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXmlNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathContext.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathContext.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathContext.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathContext.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathSpec.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathSpec.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathSpec.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathSpec.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathStep.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathStep.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathStep.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/MWXpathStep.java
diff --git a/utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/SchemaChange.java b/utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/SchemaChange.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsmodel/source/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/SchemaChange.java
rename to utils/eclipselink.utils.workbench/mappingsmodel/src/main/java/org/eclipse/persistence/tools/workbench/mappingsmodel/xml/SchemaChange.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/build.properties b/utils/eclipselink.utils.workbench/mappingsplugin/build.properties
deleted file mode 100644
index 4e5fc8f..0000000
--- a/utils/eclipselink.utils.workbench/mappingsplugin/build.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Mappings Plug-in
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-mappingsplugin.jarfile=mappingsplugin.jar
-mappingsplugin.jarfile.src=mappingsplugin_src.jar
-
-# Defines for build directories.
-compile.mappingsplugin.resources=${_rootResourceDir}
-compile.mappingsplugin.srcdir=${_rootSourceDir}
-compile.mappingsplugin.destdir=${_classesDestDir}
-compile.mappingsplugin.classpath= \
- ${_jarDestDir}/platformsplugin.jar; \
- ${_jarDestDir}/framework.jar; \
- ${_jarDestDir}/uitools.jar; \
- ${_jarDestDir}/cmpmigrator.jar; \
- ${_jarDestDir}/mappingsio.jar; \
- ${_jarDestDir}/mappingsmodel.jar; \
- ${_jarDestDir}/platformsmodel.jar; \
- ${_jarDestDir}/utility.jar; \
- ${_eclipselinkJar}
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/build.xml b/utils/eclipselink.utils.workbench/mappingsplugin/build.xml
deleted file mode 100644
index 5a5b145..0000000
--- a/utils/eclipselink.utils.workbench/mappingsplugin/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Mappings Plug-in" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-mappingsplugin, jar-mappingsplugin"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-mappingsplugin" depends="properties-init">
- <mkdir dir="${compile.mappingsplugin.destdir}"/>
- <javac
- classpath="${compile.mappingsplugin.classpath}"
- srcdir="${compile.mappingsplugin.srcdir}"
- destdir="${compile.mappingsplugin.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-mappingsplugin" depends="jar-mappingsplugin-lib, jar-mappingsplugin-src"/>
-
- <target name="jar-mappingsplugin-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${mappingsplugin.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.mappingsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.mappingsplugin.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-mappingsplugin-src" depends="properties-init">
- <delete file="${_jarDestDir}/${mappingsplugin.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${mappingsplugin.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.mappingsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.mappingsplugin.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/pom.xml b/utils/eclipselink.utils.workbench/mappingsplugin/pom.xml
new file mode 100644
index 0000000..f2d7764
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/mappingsplugin/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsplugin</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Mappings Plug-in</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsplugin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsio</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.config</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.nosql</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-config</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/config</outputDirectory>
+ <includeArtifactIds>workbench.config</includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.eclipse.persistence:workbench.config</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}/config</additionalClasspathElement>
+ </additionalClasspathElements>
+ <includes>
+ <include>org.eclipse.persistence.tools.workbench.test.mappingsmodel.AllMappingsModelTests</include>
+ <include>org.eclipse.persistence.tools.workbench.test.mappingsplugin.AllMappingsPluginTests</include>
+ <include>org.eclipse.persistence.tools.workbench.test.mappingsio.AllMappingsIOTests</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/AntExtensionBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/AntExtensionBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/AntExtensionBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/AntExtensionBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectExplorerInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectExplorerInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectExplorerInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectExplorerInterface.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectExporter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectExporter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectExporter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectExporter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectRunner.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectRunner.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectRunner.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectRunner.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectValidator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectValidator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectValidator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectValidator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectValidatorInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectValidatorInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/ProjectValidatorInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/ProjectValidatorInterface.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/SessionValidator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/SessionValidator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/SessionValidator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/SessionValidator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/SessionValidatorInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/SessionValidatorInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/SessionValidatorInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/SessionValidatorInterface.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/ExportDeploymentXMLTask.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/ExportDeploymentXMLTask.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/ExportDeploymentXMLTask.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/ExportDeploymentXMLTask.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsTask.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsTask.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsTask.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsTask.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsValidateTask.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsValidateTask.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsValidateTask.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/MappingsValidateTask.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/ProjectTask.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/ProjectTask.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/ProjectTask.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/ProjectTask.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/SessionValidateTask.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/SessionValidateTask.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/SessionValidateTask.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/SessionValidateTask.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/TopLinkTask.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/TopLinkTask.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/taskdefs/TopLinkTask.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/taskdefs/TopLinkTask.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreError.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreError.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreError.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreError.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreErrorSet.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreErrorSet.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreErrorSet.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/IgnoreErrorSet.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/LoginSpec.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/LoginSpec.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/LoginSpec.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/LoginSpec.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/MappingsType.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/MappingsType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/ant/typedefs/MappingsType.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/ant/typedefs/MappingsType.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/DeploymentXMLGenerator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/DeploymentXMLGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/DeploymentXMLGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/DeploymentXMLGenerator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/Generator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/Generator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/Generator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/Generator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/JavaSourceGenerator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/JavaSourceGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/JavaSourceGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/JavaSourceGenerator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/MappingsBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/MappingsBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/MappingsBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/MappingsBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/ProblemReportGenerator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/ProblemReportGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappings/ProblemReportGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappings/ProblemReportGenerator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/AddOrRefreshClassesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/AddOrRefreshClassesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/AddOrRefreshClassesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/AddOrRefreshClassesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomapAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomapAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomapAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomapAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomappableNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomappableNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomappableNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/AutomappableNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/CreateNewClassAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/CreateNewClassAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/CreateNewClassAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/CreateNewClassAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAndInitializeRuntimeDescriptorsAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAndInitializeRuntimeDescriptorsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAndInitializeRuntimeDescriptorsAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportDeploymentXmlAndInitializeRuntimeDescriptorsAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportJavaSourceAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportJavaSourceAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportJavaSourceAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportJavaSourceAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportModelJavaSourceAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportModelJavaSourceAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportModelJavaSourceAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportModelJavaSourceAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportSpecificDescriptorModelJavaSourceAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportSpecificDescriptorModelJavaSourceAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportSpecificDescriptorModelJavaSourceAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ExportSpecificDescriptorModelJavaSourceAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/JaxbProjectCreationDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/JaxbProjectCreationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/JaxbProjectCreationDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/JaxbProjectCreationDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/LegacyProjectMigrationDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/LegacyProjectMigrationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/LegacyProjectMigrationDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/LegacyProjectMigrationDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ManageNonDescriptorClassesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ManageNonDescriptorClassesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ManageNonDescriptorClassesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ManageNonDescriptorClassesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPlugin.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPlugin.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPlugin.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPlugin.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginIconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginIconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginIconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginIconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginResourceBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginResourceBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/MappingsPluginResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/NewClassNameDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/NewClassNameDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/NewClassNameDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/NewClassNameDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/NewProjectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/NewProjectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/NewProjectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/NewProjectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/NonDescriptorClassManagementDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/NonDescriptorClassManagementDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/NonDescriptorClassManagementDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/NonDescriptorClassManagementDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/OracleHelpAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/OracleHelpAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/OracleHelpAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/OracleHelpAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProblemsBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProblemsBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProblemsBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProblemsBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectCreationDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectCreationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectCreationDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectCreationDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectDeploymentXmlGenerationCoordinator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectDeploymentXmlGenerationCoordinator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectDeploymentXmlGenerationCoordinator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectDeploymentXmlGenerationCoordinator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectSourceGenerationCoordinator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectSourceGenerationCoordinator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectSourceGenerationCoordinator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ProjectSourceGenerationCoordinator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/RefreshClassesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/RefreshClassesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/RefreshClassesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/RefreshClassesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/RemovableNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/RemovableNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/RemovableNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/RemovableNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/RemoveAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/RemoveAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/RemoveAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/RemoveAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/AbstractClassCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/AbstractClassCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/AbstractClassCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/AbstractClassCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicClassCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicClassCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicClassCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicClassCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicDescriptorClassCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicDescriptorClassCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicDescriptorClassCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/BasicDescriptorClassCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/DescriptorClassCodeGenPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/DescriptorClassCodeGenPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/DescriptorClassCodeGenPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/DescriptorClassCodeGenPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/ModelSourceGenerationCoordinator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/ModelSourceGenerationCoordinator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/ModelSourceGenerationCoordinator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/ModelSourceGenerationCoordinator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/SourceCodeGenerator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/SourceCodeGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/SourceCodeGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/sourcegen/SourceCodeGenerator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/MappingsApplicationNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/MappingsApplicationNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/MappingsApplicationNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/MappingsApplicationNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/StatusDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/StatusDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/StatusDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/StatusDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/UiCommonBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/UiCommonBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/UiCommonBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/UiCommonBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassAttributeCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassAttributeCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassAttributeCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassAttributeCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ClassCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ColumnCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ColumnCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ColumnCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ColumnCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/DescriptorCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/DescriptorCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/DescriptorCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/DescriptorCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MappingCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MappingCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MappingCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MappingCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MethodCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MethodCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MethodCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/MethodCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ProjectCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ProjectCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ProjectCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ProjectCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/QueryKeyCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/QueryKeyCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/QueryKeyCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/QueryKeyCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ReferenceCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ReferenceCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ReferenceCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/ReferenceCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TableCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TableCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TableCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TableCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TypeDeclarationCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TypeDeclarationCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TypeDeclarationCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/common/cell/TypeDeclarationCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractCreateTablesOnDatabaseAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractCreateTablesOnDatabaseAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractCreateTablesOnDatabaseAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractCreateTablesOnDatabaseAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractGenerateCreationScriptForTablesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractGenerateCreationScriptForTablesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractGenerateCreationScriptForTablesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractGenerateCreationScriptForTablesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractTableGenerationAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractTableGenerationAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractTableGenerationAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AbstractTableGenerationAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddNewTableAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddNewTableAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddNewTableAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddNewTableAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddOrRefreshTablesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddOrRefreshTablesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddOrRefreshTablesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/AddOrRefreshTablesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnPairsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnPairsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnPairsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnPairsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ColumnsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateAllTablesOnDatabaseAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateAllTablesOnDatabaseAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateAllTablesOnDatabaseAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateAllTablesOnDatabaseAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateSelectedTablesOnDatabaseAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateSelectedTablesOnDatabaseAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateSelectedTablesOnDatabaseAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/CreateSelectedTablesOnDatabaseAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabaseNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabaseNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabaseNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabaseNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePlatformChooserDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePlatformChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePlatformChooserDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePlatformChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DatabasePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationCoordinator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationCoordinator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationCoordinator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationCoordinator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/DescriptorGenerationDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForAllTablesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForAllTablesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForAllTablesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForAllTablesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForSelectedTablesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForSelectedTablesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForSelectedTablesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateCreationScriptForSelectedTablesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromAllTablesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromAllTablesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromAllTablesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromAllTablesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromSelectedTablesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromSelectedTablesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromSelectedTablesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/GenerateDescriptorsFromSelectedTablesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogInAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogInAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogInAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogInAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogOutAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogOutAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogOutAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LogOutAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LoginSpecPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LoginSpecPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LoginSpecPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/LoginSpecPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/NewTableReferenceDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/NewTableReferenceDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/NewTableReferenceDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/NewTableReferenceDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ReferencesPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ReferencesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ReferencesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/ReferencesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RefreshTableAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RefreshTableAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RefreshTableAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RefreshTableAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RelationshipGenerationDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RelationshipGenerationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RelationshipGenerationDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RelationshipGenerationDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RenameTableAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RenameTableAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RenameTableAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/RenameTableAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableImporterDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableImporterDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableImporterDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableImporterDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNameDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNameDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNameDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNameDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/TableTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/UiDbBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/UiDbBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/UiDbBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/db/UiDbBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractLockingPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractLockingPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractLockingPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractLockingPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractMapInheritedAttributesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractMapInheritedAttributesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractMapInheritedAttributesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AbstractMapInheritedAttributesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ActivateDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ActivateDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ActivateDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ActivateDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyChooser.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyChooser.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AdvancedPolicyChooser.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AfterLoadingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AfterLoadingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AfterLoadingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/AfterLoadingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CacheExpiryPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CacheExpiryPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CacheExpiryPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CacheExpiryPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CachingPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CachingPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CachingPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CachingPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ChangeDescriptorTypeAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ChangeDescriptorTypeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ChangeDescriptorTypeAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ChangeDescriptorTypeAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeAccessorsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeAccessorsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeAccessorsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeAccessorsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeModifiersPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeModifiersPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeModifiersPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeModifiersPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeTypesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeTypesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeTypesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributeTypesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributesPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassAttributesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassExtractionMethodPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassExtractionMethodPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassExtractionMethodPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassExtractionMethodPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorDictionarySubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorDictionarySubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorDictionarySubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorDictionarySubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorPolicySubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorPolicySubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorPolicySubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassIndicatorPolicySubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassModifiersPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassModifiersPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassModifiersPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassModifiersPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ClassPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CopyPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CopyPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CopyPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/CopyPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorClassInfoTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorClassInfoTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorClassInfoTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorClassInfoTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorCreationFailuresDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorCreationFailuresDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorCreationFailuresDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorCreationFailuresDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackageNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackageNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackageNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackageNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackagePropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackagePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackagePropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/DescriptorPackagePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/EventsPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/EventsPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/EventsPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/EventsPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ExtractionMethodListener.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ExtractionMethodListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ExtractionMethodListener.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ExtractionMethodListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/HierarchyClassSelector.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/HierarchyClassSelector.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/HierarchyClassSelector.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/HierarchyClassSelector.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorDictionaryListener.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorDictionaryListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorDictionaryListener.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorDictionaryListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorFieldListener.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorFieldListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorFieldListener.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/IndicatorFieldListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InheritancePolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InheritancePolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InheritancePolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InheritancePolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InstantiationPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InstantiationPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InstantiationPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InstantiationPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InterfaceAliasPolicyPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InterfaceAliasPolicyPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InterfaceAliasPolicyPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/InterfaceAliasPolicyPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToRootMinusOneAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToRootMinusOneAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToRootMinusOneAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToRootMinusOneAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSelectedClassAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSelectedClassAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSelectedClassAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSelectedClassAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSuperclassAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSuperclassAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSuperclassAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MapInheritedAttributesToSuperclassAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MappingDescriptorTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodModifiersPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodModifiersPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodModifiersPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodModifiersPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodParametersPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodParametersPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodParametersPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodParametersPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodPropertiesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodPropertiesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodPropertiesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodPropertiesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MethodsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ModifierComponentGroup.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ModifierComponentGroup.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ModifierComponentGroup.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ModifierComponentGroup.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MoveDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MoveDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MoveDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/MoveDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/PackageNameDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/PackageNameDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/PackageNameDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/PackageNameDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RefreshCachePolicyPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RefreshCachePolicyPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RefreshCachePolicyPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RefreshCachePolicyPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RemoveInheritedAttributesAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RemoveInheritedAttributesAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RemoveInheritedAttributesAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RemoveInheritedAttributesAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenameDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenameDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenameDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenameDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenamePackageAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenamePackageAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenamePackageAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RenamePackageAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningInsertFieldsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningInsertFieldsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningInsertFieldsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningInsertFieldsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningUpdateFieldsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningUpdateFieldsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningUpdateFieldsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/ReturningUpdateFieldsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RootListener.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RootListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RootListener.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/RootListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/TransactionalDescriptorComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/TransactionalDescriptorComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/TransactionalDescriptorComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/TransactionalDescriptorComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UiDescriptorBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UiDescriptorBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UiDescriptorBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UiDescriptorBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapAllDescriptorsInPackageAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapAllDescriptorsInPackageAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapAllDescriptorsInPackageAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapAllDescriptorsInPackageAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmapDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmappablePackageNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmappablePackageNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmappablePackageNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/UnmappablePackageNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionLockingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionLockingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionLockingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionLockingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionTimestampLockingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionTimestampLockingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionTimestampLockingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/VersionTimestampLockingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AbstractGenerateTablesFromDescriptorsAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AbstractGenerateTablesFromDescriptorsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AbstractGenerateTablesFromDescriptorsAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AbstractGenerateTablesFromDescriptorsAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/AggregateDescriptorTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/ColumnsLockingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/ColumnsLockingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/ColumnsLockingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/ColumnsLockingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromAllDescriptorsAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromAllDescriptorsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromAllDescriptorsAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromAllDescriptorsAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromSelectedDescriptorsAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromSelectedDescriptorsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromSelectedDescriptorsAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/GenerateTablesFromSelectedDescriptorsAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/InterfaceDescriptorPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/MultiTableInfoPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/MultiTableInfoPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/MultiTableInfoPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/MultiTableInfoPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorDictionarySubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorDictionarySubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorDictionarySubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorDictionarySubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorPolicySubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorPolicySubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorPolicySubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalClassIndicatorPolicySubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorPackageNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorPackageNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorPackageNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalDescriptorPackageNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalInheritancePolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalInheritancePolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalInheritancePolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalInheritancePolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalLockingColumnsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalLockingColumnsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalLockingColumnsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalLockingColumnsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningInsertFieldsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningInsertFieldsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningInsertFieldsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningInsertFieldsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningUpdateFieldsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningUpdateFieldsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningUpdateFieldsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/RelationalReturningUpdateFieldsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorInfoPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorInfoPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorInfoPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorInfoPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorPrimaryKeysPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorPrimaryKeysPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorPrimaryKeysPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorPrimaryKeysPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorQueryManagerPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorQueryManagerPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorQueryManagerPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorQueryManagerPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorSequencingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorSequencingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorSequencingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorSequencingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableDescriptorTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableGenerator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableGenerator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableLockingPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableLockingPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableLockingPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableLockingPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableVersionLockingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableVersionLockingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableVersionLockingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/TableVersionLockingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/UiDescriptorRelationalBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/UiDescriptorRelationalBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/UiDescriptorRelationalBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/relational/UiDescriptorRelationalBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorInfoPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorInfoPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorInfoPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorInfoPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisCompositeDescriptorTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorQueryManagerPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorQueryManagerPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorQueryManagerPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisDescriptorQueryManagerPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisInheritancePolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisInheritancePolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisInheritancePolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisInheritancePolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisLockingPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisLockingPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisLockingPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisLockingPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisPrimaryKeysPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisPrimaryKeysPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisPrimaryKeysPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisPrimaryKeysPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningInsertFieldsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningInsertFieldsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningInsertFieldsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningInsertFieldsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningUpdateFieldsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningUpdateFieldsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningUpdateFieldsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisReturningUpdateFieldsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorInfoPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorInfoPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorInfoPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorInfoPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisRootDescriptorTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisVersionLockingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisVersionLockingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisVersionLockingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/EisVersionLockingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorInfoPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorInfoPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorInfoPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorInfoPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXDescriptorTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXInheritancePolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXInheritancePolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXInheritancePolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/OXInheritancePolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/SpecifyFieldListener.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/SpecifyFieldListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/SpecifyFieldListener.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/SpecifyFieldListener.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/UiDescriptorXmlBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/UiDescriptorXmlBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/UiDescriptorXmlBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/UiDescriptorXmlBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorDictionarySubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorDictionarySubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorDictionarySubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorDictionarySubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorPolicySubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorPolicySubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorPolicySubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlClassIndicatorPolicySubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorPackageNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorPackageNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorPackageNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlDescriptorPackageNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlInheritancePolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlInheritancePolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlInheritancePolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/descriptor/xml/XmlInheritancePolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/AttributeTransformerPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/AttributeTransformerPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/AttributeTransformerPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/AttributeTransformerPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ChangeMappingTypeAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ChangeMappingTypeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ChangeMappingTypeAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ChangeMappingTypeAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/CollectionContainerPolicyPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/CollectionContainerPolicyPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/CollectionContainerPolicyPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/CollectionContainerPolicyPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ContainerPolicyPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ContainerPolicyPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ContainerPolicyPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ContainerPolicyPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ConverterPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMapContainerPolicyPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMapContainerPolicyPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMapContainerPolicyPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMapContainerPolicyPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/DirectMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationEditingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/FieldTransformerAssociationsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/IndirectableContainerMappingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/IndirectableContainerMappingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/IndirectableContainerMappingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/IndirectableContainerMappingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectCollectionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectCollectionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectCollectionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsDirectCollectionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsTransformationAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsTransformationAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsTransformationAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsTransformationAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsUnmappedAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsUnmappedAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsUnmappedAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MapAsUnmappedAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingSelectionActionsPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingSelectionActionsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingSelectionActionsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MappingSelectionActionsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MethodAccessingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MethodAccessingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MethodAccessingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/MethodAccessingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/NullValuePolicyPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/NullValuePolicyPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/NullValuePolicyPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/NullValuePolicyPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ObjectTypeConverterPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ObjectTypeConverterPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ObjectTypeConverterPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ObjectTypeConverterPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ProxyIndirectionPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ProxyIndirectionPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ProxyIndirectionPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/ProxyIndirectionPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TransformerEditingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TypeConversionConverterPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TypeConversionConverterPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TypeConversionConverterPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/TypeConversionConverterPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UiMappingBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UiMappingBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UiMappingBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UiMappingBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/UnmappedMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AbstractTableReferencePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AbstractTableReferencePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AbstractTableReferencePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AbstractTableReferencePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingColumnsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingColumnsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingColumnsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingColumnsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/AggregateMappingTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/CollectionOrderingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/CollectionOrderingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/CollectionOrderingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/CollectionOrderingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToFieldMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypeMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypeMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypeMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypeMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypePropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypePropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/DirectToXmlTypePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MaintainsBidirectionalRelationshipPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MaintainsBidirectionalRelationshipPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MaintainsBidirectionalRelationshipPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MaintainsBidirectionalRelationshipPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyMappingTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManySourceReferencePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManySourceReferencePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManySourceReferencePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManySourceReferencePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTableReferencePropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTableReferencePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTableReferencePropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTableReferencePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTargetReferencePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTargetReferencePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTargetReferencePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/ManyToManyTargetReferencePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsAggregateAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsAggregateAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsAggregateAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsAggregateAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectMapAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectMapAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectMapAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectMapAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectToXmlTypeAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectToXmlTypeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectToXmlTypeAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsDirectToXmlTypeAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsManyToManyAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsManyToManyAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsManyToManyAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsManyToManyAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsObjectTypeAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsObjectTypeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsObjectTypeAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsObjectTypeAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToManyAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToManyAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToManyAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToManyAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToOneAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToOneAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToOneAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsOneToOneAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectCollectionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectCollectionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectCollectionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectCollectionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectMapping.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectMapping.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectMapping.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectToFieldAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectToFieldAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectToFieldAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsRelationalDirectToFieldAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsSerializedObjectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsSerializedObjectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsSerializedObjectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsSerializedObjectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsTypeConversionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsTypeConversionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsTypeConversionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsTypeConversionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsVariableOneToOneAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsVariableOneToOneAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsVariableOneToOneAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/MapAsVariableOneToOneAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyMappingTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToManyTableReferencePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneMappingTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OneToOneTableReferencePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OrderingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OrderingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OrderingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/OrderingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectCollectionMappingTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectContainerMappingTableReferencePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapConverterPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapConverterPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapConverterPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapConverterPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalDirectMapMappingTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationEditingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalFieldTransformerAssociationsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingSelectionActionsPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingSelectionActionsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingSelectionActionsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalMappingSelectionActionsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/RelationalTransformationMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/UiMappingRelationalBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/UiMappingRelationalBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/UiMappingRelationalBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/UiMappingRelationalBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneClassIndicatorsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneClassIndicatorsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneClassIndicatorsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneClassIndicatorsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneMappingTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneQueryKeyAssociationsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneQueryKeyAssociationsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneQueryKeyAssociationsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/relational/VariableOneToOneQueryKeyAssociationsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractAggregatableXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractAggregatableXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractAggregatableXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractAggregatableXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractTypableXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractTypableXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractTypableXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractTypableXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AbstractXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AccessorEditingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AccessorEditingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AccessorEditingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AccessorEditingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AggregatableXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AggregatableXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AggregatableXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AggregatableXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyAttributeMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyCollectionMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/AnyObjectMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/BasicXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/BasicXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/BasicXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/BasicXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeCollectionMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeCollectionMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeCollectionMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeCollectionMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/CompositeObjectMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorCellRendererAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorEditingDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorEditingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorEditingDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorEditingDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ContainerAccessorPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectCollectionMappingXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectCollectionMappingXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectCollectionMappingXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectCollectionMappingXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectMappingXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectMappingXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectMappingXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/DirectMappingXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeCollectionMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeCollectionMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeCollectionMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeCollectionMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeObjectMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeObjectMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeObjectMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisCompositeObjectMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectCollectionMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisDirectMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisMappingSelectionActionsPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisMappingSelectionActionsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisMappingSelectionActionsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisMappingSelectionActionsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyDeleteAllInteractionPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyDeleteAllInteractionPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyDeleteAllInteractionPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyDeleteAllInteractionPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManySelectionInteractionPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManySelectionInteractionPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManySelectionInteractionPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManySelectionInteractionPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToManyTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneSelectionInteractionPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneSelectionInteractionPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneSelectionInteractionPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneSelectionInteractionPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisOneToOneTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairEditingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisReferenceMappingFieldPairsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisTransformationMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisTransformationMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisTransformationMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/EisTransformationMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ElementTypeableXmlFieldPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ElementTypeableXmlFieldPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ElementTypeableXmlFieldPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/ElementTypeableXmlFieldPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MaintainsBidirectionalRelationshipPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MaintainsBidirectionalRelationshipPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MaintainsBidirectionalRelationshipPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MaintainsBidirectionalRelationshipPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyAttributeAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyAttributeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyAttributeAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyAttributeAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyCollectionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyCollectionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyCollectionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyCollectionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyObjectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyObjectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyObjectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsAnyObjectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeCollectionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeCollectionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeCollectionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeCollectionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeObjectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeObjectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeObjectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsCompositeObjectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectCollectionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectCollectionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectCollectionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisDirectCollectionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToManyAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToManyAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToManyAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToManyAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToOneAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToOneAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToOneAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsEisOneToOneAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectCollectionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectCollectionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectCollectionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsOxDirectCollectionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlCollectionReferenceAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlCollectionReferenceAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlCollectionReferenceAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlCollectionReferenceAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentCollectionAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentCollectionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentCollectionAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlFragmentCollectionAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlObjectReferenceAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlObjectReferenceAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlObjectReferenceAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/MapAsXmlObjectReferenceAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeCollectionMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeCollectionMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeCollectionMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeCollectionMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeObjectMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeObjectMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeObjectMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXCompositeObjectMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXMappingSelectionActionsPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXMappingSelectionActionsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXMappingSelectionActionsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXMappingSelectionActionsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXTransformationMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXTransformationMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXTransformationMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OXTransformationMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectCollectionMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/OxDirectMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UiMappingXmlBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UiMappingXmlBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UiMappingXmlBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UiMappingXmlBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UseContainerAccessorPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UseContainerAccessorPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UseContainerAccessorPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/UseContainerAccessorPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlCollectionReferenceMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationEditingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFieldTransformerAssociationsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentCollectionMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlFragmentMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingSelectionActionsPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingSelectionActionsPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingSelectionActionsPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlMappingSelectionActionsPolicy.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlObjectReferenceMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairEditingDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairEditingDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairEditingDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairEditingDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlReferenceMappingFieldPairsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/mapping/xml/XmlTransformationMappingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassChooserTools.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassChooserTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassChooserTools.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassChooserTools.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassDescriptionClassDescriptionAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassDescriptionClassDescriptionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassDescriptionClassDescriptionAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassDescriptionClassDescriptionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassRepositoryHolder.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassRepositoryHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassRepositoryHolder.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ClassRepositoryHolder.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepository.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepository.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepositoryFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepositoryFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepositoryFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/CombinedClassDescriptionRepositoryFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDesciptionAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDesciptionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDesciptionAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDesciptionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDescriptionRepository.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDescriptionRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDescriptionRepository.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassDescriptionClassDescriptionRepository.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/UiMetaBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/UiMetaBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/UiMetaBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/meta/UiMetaBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/ClassPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/DatabasePreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/preferences/MappingsPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/AbstractProjectGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/AbstractProjectGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/AbstractProjectGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/AbstractProjectGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/DeleteProjectAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/DeleteProjectAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/DeleteProjectAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/DeleteProjectAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/FieldAccessingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/FieldAccessingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/FieldAccessingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/FieldAccessingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCacheExpiryPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCacheExpiryPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCacheExpiryPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCacheExpiryPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCachingPolicyPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCachingPolicyPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCachingPolicyPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectCachingPolicyPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectDefaultsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectDefaultsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectDefaultsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectDefaultsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectOptionsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectOptionsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectOptionsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectOptionsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ProjectTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ReadOnlyFileDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ReadOnlyFileDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ReadOnlyFileDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ReadOnlyFileDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/TransactionalProjectDefaultsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/TransactionalProjectDefaultsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/TransactionalProjectDefaultsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/TransactionalProjectDefaultsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/UiProjectBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/UiProjectBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/UiProjectBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/UiProjectBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ZeroArgConstructorPreference.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ZeroArgConstructorPreference.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ZeroArgConstructorPreference.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/ZeroArgConstructorPreference.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/ExportTableCreatorJavaSourceAction.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/ExportTableCreatorJavaSourceAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/ExportTableCreatorJavaSourceAction.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/ExportTableCreatorJavaSourceAction.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectDefaultsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectDefaultsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectDefaultsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectDefaultsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectOptionsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectOptionsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectOptionsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectOptionsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectSequencingPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectSequencingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectSequencingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectSequencingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/RelationalProjectTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/TableCreatorSourceGenerationCoordinator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/TableCreatorSourceGenerationCoordinator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/TableCreatorSourceGenerationCoordinator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/relational/TableCreatorSourceGenerationCoordinator.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/EisProjectTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/OXProjectTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectOptionsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectOptionsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectOptionsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/XmlProjectOptionsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/AbstractLoginPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisConnectionPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisConnectionPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisConnectionPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisConnectionPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPropertiesPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPropertiesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPropertiesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginPropertiesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/EisLoginTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/PropertyPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/PropertyPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/PropertyPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/project/xml/login/PropertyPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AbstractQuickViewSection.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AbstractQuickViewSection.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AbstractQuickViewSection.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AbstractQuickViewSection.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddEjbQueryDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddEjbQueryDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddEjbQueryDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddEjbQueryDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddQueryDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddQueryDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddQueryDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/AddQueryDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/ParametersQuickViewSection.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/ParametersQuickViewSection.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/ParametersQuickViewSection.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/ParametersQuickViewSection.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueriesPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueriesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueriesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueriesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryAdvancedOptionsDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryAdvancedOptionsDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryAdvancedOptionsDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryAdvancedOptionsDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryGeneralPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryGeneralPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryGeneralPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryGeneralPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParameterDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParameterDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParameterDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParameterDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParametersPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParametersPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParametersPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryParametersPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryQuickViewItem.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryQuickViewItem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryQuickViewItem.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QueryQuickViewItem.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QuickViewPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QuickViewPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QuickViewPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/QuickViewPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/UiQueryBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/UiQueryBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/UiQueryBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/UiQueryBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AbstractAttributeItemsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AbstractAttributeItemsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AbstractAttributeItemsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AbstractAttributeItemsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AddArgumentDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AddArgumentDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AddArgumentDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AddArgumentDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ArgumentPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ArgumentPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ArgumentPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ArgumentPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AttributeItemDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AttributeItemDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AttributeItemDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/AttributeItemDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionTreeNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionTreeNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionTreeNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BasicExpressionTreeNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BatchReadAttributesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BatchReadAttributesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BatchReadAttributesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/BatchReadAttributesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CompoundExpressionTreeNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CompoundExpressionTreeNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CompoundExpressionTreeNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CompoundExpressionTreeNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInArgumentPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInArgumentPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInArgumentPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInArgumentPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInOutArgumentPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInOutArgumentPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInOutArgumentPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomParameterInOutArgumentPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomQuerySelectionCriteriaPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomQuerySelectionCriteriaPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomQuerySelectionCriteriaPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomQuerySelectionCriteriaPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedurePropertiesPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedurePropertiesPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedurePropertiesPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedurePropertiesPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedureQueryFormatSubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedureQueryFormatSubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedureQueryFormatSubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/CustomStoredProcedureQueryFormatSubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionBuilderDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionBuilderDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionBuilderDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionBuilderDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionQueryFormatSubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionQueryFormatSubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionQueryFormatSubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionQueryFormatSubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTree.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTree.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTree.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTree.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreeNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreeNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreeNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreeNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ExpressionTreePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/FirstArgumentPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/FirstArgumentPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/FirstArgumentPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/FirstArgumentPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/GroupingAttributesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/GroupingAttributesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/GroupingAttributesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/GroupingAttributesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/JoinedAttributesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/JoinedAttributesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/JoinedAttributesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/JoinedAttributesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/LiteralArgumentPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/LiteralArgumentPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/LiteralArgumentPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/LiteralArgumentPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributeDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributeDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributeDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributeDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/OrderingAttributesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterArgumentPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterArgumentPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterArgumentPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterArgumentPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInArgumentPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInArgumentPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInArgumentPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInArgumentPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInOutArgumentPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInOutArgumentPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInOutArgumentPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterInOutArgumentPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterOutArgumentPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterOutArgumentPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterOutArgumentPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ParameterOutArgumentPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryFormatSubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryFormatSubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryFormatSubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryFormatSubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QuerySelectionCriteriaPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QuerySelectionCriteriaPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QuerySelectionCriteriaPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QuerySelectionCriteriaPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableArgumentPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableArgumentPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableArgumentPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableArgumentPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableEditDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableEditDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableEditDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableEditDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTree.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTree.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTree.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTree.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeModel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeModel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeModel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/QueryableTreeNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReadAllQueryOptimizationPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReadAllQueryOptimizationPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReadAllQueryOptimizationPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReadAllQueryOptimizationPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalCustomSqlPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalCustomSqlPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalCustomSqlPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalCustomSqlPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueriesSettingsPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueriesSettingsPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueriesSettingsPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueriesSettingsPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueryKeysPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueryKeysPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueryKeysPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalDescriptorQueryKeysPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueriesPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueriesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueriesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueriesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryAdvancedOptionsDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryAdvancedOptionsDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryAdvancedOptionsDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryAdvancedOptionsDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryComponentFactory.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryComponentFactory.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryOptionsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryOptionsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryOptionsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalQueryOptionsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadAllQueryPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadAllQueryPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadAllQueryPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadAllQueryPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadObjectQueryPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadObjectQueryPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadObjectQueryPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/RelationalReadObjectQueryPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAdvancedOptionsDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAdvancedOptionsDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAdvancedOptionsDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAdvancedOptionsDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributeDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributeDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributeDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributeDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryAttributesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryGroupingOrderingPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryGroupingOrderingPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryGroupingOrderingPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryGroupingOrderingPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOptionsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOptionsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOptionsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOptionsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOrderingAttributeDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOrderingAttributeDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOrderingAttributeDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryOrderingAttributeDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ReportQueryPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/SecondArgumentPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/SecondArgumentPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/SecondArgumentPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/SecondArgumentPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedurePropertiesPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedurePropertiesPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedurePropertiesPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedurePropertiesPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedureQueryFormatSubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedureQueryFormatSubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedureQueryFormatSubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StoredProcedureQueryFormatSubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StringQueryFormatSubPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StringQueryFormatSubPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StringQueryFormatSubPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/StringQueryFormatSubPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInArgumentPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInArgumentPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInArgumentPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInArgumentPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInOutArgumentPane.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInOutArgumentPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInOutArgumentPane.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/relational/ValueInOutArgumentPane.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisCustomCallsPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisCustomCallsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisCustomCallsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisCustomCallsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisDescriptorQueriesSettingsPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisDescriptorQueriesSettingsPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisDescriptorQueriesSettingsPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisDescriptorQueriesSettingsPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueriesPropertiesPage.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueriesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueriesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueriesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryAdvancedOptionsDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryAdvancedOptionsDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryAdvancedOptionsDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryAdvancedOptionsDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryOptionsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryOptionsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryOptionsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryOptionsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/EisQueryPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/InteractionPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/InteractionPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/InteractionPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/query/xml/InteractionPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/AttributeDeclarationNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/AttributeDeclarationNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/AttributeDeclarationNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/AttributeDeclarationNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ComplexTypeDefinitionNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ComplexTypeDefinitionNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ComplexTypeDefinitionNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ComplexTypeDefinitionNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditSchemaDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditSchemaDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditSchemaDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditSchemaDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditableSchemaPropertiesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditableSchemaPropertiesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditableSchemaPropertiesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/EditableSchemaPropertiesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ElementDeclarationNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ElementDeclarationNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ElementDeclarationNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ElementDeclarationNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/GeneralParticleNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/GeneralParticleNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/GeneralParticleNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/GeneralParticleNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ImportSchemaDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ImportSchemaDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ImportSchemaDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ImportSchemaDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/LocalSchemaComponentNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/LocalSchemaComponentNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/LocalSchemaComponentNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/LocalSchemaComponentNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupDefinitionNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupDefinitionNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupDefinitionNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupDefinitionNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/ModelGroupNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NamedSchemaComponentNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NamedSchemaComponentNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NamedSchemaComponentNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NamedSchemaComponentNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NullNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NullNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NullNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/NullNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetail.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetail.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetail.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetail.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetailsPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetailsPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetailsPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentDetailsPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentQNamedDetail.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentQNamedDetail.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentQNamedDetail.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaComponentQNamedDetail.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDialogUtilities.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDialogUtilities.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDialogUtilities.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDialogUtilities.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDocumentInfoPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDocumentInfoPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDocumentInfoPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaDocumentInfoPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNamespacesPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNamespacesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNamespacesPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNamespacesPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaStructurePanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaStructurePanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaStructurePanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SchemaStructurePanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SimpleTypeDefinitionNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SimpleTypeDefinitionNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SimpleTypeDefinitionNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SimpleTypeDefinitionNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SpecificParticleNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SpecificParticleNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SpecificParticleNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/SpecificParticleNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/TopLevelSchemaComponentNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/TopLevelSchemaComponentNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/TopLevelSchemaComponentNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/TopLevelSchemaComponentNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/UiSchemaResourceBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/UiSchemaResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/UiSchemaResourceBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/UiSchemaResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/WildcardNodeStructure.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/WildcardNodeStructure.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/WildcardNodeStructure.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/WildcardNodeStructure.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaDisplayableAdapter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaDisplayableAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaDisplayableAdapter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaDisplayableAdapter.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryNode.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryNode.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryNode.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryPanel.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryPanel.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/schema/XmlSchemaRepositoryPanel.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooser.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooser.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooser.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooserDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooserDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaComplexTypeChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooser.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooser.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooser.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooserDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooserDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextComponentDisplayer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextComponentDisplayer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextComponentDisplayer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaContextComponentDisplayer.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRepositoryValue.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRepositoryValue.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRepositoryValue.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRepositoryValue.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooser.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooser.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooser.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooserDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooserDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaRootElementChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaValue.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaValue.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaValue.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/SchemaValue.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/UiXmlBundle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/UiXmlBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/UiXmlBundle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/UiXmlBundle.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooser.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooser.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooser.java
diff --git a/utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooserDialog.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooserDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/mappingsplugin/source/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooserDialog.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/main/java/org/eclipse/persistence/tools/workbench/mappingsplugin/ui/xml/XpathChooserDialog.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator101300.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator101300.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator101300.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator101300.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator2.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator2.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator2.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator2.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator3.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator3.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator3.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGenerator3.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGeneratorLinuxMain.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGeneratorLinuxMain.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ADEScriptGeneratorLinuxMain.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ADEScriptGeneratorLinuxMain.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/AllTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/AllTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/AllTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/AllTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/CheckEOL.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/CheckEOL.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/CheckEOL.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/CheckEOL.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/CheckEOLTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/CheckEOLTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/CheckEOLTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/CheckEOLTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/MostTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/MostTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/MostTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/MostTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/TlRenamer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/TlRenamer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/TlRenamer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/TlRenamer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/EisProjectExporterTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/EisProjectExporterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/EisProjectExporterTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/EisProjectExporterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/EisProjectValidatorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/EisProjectValidatorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/EisProjectValidatorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/EisProjectValidatorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/OXProjectExporterTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/OXProjectExporterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/OXProjectExporterTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/OXProjectExporterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/OXProjectValidatorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/OXProjectValidatorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/OXProjectValidatorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/OXProjectValidatorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/ProjectExporterTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/ProjectExporterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/ProjectExporterTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/ProjectExporterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/ProjectRunnerTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/ProjectRunnerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/ProjectRunnerTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/ProjectRunnerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/ProjectValidatorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/ProjectValidatorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/ProjectValidatorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/ProjectValidatorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/RelationalProjectRunnerTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/RelationalProjectRunnerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/RelationalProjectRunnerTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/RelationalProjectRunnerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/XmlProjectRunnerTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/XmlProjectRunnerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/ant/XmlProjectRunnerTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/ant/XmlProjectRunnerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappings/ExportRuntimeProjectJavaSourceCommandLineTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappings/ExportRuntimeProjectJavaSourceCommandLineTests.java
similarity index 79%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappings/ExportRuntimeProjectJavaSourceCommandLineTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappings/ExportRuntimeProjectJavaSourceCommandLineTests.java
index b224656..89a3dbd 100644
--- a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappings/ExportRuntimeProjectJavaSourceCommandLineTests.java
+++ b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappings/ExportRuntimeProjectJavaSourceCommandLineTests.java
@@ -22,10 +22,13 @@
import org.apache.xerces.xni.parser.XMLParserConfiguration;
import org.eclipse.persistence.indirection.ValueHolderInterface;
+import org.eclipse.persistence.platform.database.oracle.Oracle12Platform;
+import org.eclipse.persistence.tools.workbench.framework.resources.StringRepository;
import org.eclipse.persistence.tools.workbench.mappings.JavaSourceGenerator;
import org.eclipse.persistence.tools.workbench.mappingsio.ProjectIOManager;
import org.eclipse.persistence.tools.workbench.mappingsmodel.project.MWProject;
import org.eclipse.persistence.tools.workbench.mappingsmodel.project.relational.MWRelationalProject;
+import org.eclipse.persistence.tools.workbench.platformsmodel.DatabasePlatform;
import org.eclipse.persistence.tools.workbench.test.mappingsmodel.AbstractExportRuntimeProjectJavaSourceTests;
import org.eclipse.persistence.tools.workbench.test.models.projects.LegacyEmployeeProject;
import org.eclipse.persistence.tools.workbench.test.utility.JavaTools;
@@ -61,9 +64,14 @@ private void verifyJavaExport(MWRelationalProject project) throws Exception {
List classpathEntries = new ArrayList();
classpathEntries.add(this.tempDir.getAbsolutePath());
- classpathEntries.add(Classpath.locationFor(MWProject.class)); // elmwcore.jar
- classpathEntries.add(Classpath.locationFor(JavaSourceGenerator.class)); // eclipselinkmw.jar
- classpathEntries.add(Classpath.locationFor(ValueHolderInterface.class)); // ecilpselink.jar
+ classpathEntries.add(Classpath.locationFor(Classpath.class)); // utility/elmwcore.jar
+ classpathEntries.add(Classpath.locationFor(DatabasePlatform.class)); // platformsmodel/elmwcore.jar
+ classpathEntries.add(Classpath.locationFor(ProjectIOManager.class)); // mappingsio/elmwcore.jar
+ classpathEntries.add(Classpath.locationFor(MWProject.class)); // mappingsmodel/elmwcore.jar
+ classpathEntries.add(Classpath.locationFor(StringRepository.class)); // framework/eclipselinkmw.jar
+ classpathEntries.add(Classpath.locationFor(JavaSourceGenerator.class)); // mappingsplugin/eclipselinkmw.jar
+ classpathEntries.add(Classpath.locationFor(ValueHolderInterface.class)); // org.eclipse.persistence.core/ecilpselink.jar
+ classpathEntries.add(Classpath.locationFor(Oracle12Platform.class)); // org.eclipse.persistence.oracle/ecilpselink.jar
classpathEntries.add(Classpath.locationFor(XMLParserConfiguration.class)); // xercesImpl.jar
classpathEntries.add(FileTools.resourceFile("/platforms.dpr").getParentFile().getAbsolutePath()); // config dir
Classpath classpath = new Classpath(classpathEntries);
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/AllMappingsIOTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/AllMappingsIOTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/AllMappingsIOTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/AllMappingsIOTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/MostMappingsIOTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/MostMappingsIOTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/MostMappingsIOTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/MostMappingsIOTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/ReadWriteTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/ReadWriteTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/ReadWriteTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/ReadWriteTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/AllMappingsIOLegacyTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/AllMappingsIOLegacyTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/AllMappingsIOLegacyTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/AllMappingsIOLegacyTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityInternalTestCase.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityInternalTestCase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityInternalTestCase.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityInternalTestCase.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTestCase.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTestCase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTestCase.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTestCase.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTests60.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTests60.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTests60.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/BackwardCompatibilityTests60.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/MostMappingsIOLegacyTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/MostMappingsIOLegacyTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/MostMappingsIOLegacyTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsio/legacy/MostMappingsIOLegacyTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AbstractExportRuntimeProjectJavaSourceTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AbstractExportRuntimeProjectJavaSourceTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AbstractExportRuntimeProjectJavaSourceTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AbstractExportRuntimeProjectJavaSourceTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AllMappingsModelTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AllMappingsModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AllMappingsModelTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/AllMappingsModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/DeploymentXMLTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/DeploymentXMLTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/DeploymentXMLTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/DeploymentXMLTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ExportRuntimeProjectJavaSourceTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ExportRuntimeProjectJavaSourceTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ExportRuntimeProjectJavaSourceTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ExportRuntimeProjectJavaSourceTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MWProjectTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MWProjectTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MWProjectTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MWProjectTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MappingsModelTestTools.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MappingsModelTestTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MappingsModelTestTools.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/MappingsModelTestTools.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ModelProblemsTestCase.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ModelProblemsTestCase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ModelProblemsTestCase.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ModelProblemsTestCase.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ProjectConverterTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ProjectConverterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ProjectConverterTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/ProjectConverterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/TestProjectsTestCase.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/TestProjectsTestCase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/TestProjectsTestCase.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/TestProjectsTestCase.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AbstractAutomapVerifier.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AbstractAutomapVerifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AbstractAutomapVerifier.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AbstractAutomapVerifier.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AllModelAutomapTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AllModelAutomapTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AllModelAutomapTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AllModelAutomapTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapVerifier.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapVerifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapVerifier.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/AutomapVerifier.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/ComplexProjectUnmappedVerifier.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/ComplexProjectUnmappedVerifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/ComplexProjectUnmappedVerifier.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/ComplexProjectUnmappedVerifier.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/EmployeeProjectVerifier.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/EmployeeProjectVerifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/EmployeeProjectVerifier.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/EmployeeProjectVerifier.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/SampleProjectUnmappedVerifier.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/SampleProjectUnmappedVerifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/SampleProjectUnmappedVerifier.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/automap/SampleProjectUnmappedVerifier.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AbstractModelDatabaseTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AbstractModelDatabaseTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AbstractModelDatabaseTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AbstractModelDatabaseTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AllModelDatabaseTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AllModelDatabaseTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AllModelDatabaseTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/AllModelDatabaseTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/DatabaseModelSynchTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/DatabaseModelSynchTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/DatabaseModelSynchTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/DatabaseModelSynchTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWDatabaseTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWDatabaseTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWDatabaseTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWDatabaseTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWTableTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWTableTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWTableTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/db/MWTableTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/AllModelDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/AllModelDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/AllModelDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/AllModelDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWAggregateDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWAggregateDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWAggregateDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWAggregateDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorReturningPolicyTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorReturningPolicyTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorReturningPolicyTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorReturningPolicyTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWInterfaceDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWInterfaceDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWInterfaceDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWInterfaceDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWMappingDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWMappingDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWMappingDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWMappingDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWTableDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWTableDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWTableDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/MWTableDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWEisDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWEisDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWEisDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWEisDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWOXDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWOXDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWOXDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWOXDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWXmlDescriptorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWXmlDescriptorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWXmlDescriptorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/descriptor/xml/MWXmlDescriptorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/AllModelMappingsTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/AllModelMappingsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/AllModelMappingsTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/AllModelMappingsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregateMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregateMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregateMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregateMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregatePathToColumnTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregatePathToColumnTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregatePathToColumnTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWAggregatePathToColumnTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCollectionMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCollectionMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCollectionMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCollectionMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeCollectionMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeCollectionMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeCollectionMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeCollectionMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeObjectMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeObjectMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeObjectMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWCompositeObjectMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToFieldMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToFieldMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToFieldMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToFieldMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToXmlTypeMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToXmlTypeMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToXmlTypeMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWDirectToXmlTypeMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWManyToManyMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWManyToManyMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWManyToManyMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWManyToManyMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWObjectTypeConverterTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWObjectTypeConverterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWObjectTypeConverterTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWObjectTypeConverterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWOneToManyMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWOneToManyMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWOneToManyMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWOneToManyMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWReferenceMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWReferenceMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWReferenceMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWReferenceMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectCollectionMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectCollectionMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectCollectionMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectCollectionMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectMapMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectMapMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectMapMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWRelationalDirectMapMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTableReferenceMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTableReferenceMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTableReferenceMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTableReferenceMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTransformationMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTransformationMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTransformationMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTransformationMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTypeConversionConverterTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTypeConversionConverterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTypeConversionConverterTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWTypeConversionConverterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWVariableOneToOneMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWVariableOneToOneMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWVariableOneToOneMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWVariableOneToOneMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectCollectionMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectCollectionMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectCollectionMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectCollectionMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectMappingTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectMappingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectMappingTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/mapping/MWXmlDirectMappingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/AllModelMetaTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/AllModelMetaTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/AllModelMetaTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/AllModelMetaTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassAttributeTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassAttributeTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassAttributeTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassAttributeTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassRepositoryTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassRepositoryTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWClassTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWMethodTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWMethodTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWMethodTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWMethodTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWModifierTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWModifierTests.java
similarity index 99%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWModifierTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWModifierTests.java
index e8d3f90..95c354a 100644
--- a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWModifierTests.java
+++ b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWModifierTests.java
@@ -49,6 +49,7 @@ protected void setUp() throws Exception {
this.project = this.buildProject();
this.project.getRepository().addClasspathEntry(Classpath.locationFor(Bag.class)); // "core" jar
this.project.getRepository().addClasspathEntry(Classpath.locationFor(Displayable.class)); // "ui" jar
+ this.project.getRepository().addClasspathEntry(Classpath.locationFor(MWClass.class)); // "mappingsmodel" jar
this.project.getRepository().addClasspathEntry(Classpath.locationFor(this.getClass()));
this.type = this.project.typeNamed("com.foo.Foo");
this.modifier = this.type.getModifier();
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWTypeDeclarationTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWTypeDeclarationTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWTypeDeclarationTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MWTypeDeclarationTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MarkerInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MarkerInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MarkerInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/MarkerInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/PackageInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/PackageInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/PackageInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/meta/PackageInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/AllModelQueryTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/AllModelQueryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/AllModelQueryTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/AllModelQueryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionUndoableTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionUndoableTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionUndoableTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWExpressionUndoableTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryableTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryableTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryableTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWQueryableTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWUserDefinedQueryKeyTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWUserDefinedQueryKeyTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWUserDefinedQueryKeyTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/MWUserDefinedQueryKeyTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/xml/MWEisInteractionTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/xml/MWEisInteractionTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/xml/MWEisInteractionTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/query/xml/MWEisInteractionTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/AllModelSchemaTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/AllModelSchemaTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/AllModelSchemaTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/AllModelSchemaTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/BasicSchemaTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/BasicSchemaTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/BasicSchemaTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/BasicSchemaTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaAPITests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaAPITests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaAPITests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaAPITests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SchemaTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SingleSchemaTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SingleSchemaTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SingleSchemaTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/schema/SingleSchemaTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/AllModelSPIMetaTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/AllModelSPIMetaTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/AllModelSPIMetaTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/AllModelSPIMetaTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ClasspathTestTool.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ClasspathTestTool.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ClasspathTestTool.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ClasspathTestTool.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassDescriptionTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassDescriptionTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassDescriptionTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassDescriptionTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassRepositoryTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassRepositoryTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalClassTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalConstructorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalConstructorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalConstructorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalConstructorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalFieldTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalFieldTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalFieldTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalFieldTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalMethodTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalMethodTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalMethodTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/ExternalMethodTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/SPIMetaTestTools.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/SPIMetaTestTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/SPIMetaTestTools.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/SPIMetaTestTools.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/AllModelSPIMetaClassFileTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/AllModelSPIMetaClassFileTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/AllModelSPIMetaClassFileTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/AllModelSPIMetaClassFileTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassDescriptionTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassDescriptionTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassDescriptionTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassDescriptionTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalClassTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalConstructorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalConstructorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalConstructorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalConstructorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalFieldTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalFieldTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalFieldTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalFieldTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalMethodTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalMethodTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalMethodTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classfile/CFExternalMethodTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/AllModelSPIMetaClassLoaderTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/AllModelSPIMetaClassLoaderTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/AllModelSPIMetaClassLoaderTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/AllModelSPIMetaClassLoaderTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassDescriptionTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassDescriptionTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassDescriptionTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassDescriptionTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalClassTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalConstructorTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalConstructorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalConstructorTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalConstructorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalFieldTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalFieldTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalFieldTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalFieldTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalMethodTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalMethodTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalMethodTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsmodel/spi/meta/classloader/CLExternalMethodTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/AllMappingsPluginTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/AllMappingsPluginTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/AllMappingsPluginTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/AllMappingsPluginTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/CodeDefinitionTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/CodeDefinitionTests.java
similarity index 97%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/CodeDefinitionTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/CodeDefinitionTests.java
index 8f54023..3086a45 100644
--- a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/CodeDefinitionTests.java
+++ b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/CodeDefinitionTests.java
@@ -63,6 +63,13 @@ public void testCalculateImports()
String nextLine = "";
StringBuffer pregeneratedOutput = new StringBuffer();
+ while ((nextLine = reader.readLine()) != null) {
+ //license header ends with an empty line
+ if (nextLine.trim().isEmpty()) {
+ break;
+ }
+ }
+
while ((nextLine = reader.readLine()) != null)
{
pregeneratedOutput.append(nextLine);
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/DescriptorGenerationTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/DescriptorGenerationTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/DescriptorGenerationTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/DescriptorGenerationTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ExportModelJavaSourceTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ExportModelJavaSourceTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ExportModelJavaSourceTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ExportModelJavaSourceTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ProblemsBundleTests.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ProblemsBundleTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ProblemsBundleTests.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ProblemsBundleTests.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/NonDescriptorClassManagementDialogTest.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/NonDescriptorClassManagementDialogTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/NonDescriptorClassManagementDialogTest.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/NonDescriptorClassManagementDialogTest.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/descriptor/xml/SchemaContextAndXpathChooserTest.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/descriptor/xml/SchemaContextAndXpathChooserTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/descriptor/xml/SchemaContextAndXpathChooserTest.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/descriptor/xml/SchemaContextAndXpathChooserTest.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ClasspathPanelTest.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ClasspathPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ClasspathPanelTest.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ClasspathPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialogTest.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialogTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialogTest.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/meta/ExternalClassLoadFailuresDialogTest.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaPanelTest.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaPanelTest.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaRepositoryPanelTest.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaRepositoryPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaRepositoryPanelTest.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/mappingsplugin/ui/schema/SchemaRepositoryPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/AddressDescription.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/AddressDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/AddressDescription.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/AddressDescription.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Client.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Client.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Client.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Client.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Computer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Computer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Computer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Computer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Employee.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Employee.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/EvaluationClient.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/EvaluationClient.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/EvaluationClient.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/EvaluationClient.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Language.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Language.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Language.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Language.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Oid.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Oid.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Oid.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Oid.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Period.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Period.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Period.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Period.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/PeriodDescription.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/PeriodDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/PeriodDescription.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/PeriodDescription.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/ProjectDescription.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/ProjectDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/ProjectDescription.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/ProjectDescription.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Responsibility.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Responsibility.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Responsibility.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexaggregate/Responsibility.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bicycle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bicycle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bicycle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bicycle.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Boat.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Boat.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Boat.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Boat.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bus.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bus.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bus.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Bus.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Car.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Car.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Car.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Car.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Company.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Company.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Company.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Company.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Computer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Computer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Computer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Computer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Engineer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Engineer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Engineer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Engineer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/FueledVehicle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/FueledVehicle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/FueledVehicle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/FueledVehicle.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/IBMPC.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/IBMPC.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/IBMPC.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/IBMPC.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mac.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mac.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mac.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mac.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mainframe.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mainframe.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mainframe.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Mainframe.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/NonFueledVehicle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/NonFueledVehicle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/NonFueledVehicle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/NonFueledVehicle.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/PC.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/PC.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/PC.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/PC.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Person.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Person.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Person.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Person.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SalesRep.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SalesRep.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SalesRep.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SalesRep.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SoftwareEngineer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SoftwareEngineer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SoftwareEngineer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SoftwareEngineer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SportsCar.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SportsCar.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SportsCar.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/SportsCar.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Vehicle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Vehicle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Vehicle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexinheritance/Vehicle.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Computer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Computer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Computer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Computer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Cubicle.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Cubicle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Cubicle.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Cubicle.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Employee.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Employee.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Female.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Female.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Female.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Female.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Gender.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Gender.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Gender.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Gender.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Hardware.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Hardware.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Hardware.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Hardware.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/JobDescription.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/JobDescription.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/JobDescription.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/JobDescription.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Male.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Male.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Male.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Male.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Monitor.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Monitor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Monitor.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Monitor.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Phone.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Phone.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Phone.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Phone.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Shipment.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Shipment.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Shipment.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/complexmapping/Shipment.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/Contact.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/Contact.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/Contact.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/Contact.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/EmailAddress.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/EmailAddress.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/EmailAddress.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/EmailAddress.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/Person.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/Person.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/Person.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/Person.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/PersonImpl.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/PersonImpl.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/PersonImpl.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/PersonImpl.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/PhoneNumber.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/contact/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/contact/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/corruptarray/CorruptArray.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/corruptarray/CorruptArray.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/corruptarray/CorruptArray.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/corruptarray/CorruptArray.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/AddressSubClass.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/AddressSubClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/AddressSubClass.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/AddressSubClass.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/CrimeScene.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/CrimeScene.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/CrimeScene.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/CrimeScene.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Detective.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Detective.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Detective.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Detective.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Fingerprint.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Fingerprint.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Fingerprint.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Fingerprint.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Firearm.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Firearm.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Firearm.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Firearm.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Person.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Person.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Person.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Person.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/PieceOfEvidence.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/PieceOfEvidence.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/PieceOfEvidence.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/PieceOfEvidence.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Suspect.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Suspect.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Suspect.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Suspect.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Victim.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Victim.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Victim.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Victim.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Weapon.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Weapon.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/crimescene/Weapon.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/crimescene/Weapon.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/CommodityPrice.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/CommodityPrice.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/CommodityPrice.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/CommodityPrice.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/Currency.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/Currency.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/Currency.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/Currency.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/CurrencyRange.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/CurrencyRange.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/CurrencyRange.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/CurrencyRange.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/ExchangeRate.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/ExchangeRate.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/currency/ExchangeRate.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/currency/ExchangeRate.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Dependent.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Dependent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Dependent.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Dependent.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Employee.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Employee.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/LargeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/LargeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/LargeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/LargeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/NormalHoursTransformer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/NormalHoursTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/NormalHoursTransformer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/NormalHoursTransformer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/PhoneNumber.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Project.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Project.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Project.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/eis/employee/Project.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/Employee.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/Employee.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/EmployeeInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/EmployeeInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/EmployeeInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/EmployeeInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/EmploymentPeriod.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/EmploymentPeriod.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/EmploymentPeriod.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/EmploymentPeriod.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProjectInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProjectInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProjectInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/LargeProjectInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/PhoneNumber.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/Project.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/Project.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/Project.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/Project.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/ProjectInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/ProjectInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/ProjectInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/ProjectInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProjectInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProjectInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProjectInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/employee/SmallProjectInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Claim.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Claim.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Claim.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Claim.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthClaim.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthClaim.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthClaim.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthClaim.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthPolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthPolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthPolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HealthPolicy.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HouseClaim.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HouseClaim.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HouseClaim.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HouseClaim.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HousePolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HousePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/HousePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/HousePolicy.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Phone.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Phone.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Phone.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Phone.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Policy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Policy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/Policy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/Policy.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/PolicyHolder.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/PolicyHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/PolicyHolder.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/PolicyHolder.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/VehicleClaim.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/VehicleClaim.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/VehicleClaim.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/VehicleClaim.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/VehiclePolicy.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/VehiclePolicy.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/insurance/VehiclePolicy.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/insurance/VehiclePolicy.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Dependent.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Dependent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Dependent.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Dependent.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Employee.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Employee.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/NormalHoursTransformer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/NormalHoursTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/NormalHoursTransformer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/NormalHoursTransformer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/PhoneNumber.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/jaxb/employee/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Cow.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Cow.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Cow.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Cow.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Horse.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Horse.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Horse.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Horse.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Human.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Human.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Human.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Human.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Swan.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Swan.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/multipletable/Swan.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/multipletable/Swan.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Addressable.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Addressable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Addressable.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Addressable.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Company.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Company.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Company.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Company.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Contact.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Contact.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Contact.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Contact.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/EmailAddress.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/EmailAddress.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/EmailAddress.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/EmailAddress.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Household.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Household.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Household.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Household.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Person.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Person.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Person.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Person.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/PhoneNumber.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Service.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Service.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Service.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Service.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/ServiceCall.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/ServiceCall.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/ServiceCall.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/ServiceCall.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Serviceable.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Serviceable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/Serviceable.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/Serviceable.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/State.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/State.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/phone/State.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/phone/State.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexAggregateRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexInheritanceProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexInheritanceProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexInheritanceProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexInheritanceProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexMappingProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexMappingProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexMappingProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ComplexMappingProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CorruptArrayProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CorruptArrayProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CorruptArrayProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CorruptArrayProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CrimeSceneRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/CurrencyRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeEisRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeJAXBRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeOXRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/EmployeeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/IdentityPolicyRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/InsuranceRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject45.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject45.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject45.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject45.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject50.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject50.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject50.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyComplexAggregateProject50.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeOXProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeOXProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeOXProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeOXProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyEmployeeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyPhoneCompanyProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyPhoneCompanyProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyPhoneCompanyProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyPhoneCompanyProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyQueryProject50.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyQueryProject50.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyQueryProject50.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacyQueryProject50.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacySimpleContactProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacySimpleContactProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LegacySimpleContactProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LegacySimpleContactProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/LockingPolicyRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/MultipleTableRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/PhoneCompanyRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/QueryProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/QueryProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/QueryProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/QueryProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/QueryRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/QueryRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/QueryRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/QueryRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReadOnlyProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReadOnlyProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReadOnlyProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReadOnlyProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/RelationalTestProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/RelationalTestProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/RelationalTestProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/RelationalTestProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyEisRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/ReturningPolicyRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleAggregateRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactRuntimeProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactRuntimeProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactRuntimeProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/SimpleContactRuntimeProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/TestDatabases.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/TestDatabases.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/TestDatabases.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/TestDatabases.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/TestProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/TestProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/TestProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/TestProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/XmlTestProject.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/XmlTestProject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/projects/XmlTestProject.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/projects/XmlTestProject.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/Employee.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/Employee.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/EmployeeInterface.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/EmployeeInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/EmployeeInterface.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/EmployeeInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/EmploymentPeriod.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/EmploymentPeriod.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/EmploymentPeriod.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/EmploymentPeriod.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/PhoneNumber.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/query/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/query/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Actor.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Actor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Actor.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Actor.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Country.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Country.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Country.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Country.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Movie.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Movie.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Movie.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Movie.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Promoter.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Promoter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Promoter.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Promoter.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Studio.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Studio.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/readonly/Studio.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/readonly/Studio.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/AddressSubClass.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/AddressSubClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/AddressSubClass.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/AddressSubClass.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Person.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Person.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Person.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/simpleaggregate/Person.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Address.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Address.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Dependent.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Dependent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Dependent.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Dependent.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Employee.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Employee.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/NormalHoursTransformer.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/NormalHoursTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/NormalHoursTransformer.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/NormalHoursTransformer.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/PhoneNumber.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/source/org/eclipse/persistence/tools/workbench/test/models/xml/employee/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/models/xml/employee/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/build-eclipse.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/build-eclipse.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/build-eclipse.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/build-eclipse.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/build.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/build.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/build.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/build.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/buildbody.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/buildbody.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/buildbody.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/buildbody.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/sessions10.1.3/Employee-sessions.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/sessions10.1.3/Employee-sessions.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/sessions10.1.3/Employee-sessions.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/sessions10.1.3/Employee-sessions.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/toplink-ant-lib.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/toplink-ant-lib.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/ant/toplink-ant-lib.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/ant/toplink-ant-lib.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/ComplexAggregate.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/ComplexAggregate.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/ComplexAggregate.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/ComplexAggregate.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.AddressDescription.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.AddressDescription.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.AddressDescription.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.AddressDescription.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Client.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Client.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Client.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Client.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Computer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Computer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Computer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Computer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.EvaluationClient.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.EvaluationClient.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.EvaluationClient.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.EvaluationClient.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Language.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Language.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Language.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Language.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Period.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Period.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Period.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Period.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.PeriodDescription.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.PeriodDescription.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.PeriodDescription.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.PeriodDescription.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.ProjectDescription.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.ProjectDescription.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.ProjectDescription.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.ProjectDescription.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Responsibility.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Responsibility.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Responsibility.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/classes/test.oracle.models.complexaggregate.Responsibility.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.AddressDescription.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.AddressDescription.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.AddressDescription.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.AddressDescription.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Client.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Client.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Client.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Client.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Computer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Computer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Computer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Computer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.EvaluationClient.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.EvaluationClient.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.EvaluationClient.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.EvaluationClient.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Language.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Language.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Language.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Language.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Period.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Period.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Period.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Period.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.PeriodDescription.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.PeriodDescription.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.PeriodDescription.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.PeriodDescription.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.ProjectDescription.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.ProjectDescription.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.ProjectDescription.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.ProjectDescription.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Responsibility.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Responsibility.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Responsibility.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/descriptors/test.oracle.models.complexaggregate.Responsibility.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ADD.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ADD.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ADD.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ADD.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_CLNT.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_CLNT.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_CLNT.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_CLNT.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_COM.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_COM.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_COM.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_COM.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ECNT.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ECNT.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ECNT.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_ECNT.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_EMP.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_EMP.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_EMP.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_EMP.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_LAN.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_LAN.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_LAN.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_LAN.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_RES.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_RES.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_RES.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/AGG_RES.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/EMP_LAN.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/EMP_LAN.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/EMP_LAN.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/EMP_LAN.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/SEQUENCE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/SEQUENCE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexAggregate/tables/SEQUENCE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexAggregate/tables/SEQUENCE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/ComplexInheritance.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/ComplexInheritance.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/ComplexInheritance.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/ComplexInheritance.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bicycle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bicycle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bicycle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bicycle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Boat.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Boat.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Boat.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Boat.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bus.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bus.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bus.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Bus.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Car.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Car.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Car.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Car.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Company.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Company.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Company.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Company.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Computer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Computer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Computer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Computer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Engineer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Engineer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Engineer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Engineer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.FueledVehicle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.FueledVehicle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.FueledVehicle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.FueledVehicle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.IBMPC.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.IBMPC.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.IBMPC.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.IBMPC.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mac.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mac.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mac.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mac.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mainframe.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mainframe.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mainframe.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Mainframe.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.NonFueledVehicle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.NonFueledVehicle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.NonFueledVehicle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.NonFueledVehicle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.PC.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.PC.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.PC.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.PC.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Person.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Person.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Person.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Person.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SalesRep.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SalesRep.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SalesRep.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SalesRep.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SoftwareEngineer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SoftwareEngineer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SoftwareEngineer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SoftwareEngineer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SportsCar.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SportsCar.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SportsCar.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.SportsCar.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Vehicle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Vehicle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Vehicle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/classes/test.oracle.models.complexinheritance.Vehicle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bicycle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bicycle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bicycle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bicycle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Boat.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Boat.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Boat.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Boat.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bus.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bus.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bus.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Bus.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Car.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Car.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Car.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Car.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Company.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Company.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Company.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Company.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Computer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Computer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Computer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Computer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Engineer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Engineer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Engineer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Engineer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.FueledVehicle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.FueledVehicle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.FueledVehicle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.FueledVehicle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.IBMPC.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.IBMPC.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.IBMPC.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.IBMPC.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mac.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mac.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mac.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mac.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mainframe.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mainframe.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mainframe.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Mainframe.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.NonFueledVehicle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.NonFueledVehicle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.NonFueledVehicle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.NonFueledVehicle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.PC.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.PC.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.PC.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.PC.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Person.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Person.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Person.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Person.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SalesRep.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SalesRep.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SalesRep.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SalesRep.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SoftwareEngineer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SoftwareEngineer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SoftwareEngineer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SoftwareEngineer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SportsCar.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SportsCar.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SportsCar.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.SportsCar.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Vehicle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Vehicle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Vehicle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/descriptors/test.oracle.models.complexinheritance.Vehicle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/BUS.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/BUS.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/BUS.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/BUS.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/CAR.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/CAR.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/CAR.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/CAR.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/COMPANY.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/COMPANY.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/COMPANY.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/COMPANY.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/FUEL_VEH.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/FUEL_VEH.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/FUEL_VEH.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/FUEL_VEH.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/INH_COMP.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/INH_COMP.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/INH_COMP.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/INH_COMP.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/INH_MF.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/INH_MF.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/INH_MF.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/INH_MF.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/PARTNUMS.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/PARTNUMS.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/PARTNUMS.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/PARTNUMS.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/PERSON2.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/PERSON2.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/PERSON2.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/PERSON2.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/SEQUENCE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/SEQUENCE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/SEQUENCE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/SEQUENCE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/VEHICLE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/VEHICLE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexInheritance/tables/VEHICLE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexInheritance/tables/VEHICLE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/ComplexMapping.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/ComplexMapping.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/ComplexMapping.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/ComplexMapping.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Computer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Computer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Computer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Computer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Cubicle.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Cubicle.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Cubicle.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Cubicle.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Gender.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Gender.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Gender.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Gender.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Hardware.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Hardware.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Hardware.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Hardware.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.JobDescription.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.JobDescription.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.JobDescription.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.JobDescription.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Monitor.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Monitor.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Monitor.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Monitor.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Phone.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Phone.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Phone.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Phone.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Shipment.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Shipment.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Shipment.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/classes/test.oracle.models.complexmapping.Shipment.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Computer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Computer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Computer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Computer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Hardware.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Hardware.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Hardware.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Hardware.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Monitor.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Monitor.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Monitor.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Monitor.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Phone.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Phone.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Phone.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Phone.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Shipment.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Shipment.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Shipment.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/descriptors/test.oracle.models.complexmapping.Shipment.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_ADD.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_ADD.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_ADD.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_ADD.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_COM.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_COM.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_COM.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_COM.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMP.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMP.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMP.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMP.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMPH.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMPH.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMPH.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMPH.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMSP.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMSP.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMSP.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_EMSP.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_HRW.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_HRW.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_HRW.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_HRW.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_MON.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_MON.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_MON.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_MON.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_PHO.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_PHO.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_PHO.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_PHO.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_POL.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_POL.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_POL.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_POL.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_SHIP.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_SHIP.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ComplexMapping/tables/MAP_SHIP.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ComplexMapping/tables/MAP_SHIP.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/Employee-OX.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/Employee-OX.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/Employee-OX.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/Employee-OX.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Dependent.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Dependent.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Dependent.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Dependent.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.bak b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.bak
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.bak
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.bak
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.NormalHoursTransformer.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/classes/test.oracle.models.xml.employee.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Dependent.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Dependent.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Dependent.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Dependent.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/descriptors/test.oracle.models.xml.employee.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/employee.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/employee.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/employee.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/employee.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/schemas/employee.xsd.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/schemas/employee.xsd.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee-OX/schemas/employee.xsd.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee-OX/schemas/employee.xsd.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/Employee.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/Employee.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/Employee.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/Employee.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmployeeInterface.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmployeeInterface.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmployeeInterface.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmployeeInterface.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmploymentPeriod.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmploymentPeriod.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmploymentPeriod.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.EmploymentPeriod.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProject.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProject.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProject.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProject.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProjectInterface.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProjectInterface.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProjectInterface.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.LargeProjectInterface.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Project.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Project.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Project.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.Project.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.ProjectInterface.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.ProjectInterface.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.ProjectInterface.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.ProjectInterface.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProject.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProject.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProject.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProject.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProjectInterface.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProjectInterface.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProjectInterface.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/classes/test.oracle.models.employee.SmallProjectInterface.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Employee.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Employee.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Employee.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Employee.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.EmploymentPeriod.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.EmploymentPeriod.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.EmploymentPeriod.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.EmploymentPeriod.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.LargeProject.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.LargeProject.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.LargeProject.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.LargeProject.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Project.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Project.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Project.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.Project.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.SmallProject.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.SmallProject.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.SmallProject.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/descriptors/test.oracle.models.employee.SmallProject.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/ADDRESS.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/ADDRESS.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/ADDRESS.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/ADDRESS.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/EMPLOYEE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/EMPLOYEE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/EMPLOYEE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/EMPLOYEE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/LPROJECT.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/LPROJECT.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/LPROJECT.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/LPROJECT.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/PHONE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/PHONE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/PHONE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/PHONE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/PROJECT.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/PROJECT.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/PROJECT.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/PROJECT.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/PROJ_EMP.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/PROJ_EMP.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/PROJ_EMP.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/PROJ_EMP.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/RESPONS.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/RESPONS.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/RESPONS.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/RESPONS.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/SALARY.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/SALARY.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/SALARY.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/SALARY.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/SEQUENCE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/SEQUENCE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Employee/tables/SEQUENCE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Employee/tables/SEQUENCE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/Insurance.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/Insurance.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/Insurance.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/Insurance.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Claim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Claim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Claim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Claim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthClaim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthClaim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthClaim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthClaim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthPolicy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthPolicy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthPolicy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HealthPolicy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HouseClaim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HouseClaim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HouseClaim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HouseClaim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HousePolicy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HousePolicy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HousePolicy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.HousePolicy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Phone.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Phone.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Phone.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Phone.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Policy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Policy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Policy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.Policy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.PolicyHolder.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.PolicyHolder.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.PolicyHolder.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.PolicyHolder.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehicleClaim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehicleClaim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehicleClaim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehicleClaim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehiclePolicy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehiclePolicy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehiclePolicy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/classes/test.oracle.models.insurance.VehiclePolicy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Claim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Claim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Claim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Claim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthClaim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthClaim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthClaim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthClaim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthPolicy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthPolicy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthPolicy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HealthPolicy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HouseClaim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HouseClaim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HouseClaim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HouseClaim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HousePolicy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HousePolicy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HousePolicy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.HousePolicy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Phone.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Phone.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Phone.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Phone.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Policy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Policy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Policy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.Policy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.PolicyHolder.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.PolicyHolder.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.PolicyHolder.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.PolicyHolder.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehicleClaim.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehicleClaim.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehicleClaim.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehicleClaim.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehiclePolicy.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehiclePolicy.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehiclePolicy.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/descriptors/test.oracle.models.insurance.VehiclePolicy.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/CHILDRENNAMES.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/CHILDRENNAMES.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/CHILDRENNAMES.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/CHILDRENNAMES.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/CLAIM.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/CLAIM.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/CLAIM.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/CLAIM.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/HOLDER.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/HOLDER.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/HOLDER.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/HOLDER.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/INS_ADDR.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/INS_ADDR.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/INS_ADDR.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/INS_ADDR.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/POLICY.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/POLICY.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/POLICY.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/POLICY.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/VHCL_CLM.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/VHCL_CLM.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/VHCL_CLM.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/VHCL_CLM.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/VHCL_POL.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/VHCL_POL.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/Insurance/tables/VHCL_POL.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/Insurance/tables/VHCL_POL.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/PhoneCompany.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/PhoneCompany.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/PhoneCompany.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/PhoneCompany.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Company.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Company.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Company.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Company.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.EmailAddress.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.EmailAddress.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.EmailAddress.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.EmailAddress.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Household.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Household.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Household.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Household.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Person.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Person.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Person.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Person.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Service.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Service.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Service.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.Service.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.ServiceCall.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.ServiceCall.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.ServiceCall.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/classes/test.oracle.models.phone.ServiceCall.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Company.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Company.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Company.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Company.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Contact.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Contact.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Contact.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Contact.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.EmailAddress.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.EmailAddress.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.EmailAddress.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.EmailAddress.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Household.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Household.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Household.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Household.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Person.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Person.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Person.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Person.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Service.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Service.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Service.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Service.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.ServiceCall.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.ServiceCall.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.ServiceCall.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.ServiceCall.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Serviceable.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Serviceable.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Serviceable.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/descriptors/test.oracle.models.phone.Serviceable.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY_PERSON.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY_PERSON.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY_PERSON.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/COMPANY_PERSON.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/EMAIL.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/EMAIL.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/EMAIL.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/EMAIL.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/HOUSEHOLD.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/HOUSEHOLD.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/HOUSEHOLD.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/HOUSEHOLD.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/LINE_ACCOUNT.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/LINE_ACCOUNT.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/LINE_ACCOUNT.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/LINE_ACCOUNT.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/PERSON.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/PERSON.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/PERSON.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/PERSON.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/PHONE_NUMBER.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/PHONE_NUMBER.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/PHONE_NUMBER.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/PHONE_NUMBER.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/SEQUENCE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/SEQUENCE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/SEQUENCE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/SEQUENCE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/SERVICE_CALL.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/SERVICE_CALL.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/PhoneCompany/tables/SERVICE_CALL.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/PhoneCompany/tables/SERVICE_CALL.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/ReadOnly.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/ReadOnly.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/ReadOnly.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/ReadOnly.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Actor.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Actor.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Actor.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Actor.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Country.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Country.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Country.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Country.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Movie.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Movie.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Movie.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Movie.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Promoter.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Promoter.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Promoter.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Promoter.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Studio.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Studio.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Studio.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/classes/test.oracle.models.readonly.Studio.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Actor.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Actor.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Actor.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Actor.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Country.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Country.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Country.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Country.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Movie.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Movie.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Movie.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Movie.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Promoter.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Promoter.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Promoter.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Promoter.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Studio.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Studio.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Studio.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/descriptors/test.oracle.models.readonly.Studio.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/ACT_MOV.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/ACT_MOV.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/ACT_MOV.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/ACT_MOV.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/COUNTRY.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/COUNTRY.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/COUNTRY.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/COUNTRY.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_ACTOR.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_ACTOR.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_ACTOR.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_ACTOR.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_ADDR.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_ADDR.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_ADDR.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_ADDR.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_MOVIE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_MOVIE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_MOVIE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_MOVIE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_PROMO.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_PROMO.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/RO_PROMO.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/RO_PROMO.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/SEQUENCE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/SEQUENCE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/ReadOnly/tables/SEQUENCE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/ReadOnly/tables/SEQUENCE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/SimpleAggregate.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/SimpleAggregate.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/SimpleAggregate.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/SimpleAggregate.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.AddressSubClass.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.AddressSubClass.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.AddressSubClass.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.AddressSubClass.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Person.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Person.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Person.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/classes/test.oracle.models.simpleaggregate.Person.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Address.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Address.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Address.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Address.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.AddressSubClass.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.AddressSubClass.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.AddressSubClass.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.AddressSubClass.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Person.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Person.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Person.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/descriptors/test.oracle.models.simpleaggregate.Person.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/tables/ADDRESS.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/tables/ADDRESS.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/tables/ADDRESS.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/tables/ADDRESS.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/tables/PERSON.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/tables/PERSON.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/tables/PERSON.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/tables/PERSON.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/tables/SEQUENCE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/tables/SEQUENCE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleAggregate/tables/SEQUENCE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleAggregate/tables/SEQUENCE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/SimpleContact.mwp b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/SimpleContact.mwp
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/SimpleContact.mwp
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/SimpleContact.mwp
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.EmailAddress.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.EmailAddress.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.EmailAddress.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.EmailAddress.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.Person.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.Person.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.Person.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.Person.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PersonImpl.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PersonImpl.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PersonImpl.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PersonImpl.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/classes/test.oracle.models.contact.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.Contact.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.Contact.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.Contact.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.Contact.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.EmailAddress.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.EmailAddress.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.EmailAddress.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.EmailAddress.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PersonImpl.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PersonImpl.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PersonImpl.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PersonImpl.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PhoneNumber.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PhoneNumber.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PhoneNumber.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/descriptors/test.oracle.models.contact.PhoneNumber.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/EMAILADDRESS.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/EMAILADDRESS.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/EMAILADDRESS.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/EMAILADDRESS.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/PERSON.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/PERSON.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/PERSON.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/PERSON.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/PHONENUMBER.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/PHONENUMBER.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/PHONENUMBER.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/PHONENUMBER.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/SEQUENCE.xml b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/SEQUENCE.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/6.0/SimpleContact/tables/SEQUENCE.xml
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/6.0/SimpleContact/tables/SEQUENCE.xml
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/rename/eclipselinkPackageRename.properties b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/rename/eclipselinkPackageRename.properties
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/rename/eclipselinkPackageRename.properties
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/rename/eclipselinkPackageRename.properties
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/rename/packageRename-internal.properties b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/rename/packageRename-internal.properties
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/rename/packageRename-internal.properties
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/rename/packageRename-internal.properties
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/rename/packageRename.properties b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/rename/packageRename.properties
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/backwards-compatibility/rename/packageRename.properties
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/backwards-compatibility/rename/packageRename.properties
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/export/DirectAccessingEndToEndClient.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/export/DirectAccessingEndToEndClient.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/export/DirectAccessingEndToEndClient.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/export/DirectAccessingEndToEndClient.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/export/MethodAccessingEndToEndClient.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/export/MethodAccessingEndToEndClient.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/export/MethodAccessingEndToEndClient.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/export/MethodAccessingEndToEndClient.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/export/MyClassWithCalculatedImports.java b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/export/MyClassWithCalculatedImports.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/export/MyClassWithCalculatedImports.java
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/export/MyClassWithCalculatedImports.java
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/BasicSchemaTests/InvalidSchema.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/BasicSchemaTests/InvalidSchema.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/BasicSchemaTests/InvalidSchema.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/BasicSchemaTests/InvalidSchema.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/BasicSchemaTests/NonSpecSchema.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/BasicSchemaTests/NonSpecSchema.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/BasicSchemaTests/NonSpecSchema.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/BasicSchemaTests/NonSpecSchema.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/BasicSchemaTests/PoorlyFormedSchema.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/BasicSchemaTests/PoorlyFormedSchema.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/BasicSchemaTests/PoorlyFormedSchema.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/BasicSchemaTests/PoorlyFormedSchema.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicAttribute.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicAttribute.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicAttribute.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicAttribute.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexType.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexType.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexType.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexType.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexTypeWithComplexBaseType.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexTypeWithComplexBaseType.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexTypeWithComplexBaseType.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexTypeWithComplexBaseType.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexTypeWithReferences.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexTypeWithReferences.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexTypeWithReferences.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexTypeWithReferences.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexTypeWithSimpleBaseType.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexTypeWithSimpleBaseType.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicComplexTypeWithSimpleBaseType.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicComplexTypeWithSimpleBaseType.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicElementWithComplexType.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicElementWithComplexType.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicElementWithComplexType.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicElementWithComplexType.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicElementWithSimpleType.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicElementWithSimpleType.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicElementWithSimpleType.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicElementWithSimpleType.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSchema.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSchema.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSchema.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSchema.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSchemaWithComponentsAdded.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSchemaWithComponentsAdded.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSchemaWithComponentsAdded.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSchemaWithComponentsAdded.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSchemaWithComponentsRemoved.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSchemaWithComponentsRemoved.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSchemaWithComponentsRemoved.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSchemaWithComponentsRemoved.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSimpleType.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSimpleType.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicSimpleType.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicSimpleType.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicType_Complex.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicType_Complex.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicType_Complex.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicType_Complex.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicType_Simple.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicType_Simple.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/BasicType_Simple.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/BasicType_Simple.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/EmptySchema.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/EmptySchema.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/EmptySchema.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/EmptySchema.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/EmptySchemaWithTargetNS.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/EmptySchemaWithTargetNS.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/SingleSchemaTests/EmptySchemaWithTargetNS.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/SingleSchemaTests/EmptySchemaWithTargetNS.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/eis-employee.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/eis-employee.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/eis-employee.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/eis-employee.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/eis-project.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/eis-project.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/eis-project.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/eis-project.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/employee.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/employee.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/employee.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/employee.xsd
diff --git a/utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/employee_test.xsd b/utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/employee_test.xsd
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/mappingsplugin/resource/schema/employee_test.xsd
rename to utils/eclipselink.utils.workbench/mappingsplugin/src/test/resources/schema/employee_test.xsd
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/build.properties b/utils/eclipselink.utils.workbench/platformsmodel/build.properties
deleted file mode 100644
index f7e375b..0000000
--- a/utils/eclipselink.utils.workbench/platformsmodel/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-# set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Platforms Model
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-platformsmodel.jarfile=platformsmodel.jar
-platformsmodel.jarfile.src=platformsmodel_src.jar
-
-# Defines for build directories.
-compile.platformsmodel.resources=${_rootResourceDir}
-compile.platformsmodel.srcdir=${_rootSourceDir}
-compile.platformsmodel.destdir=${_classesDestDir}
-compile.platformsmodel.classpath= \
- ${_jarDestDir}/utility.jar;
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/build.xml b/utils/eclipselink.utils.workbench/platformsmodel/build.xml
deleted file mode 100644
index 4aec9a2..0000000
--- a/utils/eclipselink.utils.workbench/platformsmodel/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Platforms Model" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-platformsmodel, jar-platformsmodel"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${platformsmodel.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${platformsmodel.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-platformsmodel" depends="properties-init">
- <mkdir dir="${compile.platformsmodel.destdir}"/>
- <javac
- classpath="${compile.platformsmodel.classpath}"
- srcdir="${compile.platformsmodel.srcdir}"
- destdir="${compile.platformsmodel.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-platformsmodel" depends="jar-platformsmodel-lib, jar-platformsmodel-src"/>
-
- <target name="jar-platformsmodel-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${platformsmodel.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${platformsmodel.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.platformsmodel" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.platformsmodel.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-platformsmodel-src" depends="properties-init">
- <delete file="${_jarDestDir}/${platformsmodel.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${platformsmodel.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.platformsmodel" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.platformsmodel.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/pom.xml b/utils/eclipselink.utils.workbench/platformsmodel/pom.xml
new file mode 100644
index 0000000..b042259
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/platformsmodel/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsmodel</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Platforms Model</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/AbstractJDBCTypeToJavaTypeDeclarationMapping.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/AbstractJDBCTypeToJavaTypeDeclarationMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/AbstractJDBCTypeToJavaTypeDeclarationMapping.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/AbstractJDBCTypeToJavaTypeDeclarationMapping.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/CorruptXMLException.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/CorruptXMLException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/CorruptXMLException.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/CorruptXMLException.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatform.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatform.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatform.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatform.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatformRepository.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatformRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatformRepository.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/DatabasePlatformRepository.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/DatabaseType.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/DatabaseType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/DatabaseType.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/DatabaseType.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCType.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCType.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCType.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeRepository.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeRepository.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeRepository.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToDatabaseTypeMapping.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToDatabaseTypeMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToDatabaseTypeMapping.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToDatabaseTypeMapping.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToJavaTypeDeclarationMapping.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToJavaTypeDeclarationMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToJavaTypeDeclarationMapping.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JDBCTypeToJavaTypeDeclarationMapping.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclaration.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclaration.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclarationToJDBCTypeMapping.java b/utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclarationToJDBCTypeMapping.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsmodel/source/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclarationToJDBCTypeMapping.java
rename to utils/eclipselink.utils.workbench/platformsmodel/src/main/java/org/eclipse/persistence/tools/workbench/platformsmodel/JavaTypeDeclarationToJDBCTypeMapping.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/build.properties b/utils/eclipselink.utils.workbench/platformsplugin/build.properties
deleted file mode 100644
index 4fdd555..0000000
--- a/utils/eclipselink.utils.workbench/platformsplugin/build.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Platforms Plug-in
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-platformsplugin.jarfile=platformsplugin.jar
-platformsplugin.jarfile.src=platformsplugin_src.jar
-
-# Defines for build directories.
-compile.platformsplugin.resources=${_rootResourceDir}
-compile.platformsplugin.srcdir=${_rootSourceDir}
-compile.platformsplugin.destdir=${_classesDestDir}
-compile.platformsplugin.classpath= \
- ${_jarDestDir}/platformsmodel.jar; \
- ${_jarDestDir}/framework.jar; \
- ${_jarDestDir}/uitools.jar; \
- ${_jarDestDir}/utility.jar
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/build.xml b/utils/eclipselink.utils.workbench/platformsplugin/build.xml
deleted file mode 100644
index f095294..0000000
--- a/utils/eclipselink.utils.workbench/platformsplugin/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Platforms Plug-in" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-platformsplugin, jar-platformsplugin"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${platformsplugin.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${platformsplugin.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-platformsplugin" depends="properties-init">
- <mkdir dir="${compile.platformsplugin.destdir}"/>
- <javac
- classpath="${compile.platformsplugin.classpath}"
- srcdir="${compile.platformsplugin.srcdir}"
- destdir="${compile.platformsplugin.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-platformsplugin" depends="jar-platformsplugin-lib, jar-platformsplugin-src"/>
-
- <target name="jar-platformsplugin-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${platformsplugin.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${platformsplugin.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.platformsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.platformsplugin.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-platformsplugin-src" depends="properties-init">
- <delete file="${_jarDestDir}/${platformsplugin.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${platformsplugin.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.platformsplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.platformsplugin.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/pom.xml b/utils/eclipselink.utils.workbench/platformsplugin/pom.xml
new file mode 100644
index 0000000..efd9286
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/platformsplugin/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsplugin</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Platforms Plug-in</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsmodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.config</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-config</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/config</outputDirectory>
+ <includeArtifactIds>workbench.config</includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.eclipse.persistence:workbench.config</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}/config</additionalClasspathElement>
+ </additionalClasspathElements>
+ <includes>
+ <include>org.eclipse.persistence.tools.workbench.test.platformsplugin.AllPlatformsPluginTests</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/HelpAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/HelpAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/HelpAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/HelpAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/NewDatabasePlatformRepositoryAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/NewDatabasePlatformRepositoryAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/NewDatabasePlatformRepositoryAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/NewDatabasePlatformRepositoryAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformComponentFactory.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformComponentFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformComponentFactory.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformComponentFactory.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsApplicationNode.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsApplicationNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsApplicationNode.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsApplicationNode.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPlugin.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPlugin.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPlugin.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPlugin.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginFactory.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginFactory.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginFactory.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginIconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginIconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginIconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginIconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginResourceBundle.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginResourceBundle.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/PlatformsPluginResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/AddDatabaseTypeAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/AddDatabaseTypeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/AddDatabaseTypeAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/AddDatabaseTypeAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/CloneDatabasePlatformAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/CloneDatabasePlatformAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/CloneDatabasePlatformAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/CloneDatabasePlatformAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformJDBCPropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformJDBCPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformJDBCPropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformJDBCPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformNode.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformNode.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformNode.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DatabasePlatformTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DeleteDatabasePlatformAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DeleteDatabasePlatformAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DeleteDatabasePlatformAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/DeleteDatabasePlatformAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/RenameDatabasePlatformAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/RenameDatabasePlatformAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/RenameDatabasePlatformAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/platform/RenameDatabasePlatformAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesNode.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesNode.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/preferences/PlatformsPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/AddDatabasePlatformAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/AddDatabasePlatformAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/AddDatabasePlatformAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/AddDatabasePlatformAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJDBCMappingsPropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJDBCMappingsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJDBCMappingsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJDBCMappingsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJavaMappingsPropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJavaMappingsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJavaMappingsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryJavaMappingsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryNode.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryNode.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryNode.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/DatabasePlatformRepositoryTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/RenameDatabasePlatformRepositoryAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/RenameDatabasePlatformRepositoryAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/RenameDatabasePlatformRepositoryAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/repository/RenameDatabasePlatformRepositoryAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypeNode.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypeNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypeNode.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypeNode.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypePropertiesPage.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypePropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypePropertiesPage.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DatabaseTypePropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DeleteDatabaseTypeAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DeleteDatabaseTypeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DeleteDatabaseTypeAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/DeleteDatabaseTypeAction.java
diff --git a/utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/RenameDatabaseTypeAction.java b/utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/RenameDatabaseTypeAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/platformsplugin/source/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/RenameDatabaseTypeAction.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/main/java/org/eclipse/persistence/tools/workbench/platformsplugin/ui/type/RenameDatabaseTypeAction.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/AllPlatformsPluginTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/AllPlatformsPluginTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/AllPlatformsPluginTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/AllPlatformsPluginTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/TestDatabasePlatformRepositoryFactory.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/TestDatabasePlatformRepositoryFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/TestDatabasePlatformRepositoryFactory.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/TestDatabasePlatformRepositoryFactory.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllDatabasePlatformTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllDatabasePlatformTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllDatabasePlatformTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllDatabasePlatformTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllModelTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllModelTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/AllModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_7Tests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_7Tests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_7Tests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_7Tests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_8Tests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_8Tests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_8Tests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DB2_8Tests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformRepositoryTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformRepositoryTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabasePlatformTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabaseTypeTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabaseTypeTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabaseTypeTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DatabaseTypeTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DbaseTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DbaseTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DbaseTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/DbaseTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JDBCTypeRepositoryTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JDBCTypeRepositoryTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JDBCTypeRepositoryTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JDBCTypeRepositoryTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JavaTypeDeclarationTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JavaTypeDeclarationTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JavaTypeDeclarationTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/JavaTypeDeclarationTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MSAccessTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MSAccessTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MSAccessTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MSAccessTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL4Tests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL4Tests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL4Tests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL4Tests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL5Tests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL5Tests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL5Tests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/MySQL5Tests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gR2Tests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gR2Tests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gR2Tests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gR2Tests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle10gTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle8iTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle8iTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle8iTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle8iTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle9iTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle9iTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle9iTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Oracle9iTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/OracleTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/OracleTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/OracleTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/OracleTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/PlatformTests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/PlatformTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/PlatformTests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/PlatformTests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_0Tests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_0Tests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_0Tests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_0Tests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_5Tests.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_5Tests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_5Tests.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/model/Sybase12_5Tests.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/AbstractPropertiesPageTest.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/AbstractPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/AbstractPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/AbstractPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformRepositoryTabbedPropertiesPageTest.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformRepositoryTabbedPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformRepositoryTabbedPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformRepositoryTabbedPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformTabbedPropertiesPageTest.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformTabbedPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformTabbedPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabasePlatformTabbedPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabaseTypePropertiesPageTest.java b/utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabaseTypePropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/platformsplugin/source/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabaseTypePropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/platformsplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/platformsplugin/ui/DatabaseTypePropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench/pom.xml b/utils/eclipselink.utils.workbench/pom.xml
new file mode 100644
index 0000000..fcb6b9f
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/pom.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>EclipseLink Workbench</name>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.core</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.oracle</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.10.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.uitools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsmodel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsplugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsmodel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsio</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.iconlib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.mappingsplugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.scplugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>elmwcore</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselinkmw</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>javax.resource-api</artifactId>
+ <version>1.7.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>${eclipselink.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>2.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.nosql</artifactId>
+ <version>${eclipselink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.0</version>
+ <configuration>
+ <systemPropertyVariables>
+ <java.awt.headless>true</java.awt.headless>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>EclipseLink Workbench</Specification-Title>
+ <Specification-Vendor>EclipseLink Project</Specification-Vendor>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Implementation-Title>${mf.implementation.title}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>EclipseLink Project</Implementation-Vendor>
+ <Release-Designation>EclipseLink Workbench ${project.version}</Release-Designation>
+ <Library-Designation>${mf.library.designation}</Library-Designation>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.1</version>
+ <configuration>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <additionalJOptions>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ </additionalJOptions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <mf.library.designation>EclipseLink Mapping Workbench ${project.name}</mf.library.designation>
+ <mf.implementation.title>${project.groupId}.${project.artifactId}</mf.implementation.title>
+ <eclipselink.version>2.7.2</eclipselink.version>
+ <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
+ </properties>
+
+ <modules>
+ <module>utility</module>
+ <module>platformsmodel</module>
+ <module>mappingsmodel</module>
+ <module>mappingsio</module>
+ <module>elmwcore</module>
+ <module>config</module>
+ <module>iconlib</module>
+ <module>uitools</module>
+ <module>framework</module>
+ <module>platformsplugin</module>
+ <module>mappingsplugin</module>
+ <module>scplugin</module>
+ <module>eclipselinkmw</module>
+ <module>distribution</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <createSourcesJar>true</createSourcesJar>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/scplugin/build.properties b/utils/eclipselink.utils.workbench/scplugin/build.properties
deleted file mode 100644
index 23ab948..0000000
--- a/utils/eclipselink.utils.workbench/scplugin/build.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench SC Plug-in
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-scplugin.jarfile=scplugin.jar
-scplugin.jarfile.src=scplugin_src.jar
-
-# Defines for build directories.
-compile.scplugin.resources=${_rootResourceDir}
-compile.scplugin.srcdir=${_rootSourceDir}
-compile.scplugin.destdir=${_classesDestDir}
-compile.scplugin.classpath= \
- ${_jarDestDir}/platformsplugin.jar; \
- ${_jarDestDir}/framework.jar; \
- ${_jarDestDir}/uitools.jar; \
- ${_jarDestDir}/platformsmodel.jar; \
- ${_jarDestDir}/utility.jar; \
- ${_eclipselinkJar}
diff --git a/utils/eclipselink.utils.workbench/scplugin/build.xml b/utils/eclipselink.utils.workbench/scplugin/build.xml
deleted file mode 100644
index c7880bc..0000000
--- a/utils/eclipselink.utils.workbench/scplugin/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build SC Plug-in" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-scplugin, jar-scplugin"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${scplugin.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${scplugin.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-scplugin" depends="properties-init">
- <mkdir dir="${compile.scplugin.destdir}"/>
- <javac
- classpath="${compile.scplugin.classpath}"
- srcdir="${compile.scplugin.srcdir}"
- destdir="${compile.scplugin.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-scplugin" depends="jar-scplugin-lib, jar-scplugin-src"/>
-
- <target name="jar-scplugin-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${scplugin.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${scplugin.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.scplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.scplugin.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-scplugin-src" depends="properties-init">
- <delete file="${_jarDestDir}/${scplugin.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${scplugin.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.scplugin" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.scplugin.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/scplugin/pom.xml b/utils/eclipselink.utils.workbench/scplugin/pom.xml
new file mode 100644
index 0000000..5456c8e
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/scplugin/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.scplugin</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>SC Plug-in</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.platformsplugin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.config</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-config</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/config</outputDirectory>
+ <includeArtifactIds>workbench.config</includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.eclipse.persistence:workbench.config</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}/config</additionalClasspathElement>
+ </additionalClasspathElements>
+ <includes>
+ <include>org.eclipse.persistence.tools.workbench.test.scplugin.AllSCTests</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPlugin.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPlugin.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPlugin.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPlugin.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPluginFactory.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPluginFactory.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPluginFactory.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPluginFactory.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPluginIconResourceFileNameMap.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPluginIconResourceFileNameMap.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPluginIconResourceFileNameMap.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPluginIconResourceFileNameMap.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPluginResourceBundle.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPluginResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCPluginResourceBundle.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCPluginResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsConstants.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsConstants.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsConstants.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsConstants.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsResourceBundle.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsResourceBundle.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsResourceBundle.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/SCProblemsResourceBundle.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/EisPlatformManager.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/EisPlatformManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/EisPlatformManager.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/EisPlatformManager.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/SCModel.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/SCModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/SCModel.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/SCModel.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/SCPlatformManager.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/SCPlatformManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/SCPlatformManager.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/SCPlatformManager.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/SequenceType.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/SequenceType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/SequenceType.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/SequenceType.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/ServerPlatformManager.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/ServerPlatformManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/ServerPlatformManager.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/ServerPlatformManager.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CommandsAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CommandsAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CommandsAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CommandsAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPolicyAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPolicyAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPolicyAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPolicyAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPoolAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPoolAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPoolAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ConnectionPoolAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CustomServerPlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CustomServerPlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CustomServerPlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/CustomServerPlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DataSource.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DataSource.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DataSource.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DataSource.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseLoginAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseLoginAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseLoginAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseLoginAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseSessionAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseSessionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseSessionAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DatabaseSessionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSequenceAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSequenceAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSequenceAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSequenceAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSessionLogAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSessionLogAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSessionLogAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DefaultSessionLogAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DiscoveryAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DiscoveryAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DiscoveryAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/DiscoveryAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/EISLoginAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/EISLoginAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/EISLoginAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/EISLoginAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JBossPlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JBossPlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JBossPlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JBossPlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JMSTopicTransportManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JMSTopicTransportManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JMSTopicTransportManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JMSTopicTransportManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingService.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingService.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingService.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingService.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingServiceAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingServiceAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingServiceAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JNDINamingServiceAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JavaLogAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JavaLogAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JavaLogAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/JavaLogAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LogAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LogAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LogAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LogAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoggingOptionsAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoggingOptionsAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoggingOptionsAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoggingOptionsAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginHandler.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginHandler.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/LoginHandler.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NativeSequenceAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NativeSequenceAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NativeSequenceAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NativeSequenceAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NoLogAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NoLogAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NoLogAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NoLogAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Nominative.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Nominative.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Nominative.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Nominative.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullLoginAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullLoginAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullLoginAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullLoginAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullServerPlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullServerPlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullServerPlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/NullServerPlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PoolsAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PoolsAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PoolsAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PoolsAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectClassAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectClassAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectClassAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectClassAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectXMLAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectXMLAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectXMLAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ProjectXMLAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Property.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Property.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Property.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/Property.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PropertyAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PropertyAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PropertyAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/PropertyAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIIIOPTransportManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIIIOPTransportManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIIIOPTransportManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIIIOPTransportManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIRegistryNamingServiceAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIRegistryNamingServiceAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIRegistryNamingServiceAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMIRegistryNamingServiceAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMITransportManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMITransportManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMITransportManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RMITransportManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ReadConnectionPoolAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ReadConnectionPoolAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ReadConnectionPoolAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ReadConnectionPoolAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RemoteCommandManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RemoteCommandManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RemoteCommandManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RemoteCommandManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RootSCAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RootSCAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RootSCAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/RootSCAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SCAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SCAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SCAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SCAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequenceAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequenceAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequenceAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequenceAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequencingAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequencingAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequencingAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SequencingAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerLogAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerLogAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerLogAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerLogAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatform.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatform.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatform.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatform.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerPlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerSessionAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerSessionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerSessionAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/ServerSessionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionBrokerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionBrokerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionBrokerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionBrokerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionEventManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionEventManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionEventManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SessionEventManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunAS9PlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunAS9PlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunAS9PlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunAS9PlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunCORBATransportManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunCORBATransportManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunCORBATransportManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/SunCORBATransportManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TableSequenceAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TableSequenceAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TableSequenceAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TableSequenceAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TopLinkSessionsAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TopLinkSessionsAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TopLinkSessionsAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TopLinkSessionsAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TransportManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TransportManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TransportManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/TransportManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UnaryTableSequenceAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UnaryTableSequenceAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UnaryTableSequenceAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UnaryTableSequenceAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UserDefinedTransportManagerAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UserDefinedTransportManagerAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UserDefinedTransportManagerAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/UserDefinedTransportManagerAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_10_PlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_10_PlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_10_PlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_10_PlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_9_PlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_9_PlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_9_PlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebLogic_9_PlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_6_1_PlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_6_1_PlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_6_1_PlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_6_1_PlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_7_0_PlatformAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_7_0_PlatformAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_7_0_PlatformAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WebSphere_7_0_PlatformAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WriteConnectionPoolAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WriteConnectionPoolAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WriteConnectionPoolAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/WriteConnectionPoolAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/XMLLoginAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/XMLLoginAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/XMLLoginAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/adapter/XMLLoginAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/ClassRepository.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/ClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/ClassRepository.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/ClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCClassRepository.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCClassRepository.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCClassRepository.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCClassRepository.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsProperties.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsProperties.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsProperties.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsProperties.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsPropertiesManager.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsPropertiesManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsPropertiesManager.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/model/meta/SCSessionsPropertiesManager.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/AddNewSessionsAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/AddNewSessionsAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/AddNewSessionsAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/AddNewSessionsAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/OracleHelpAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/OracleHelpAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/OracleHelpAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/OracleHelpAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/SCApplicationNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/SCApplicationNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/SCApplicationNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/SCApplicationNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerSessionsPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerSessionsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerSessionsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerSessionsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionBrokerTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListDialog.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListDialog.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListDialog.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/broker/SessionsListPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractLoginPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractLoginPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractLoginPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractLoginPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractRdbmsLoginPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractRdbmsLoginPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractRdbmsLoginPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/AbstractRdbmsLoginPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/EisLoginPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/EisLoginPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/EisLoginPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/EisLoginPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/LoginExternalOptionsPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/LoginExternalOptionsPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/LoginExternalOptionsPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/LoginExternalOptionsPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsLoginPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsLoginPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsLoginPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsLoginPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsPoolLoginPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsPoolLoginPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsPoolLoginPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/login/RdbmsPoolLoginPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddNewNamedPoolAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddNewNamedPoolAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddNewNamedPoolAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddNewNamedPoolAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddReadPoolAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddReadPoolAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddReadPoolAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddReadPoolAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddSequencePoolAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddSequencePoolAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddSequencePoolAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddSequencePoolAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddWritePoolAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddWritePoolAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddWritePoolAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/AddWritePoolAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/DeletePoolAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/DeletePoolAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/DeletePoolAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/DeletePoolAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisPoolTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisPoolTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisPoolTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisPoolTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisReadPoolTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisReadPoolTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisReadPoolTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/EisReadPoolTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/NamedConnectionPoolCreationDialog.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/NamedConnectionPoolCreationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/NamedConnectionPoolCreationDialog.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/NamedConnectionPoolCreationDialog.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/PoolTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RdbmsReadPoolTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RdbmsReadPoolTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RdbmsReadPoolTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RdbmsReadPoolTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RenamePoolAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RenamePoolAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RenamePoolAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/RenamePoolAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/WritePoolTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/WritePoolTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/WritePoolTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/WritePoolTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/AbstractReadPoolLoginPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/AbstractReadPoolLoginPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/AbstractReadPoolLoginPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/AbstractReadPoolLoginPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/ConnectionCountPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/ConnectionCountPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/ConnectionCountPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/ConnectionCountPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisPoolLoginPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisPoolLoginPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisPoolLoginPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisPoolLoginPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/LoginPropertiesPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/LoginPropertiesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/LoginPropertiesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/LoginPropertiesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/PoolGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/PoolGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/PoolGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/PoolGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/write/PoolGeneralPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/write/PoolGeneralPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/write/PoolGeneralPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/pool/write/PoolGeneralPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/NewNamesPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/PlatformPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/preferences/SCPreferencesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewBrokerAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewBrokerAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewBrokerAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewBrokerAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewSessionAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewSessionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewSessionAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/AddNewSessionAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/BrokerCreationDialog.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/BrokerCreationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/BrokerCreationDialog.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/BrokerCreationDialog.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteBrokerAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteBrokerAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteBrokerAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteBrokerAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteSessionAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteSessionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteSessionAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/DeleteSessionAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/ProjectPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameDialog.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameDialog.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameDialog.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameSessionAction.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameSessionAction.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameSessionAction.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/RenameSessionAction.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionCreationDialog.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionCreationDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionCreationDialog.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionCreationDialog.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsListPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsListPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsListPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsListPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/project/SessionsNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/DatabaseSessionNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/DatabaseSessionNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/DatabaseSessionNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/DatabaseSessionNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/EisSessionTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/EisSessionTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/EisSessionTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/EisSessionTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/RdbmsSessionTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/RdbmsSessionTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/RdbmsSessionTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/RdbmsSessionTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/ServerSessionNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/ServerSessionNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/ServerSessionNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/ServerSessionNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionNode.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionNode.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionNode.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/SessionTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/XmlSessionTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/XmlSessionTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/XmlSessionTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/XmlSessionTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionMultipleProjectsPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionMultipleProjectsPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionMultipleProjectsPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionMultipleProjectsPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionProjectlPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionProjectlPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionProjectlPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/AbstractSessionProjectlPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/EventListenersPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/EventListenersPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/EventListenersPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/EventListenersPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/LoggingOptionsPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/LoggingOptionsPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/LoggingOptionsPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/LoggingOptionsPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/ProjectTypeEditDialog.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/ProjectTypeEditDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/ProjectTypeEditDialog.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/ProjectTypeEditDialog.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionConnectionPolicyPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionConnectionPolicyPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionConnectionPolicyPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionConnectionPolicyPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionLoggingPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionLoggingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionLoggingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionLoggingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionMultipleProjectsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionOptionsPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionOptionsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionOptionsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionOptionsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionProjectPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionServerPlatformPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionServerPlatformPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionServerPlatformPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/SessionServerPlatformPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionMultipleProjectsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/basic/XmlSessionProjectPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/AbstractTransportManagerPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/AbstractTransportManagerPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/AbstractTransportManagerPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/AbstractTransportManagerPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/JNDINamingServicePane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/JNDINamingServicePane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/JNDINamingServicePane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/JNDINamingServicePane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMJMSPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMJMSPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMJMSPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMJMSPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMRMIPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMRMIPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMRMIPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMRMIPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMSunCORBAPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMSunCORBAPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMSunCORBAPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMSunCORBAPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMUserDefinedPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMUserDefinedPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMUserDefinedPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RCMUserDefinedPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RemoteCommandManagerPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RemoteCommandManagerPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RemoteCommandManagerPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/RemoteCommandManagerPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/SessionClusteringPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/SessionClusteringPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/SessionClusteringPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/clustering/SessionClusteringPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/AbstractLoginPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/AbstractLoginPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/AbstractLoginPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/AbstractLoginPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/DefaultSequencePropertyPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/DefaultSequencePropertyPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/DefaultSequencePropertyPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/DefaultSequencePropertyPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisConnectionPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisConnectionPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisConnectionPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisConnectionPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisLoginTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisLoginTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisLoginTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/EisLoginTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/LoginPropertiesPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/LoginPropertiesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/LoginPropertiesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/LoginPropertiesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NativeSequencePropertyPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NativeSequencePropertyPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NativeSequencePropertyPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NativeSequencePropertyPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NewSequenceDialog.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NewSequenceDialog.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NewSequenceDialog.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/NewSequenceDialog.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsConnectionPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsConnectionPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsConnectionPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsConnectionPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsLoginTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsLoginTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsLoginTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsLoginTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsOptionsPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsOptionsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsOptionsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsOptionsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsPropertiesPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsPropertiesPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsPropertiesPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/RdbmsPropertiesPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencePropertyPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencePropertyPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencePropertyPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencePropertyPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencingPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencingPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencingPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/SequencingPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/StructConvertersPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/StructConvertersPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/StructConvertersPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/StructConvertersPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/TableSequencePropertyPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/TableSequencePropertyPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/TableSequencePropertyPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/TableSequencePropertyPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/UnaryTableSequencePropertyPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/UnaryTableSequencePropertyPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/UnaryTableSequencePropertyPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/UnaryTableSequencePropertyPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLLoginTabbedPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLLoginTabbedPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLLoginTabbedPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLLoginTabbedPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLOptionsPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLOptionsPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLOptionsPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/session/login/XMLOptionsPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractDisplayableTranslatorAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractDisplayableTranslatorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractDisplayableTranslatorAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractDisplayableTranslatorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractSessionsListPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractSessionsListPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractSessionsListPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/AbstractSessionsListPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/BooleanCellRendererAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/BooleanCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/BooleanCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/BooleanCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ClassChooserTools.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ClassChooserTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ClassChooserTools.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ClassChooserTools.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ComboBoxSelection.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ComboBoxSelection.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ComboBoxSelection.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ComboBoxSelection.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolCellRendererAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolDisplayableTranslatorAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolDisplayableTranslatorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolDisplayableTranslatorAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ConnectionPoolDisplayableTranslatorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddress.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddress.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddress.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddress.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddressFormatter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddressFormatter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddressFormatter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/IPAddressFormatter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/InfoPropertiesPage.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/InfoPropertiesPage.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/InfoPropertiesPage.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/InfoPropertiesPage.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectCellRendererAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectDisplayableTranslatorAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectDisplayableTranslatorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectDisplayableTranslatorAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/ProjectDisplayableTranslatorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertiesPageContainer.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertiesPageContainer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertiesPageContainer.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertiesPageContainer.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertyPane.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertyPane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertyPane.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/PropertyPane.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionCellRendererAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionDisplayableTranslatorAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionDisplayableTranslatorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/scplugin/source/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionDisplayableTranslatorAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/main/java/org/eclipse/persistence/tools/workbench/scplugin/ui/tools/SessionDisplayableTranslatorAdapter.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/AllSCTests.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/AllSCTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/AllSCTests.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/AllSCTests.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/AbstractSessionsXmlTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/AbstractSessionsXmlTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/AbstractSessionsXmlTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/AbstractSessionsXmlTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/TopLinkSessionsAdapter.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/TopLinkSessionsAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/TopLinkSessionsAdapter.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/adapter/TopLinkSessionsAdapter.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/SCTestNodeManager.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/SCTestNodeManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/SCTestNodeManager.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/SCTestNodeManager.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCAbstractUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCAbstractUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCAbstractUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCAbstractUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCDatabaseLoginUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCDatabaseLoginUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCDatabaseLoginUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCDatabaseLoginUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCExternalConnectionPoolingUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCExternalConnectionPoolingUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCExternalConnectionPoolingUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCExternalConnectionPoolingUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingLevelUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingLevelUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingLevelUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingLevelUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingTypeUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingTypeUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingTypeUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoggingTypeUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoginUserUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoginUserUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoginUserUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCLoginUserUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassListUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassListUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassListUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassListUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCProjectClassUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRcmUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRcmUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRcmUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRcmUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRemoteCommandManagerUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRemoteCommandManagerUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRemoteCommandManagerUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCRemoteCommandManagerUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCSessionUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCSessionUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCSessionUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/SCSessionUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/AddNewSessionActionUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/AddNewSessionActionUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/AddNewSessionActionUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/AddNewSessionActionUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCDialogUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCDialogUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCDialogUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCDialogUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCSessionCreationDialogUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCSessionCreationDialogUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCSessionCreationDialogUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/app/swing/dialog/SCSessionCreationDialogUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/SCToplinkSessionsUITest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/SCToplinkSessionsUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/SCToplinkSessionsUITest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/SCToplinkSessionsUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AbstractAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AbstractAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AbstractAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AbstractAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AllSCAdapterTests.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AllSCAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AllSCAdapterTests.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/AllSCAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseLoginAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseLoginAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseLoginAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseLoginAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseSessionAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseSessionAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseSessionAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DatabaseSessionAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DefaultSessionLogAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DefaultSessionLogAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DefaultSessionLogAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/DefaultSessionLogAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/ReadConnectionPoolAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/ReadConnectionPoolAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/ReadConnectionPoolAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/ReadConnectionPoolAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SCPlatformManagerTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SCPlatformManagerTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SCPlatformManagerTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SCPlatformManagerTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SessionBrokerAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SessionBrokerAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SessionBrokerAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/SessionBrokerAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/TopLinkSessionsAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/TopLinkSessionsAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/TopLinkSessionsAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/adapter/TopLinkSessionsAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/meta/SCSessionsPropertiesIOTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/meta/SCSessionsPropertiesIOTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/meta/SCSessionsPropertiesIOTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/meta/SCSessionsPropertiesIOTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/AllSCReadTests.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/AllSCReadTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/AllSCReadTests.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/AllSCReadTests.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/DatabaseSessionTests.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/DatabaseSessionTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/DatabaseSessionTests.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/DatabaseSessionTests.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/LoadTopLinkSessionsTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/LoadTopLinkSessionsTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/LoadTopLinkSessionsTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/LoadTopLinkSessionsTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/ModelLoadTests.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/ModelLoadTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/ModelLoadTests.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/ModelLoadTests.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/SequenceTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/SequenceTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/SequenceTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/read/SequenceTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/DatabaseSessionWriteTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/DatabaseSessionWriteTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/DatabaseSessionWriteTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/DatabaseSessionWriteTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/SessionsXMLSchemaWriteTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/SessionsXMLSchemaWriteTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/SessionsXMLSchemaWriteTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/model/write/SessionsXMLSchemaWriteTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AbstractPanelTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AbstractPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AbstractPanelTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AbstractPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AllSCUITests.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AllSCUITests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AllSCUITests.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/AllSCUITests.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/SCAbstractPanelTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/SCAbstractPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/SCAbstractPanelTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/SCAbstractPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/broker/SessionBrokerGeneralPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/broker/SessionBrokerGeneralPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/broker/SessionBrokerGeneralPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/broker/SessionBrokerGeneralPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/AbstractLoginPaneTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/AbstractLoginPaneTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/AbstractLoginPaneTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/AbstractLoginPaneTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/EisLoginPaneTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/EisLoginPaneTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/EisLoginPaneTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/EisLoginPaneTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/LoginExternalOptionsPaneTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/LoginExternalOptionsPaneTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/LoginExternalOptionsPaneTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/LoginExternalOptionsPaneTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/RdbmsLoginPaneTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/RdbmsLoginPaneTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/RdbmsLoginPaneTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/login/RdbmsLoginPaneTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractPoolPanelTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractPoolPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractPoolPanelTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractPoolPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractReadPoolPanelTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractReadPoolPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractReadPoolPanelTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/AbstractReadPoolPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/ConnectionCountPaneTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/ConnectionCountPaneTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/ConnectionCountPaneTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/ConnectionCountPaneTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisPoolLoginPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisPoolLoginPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisPoolLoginPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisPoolLoginPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/EisReadPoolLoginPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/PoolGeneralPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/PoolGeneralPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/PoolGeneralPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/PoolGeneralPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsPoolLoginPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/pool/basic/RdbmsReadPoolLoginPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/project/ProjectPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/project/ProjectPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/project/ProjectPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/project/ProjectPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/AbstractSessionPanelTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/AbstractSessionPanelTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/AbstractSessionPanelTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/AbstractSessionPanelTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionLoggingPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionLoggingPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionLoggingPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionLoggingPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionOptionsPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionOptionsPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionOptionsPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/basic/SessionOptionsPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsConnectionPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsConnectionPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsConnectionPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsConnectionPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsOptionsPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsOptionsPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsOptionsPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsOptionsPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsSequencingPropertiesPageTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsSequencingPropertiesPageTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsSequencingPropertiesPageTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/session/login/RdbmsSequencingPropertiesPageTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/AllSCUIToolsTests.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/AllSCUIToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/AllSCUIToolsTests.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/AllSCUIToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/BooleanCellRendererAdapterTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/BooleanCellRendererAdapterTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/BooleanCellRendererAdapterTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/BooleanCellRendererAdapterTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/IPAddressTest.java b/utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/IPAddressTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/source/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/IPAddressTest.java
rename to utils/eclipselink.utils.workbench/scplugin/src/test/java/org/eclipse/persistence/tools/workbench/test/scplugin/ui/tools/IPAddressTest.java
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/9.0.4/sessions1.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/9.0.4/sessions1.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/9.0.4/sessions1.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/9.0.4/sessions1.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/9.0.4/sessions2.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/9.0.4/sessions2.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/9.0.4/sessions2.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/9.0.4/sessions2.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/DatabaseSessions-ReadTest.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/DatabaseSessions-ReadTest.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/DatabaseSessions-ReadTest.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/DatabaseSessions-ReadTest.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/ServerSessions-ReadTest.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/ServerSessions-ReadTest.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/ServerSessions-ReadTest.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/ServerSessions-ReadTest.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/ServerSessionsEIS-ReadTest.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/ServerSessionsEIS-ReadTest.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/ServerSessionsEIS-ReadTest.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/ServerSessionsEIS-ReadTest.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/XMLSchemaDatabaseSession.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/XMLSchemaDatabaseSession.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/XMLSchemaDatabaseSession.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/XMLSchemaDatabaseSession.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/XMLSchemaServerSession.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/XMLSchemaServerSession.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/XMLSchemaServerSession.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/XMLSchemaServerSession.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/XMLSchemaSessions.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/XMLSchemaSessions.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/XMLSchemaSessions.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/XMLSchemaSessions.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/sc.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/sc.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/SessionsXMLTestModel/sc.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/SessionsXMLTestModel/sc.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sc.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sc.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sc.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sc.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_DefaultSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_DefaultSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_DefaultSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_DefaultSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_MultipleSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_MultipleSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_MultipleSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_MultipleSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_NativeSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_NativeSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_NativeSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_NativeSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_TableSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_TableSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_TableSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_TableSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_UnaryTableSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_UnaryTableSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/DefaultSequence_UnaryTableSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/DefaultSequence_UnaryTableSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/NoDefaultSequence_MultipleSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/NoDefaultSequence_MultipleSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/NoDefaultSequence_MultipleSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/NoDefaultSequence_MultipleSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/NoSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/NoSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/NoSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/NoSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/UnaryTableSequence.xml b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/UnaryTableSequence.xml
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/sequence/UnaryTableSequence.xml
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/sequence/UnaryTableSequence.xml
diff --git a/utils/eclipselink.utils.workbench.test/scplugin/resource/toplink.sessions.xml.zip b/utils/eclipselink.utils.workbench/scplugin/src/test/resources/toplink.sessions.xml.zip
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/scplugin/resource/toplink.sessions.xml.zip
rename to utils/eclipselink.utils.workbench/scplugin/src/test/resources/toplink.sessions.xml.zip
Binary files differ
diff --git a/utils/eclipselink.utils.workbench/uitools/build.properties b/utils/eclipselink.utils.workbench/uitools/build.properties
deleted file mode 100644
index ac88310..0000000
--- a/utils/eclipselink.utils.workbench/uitools/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench UITools Library
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-uitools.jarfile=uitools.jar
-uitools.jarfile.src=uitools_src.jar
-
-# Defines for build directories.
-compile.uitools.resources=${_rootResourceDir}
-compile.uitools.srcdir=${_rootSourceDir}
-compile.uitools.destdir=${_classesDestDir}
-compile.uitools.classpath= \
- ${_jarDestDir}/utility.jar
diff --git a/utils/eclipselink.utils.workbench/uitools/build.xml b/utils/eclipselink.utils.workbench/uitools/build.xml
deleted file mode 100644
index 1bdd646..0000000
--- a/utils/eclipselink.utils.workbench/uitools/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build UITools Library" default="build.all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-uitools, jar-uitools"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${uitools.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${uitools.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-uitools" depends="properties-init">
- <mkdir dir="${compile.uitools.destdir}"/>
- <javac
- classpath="${compile.uitools.classpath}"
- srcdir="${compile.uitools.srcdir}"
- destdir="${compile.uitools.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-uitools" depends="jar-uitools-lib, jar-uitools-src"/>
-
- <target name="jar-uitools-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${uitools.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${uitools.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.uitools" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.uitools.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-uitools-src" depends="properties-init">
- <delete file="${_jarDestDir}/${uitools.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${uitools.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.uitools" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.uitools.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/uitools/pom.xml b/utils/eclipselink.utils.workbench/uitools/pom.xml
new file mode 100644
index 0000000..08fedd0
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/uitools/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.uitools</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>UITools Library</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org.eclipse.persistence.tools.workbench.test.uitools.AllUIToolsTests</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/AWTExceptionHandler.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/AWTExceptionHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/AWTExceptionHandler.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/AWTExceptionHandler.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/CancelException.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/CancelException.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/CancelException.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/CancelException.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/ComponentEnabler.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/ComponentEnabler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/ComponentEnabler.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/ComponentEnabler.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/ComponentVisibilityEnabler.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/ComponentVisibilityEnabler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/ComponentVisibilityEnabler.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/ComponentVisibilityEnabler.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/Console.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/Console.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/Console.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/Console.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/Displayable.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/Displayable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/Displayable.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/Displayable.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/DisplayableAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/DisplayableAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/DisplayableAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/DisplayableAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/DisplayableStringConverter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/DisplayableStringConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/DisplayableStringConverter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/DisplayableStringConverter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/FilteringListPanel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/FilteringListPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/FilteringListPanel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/FilteringListPanel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/GlobalAWTExceptionHandler.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/GlobalAWTExceptionHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/GlobalAWTExceptionHandler.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/GlobalAWTExceptionHandler.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/LabelArea.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/LabelArea.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/LabelArea.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/LabelArea.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/PostExecution.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/PostExecution.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/PostExecution.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/PostExecution.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/PreferencesRecentFilesManager.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/PreferencesRecentFilesManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/PreferencesRecentFilesManager.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/PreferencesRecentFilesManager.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/PropertyValueModelDisplayableAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/PropertyValueModelDisplayableAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/PropertyValueModelDisplayableAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/PropertyValueModelDisplayableAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/RecentFilesManager.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/RecentFilesManager.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/RecentFilesManager.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/RecentFilesManager.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/RunnableExceptionDialogLauncher.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/RunnableExceptionDialogLauncher.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/RunnableExceptionDialogLauncher.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/RunnableExceptionDialogLauncher.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/SimpleDisplayable.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/SimpleDisplayable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/SimpleDisplayable.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/SimpleDisplayable.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/SplashScreen.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/SplashScreen.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/SplashScreen.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/SplashScreen.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/SwitcherPanel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/SwitcherPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/SwitcherPanel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/SwitcherPanel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/ThreadBrowser.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/ThreadBrowser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/ThreadBrowser.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/ThreadBrowser.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyCollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyCollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyCollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyCollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyListValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyListValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyListValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyListValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyPropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyPropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyPropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractReadOnlyPropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractTreeNodeValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractTreeNodeValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AbstractTreeNodeValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AbstractTreeNodeValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AspectAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AspectAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/AspectAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/AspectAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/BufferedPropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/BufferedPropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/BufferedPropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/BufferedPropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionAspectAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionAspectAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionAspectAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionAspectAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionPropertyValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionPropertyValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionPropertyValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionPropertyValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModelWrapper.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModelWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModelWrapper.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CollectionValueModelWrapper.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CompositeCollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CompositeCollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/CompositeCollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/CompositeCollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ExtendedListValueModelWrapper.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ExtendedListValueModelWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ExtendedListValueModelWrapper.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ExtendedListValueModelWrapper.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/FilteringCollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/FilteringCollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/FilteringCollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/FilteringCollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/FilteringPropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/FilteringPropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/FilteringPropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/FilteringPropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemAspectListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemAspectListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemAspectListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemAspectListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemCollectionListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemCollectionListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemCollectionListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemCollectionListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemListListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemListListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemListListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemListListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemPropertyListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemPropertyListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemPropertyListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemPropertyListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemStateListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemStateListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ItemStateListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ItemStateListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListAspectAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListAspectAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListAspectAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListAspectAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListCollectionValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListCollectionValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListCollectionValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListCollectionValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListCurator.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListCurator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListCurator.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListCurator.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModelWrapper.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModelWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModelWrapper.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ListValueModelWrapper.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullCollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullCollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullCollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullCollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullListValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullListValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullListValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullListValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullPropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullPropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullPropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullPropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullTransformer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/NullTransformer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/NullTransformer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyAspectAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyAspectAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyAspectAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyAspectAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyCollectionValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyCollectionValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyCollectionValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyCollectionValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModelWrapper.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModelWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModelWrapper.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/PropertyValueModelWrapper.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyCollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyCollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyCollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyCollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyListValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyListValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyListValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyListValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyPropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyPropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyPropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ReadOnlyPropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SimpleCollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SimpleCollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SimpleCollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SimpleCollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SimpleListValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SimpleListValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SimpleListValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SimpleListValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SimplePropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SimplePropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SimplePropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SimplePropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SortedListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SortedListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/SortedListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/SortedListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TransformationListValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TransformationListValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TransformationListValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TransformationListValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TransformationPropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TransformationPropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TransformationPropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TransformationPropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TransformationValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TransformationValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TransformationValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TransformationValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TreeAspectAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TreeAspectAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TreeAspectAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TreeAspectAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TreeNodeValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TreeNodeValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TreeNodeValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TreeNodeValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TreeValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TreeValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/TreeValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/TreeValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueAspectPropertyValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueAspectPropertyValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueAspectPropertyValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueAspectPropertyValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueCollectionPropertyValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueCollectionPropertyValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueCollectionPropertyValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueCollectionPropertyValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueListPropertyValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueListPropertyValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueListPropertyValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueListPropertyValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueModelChangeSupport.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueModelChangeSupport.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueModelChangeSupport.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueModelChangeSupport.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValuePropertyPropertyValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValuePropertyPropertyValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValuePropertyPropertyValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValuePropertyPropertyValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueStatePropertyValueModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueStatePropertyValueModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/ValueStatePropertyValueModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/ValueStatePropertyValueModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencePropertyValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencePropertyValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencePropertyValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencePropertyValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencesCollectionValueModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencesCollectionValueModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencesCollectionValueModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/adapters/PreferencesCollectionValueModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/AbstractTreeModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/AbstractTreeModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/AbstractTreeModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/AbstractTreeModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/CheckBoxModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/CheckBoxModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/CheckBoxModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/CheckBoxModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ColumnAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ColumnAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ColumnAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ColumnAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ComboBoxModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ComboBoxModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ComboBoxModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ComboBoxModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/DateSpinnerModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/DateSpinnerModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/DateSpinnerModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/DateSpinnerModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/DocumentAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/DocumentAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/DocumentAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/DocumentAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListSpinnerModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListSpinnerModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListSpinnerModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ListSpinnerModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/NumberSpinnerModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/NumberSpinnerModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/NumberSpinnerModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/NumberSpinnerModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ObjectListSelectionModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ObjectListSelectionModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ObjectListSelectionModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ObjectListSelectionModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/PrimitiveListTreeModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/PrimitiveListTreeModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/PrimitiveListTreeModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/PrimitiveListTreeModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/RadioButtonModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/RadioButtonModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/RadioButtonModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/RadioButtonModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/SpinnerModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/SpinnerModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/SpinnerModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/SpinnerModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/TableModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/TableModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/TableModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/TableModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ToggleButtonModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ToggleButtonModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/ToggleButtonModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/ToggleButtonModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/TreeModelAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/TreeModelAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/app/swing/TreeModelAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/app/swing/TreeModelAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AbstractCellRendererAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AbstractCellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AbstractCellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AbstractCellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableListCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableListCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableListCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableListCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTableCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTableCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTableCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTableCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AdaptableTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellEditor.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellEditor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellEditor.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellEditor.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/AssociationTextFieldTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CellRendererAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CellRendererAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CellRendererAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CellRendererAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTableCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTableCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTableCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTableCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellEditor.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellEditor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellEditor.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellEditor.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/CheckBoxTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTableCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTableCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTableCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTableCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellEditor.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellEditor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellEditor.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellEditor.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/ComboBoxTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableListCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableListCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableListCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableListCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTableCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTableCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTableCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTableCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/DisplayableTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/EditingNode.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/EditingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/EditingNode.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/EditingNode.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/LabeledTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/LabeledTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/LabeledTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/LabeledTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellEditor.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellEditor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellEditor.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellEditor.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/NodeTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/NullTreeCellEditor.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/NullTreeCellEditor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/NullTreeCellEditor.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/NullTreeCellEditor.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/RenderingNode.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/RenderingNode.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/RenderingNode.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/RenderingNode.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleListCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleListCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleListCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleListCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTableCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTableCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTableCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTableCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SimpleTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTableCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTableCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTableCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTableCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellEditor.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellEditor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellEditor.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellEditor.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/SpinnerTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TableCellEditorAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TableCellEditorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TableCellEditorAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TableCellEditorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellEditor.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellEditor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellEditor.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellEditor.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TextFieldTreeCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TreeCellEditorAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TreeCellEditorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/cell/TreeCellEditorAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/cell/TreeCellEditorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/FilteringListBrowser.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/FilteringListBrowser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/FilteringListBrowser.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/FilteringListBrowser.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/ListChooser.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/ListChooser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/ListChooser.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/ListChooser.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/NodeSelector.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/NodeSelector.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/NodeSelector.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/NodeSelector.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/SimpleListBrowser.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/SimpleListBrowser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/chooser/SimpleListBrowser.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/chooser/SimpleListBrowser.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ArrowIcon.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ArrowIcon.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ArrowIcon.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ArrowIcon.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/BlockIcon.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/BlockIcon.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/BlockIcon.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/BlockIcon.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/CachingComboBoxModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/CachingComboBoxModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/CachingComboBoxModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/CachingComboBoxModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/Combo.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/Combo.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/Combo.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/Combo.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorAdapter.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorAdapter.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorWithDefault.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorWithDefault.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorWithDefault.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxEditorWithDefault.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxModelWithDefaultHandler.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxModelWithDefaultHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxModelWithDefaultHandler.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboBoxModelWithDefaultHandler.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboCellRenderer.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboCellRenderer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ComboCellRenderer.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ComboCellRenderer.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/CompositeIcon.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/CompositeIcon.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/CompositeIcon.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/CompositeIcon.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/EmptyIcon.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/EmptyIcon.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/EmptyIcon.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/EmptyIcon.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ExpandablePane.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ExpandablePane.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ExpandablePane.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ExpandablePane.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedComboBoxModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedComboBoxModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedComboBoxModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedComboBoxModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedListModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedListModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedListModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ExtendedListModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/IndirectComboBoxModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/IndirectComboBoxModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/IndirectComboBoxModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/IndirectComboBoxModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/LabelPanel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/LabelPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/LabelPanel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/LabelPanel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/NonCachingComboBoxModel.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/NonCachingComboBoxModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/NonCachingComboBoxModel.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/NonCachingComboBoxModel.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/SpinnerWithDefaultHandler.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/SpinnerWithDefaultHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/SpinnerWithDefaultHandler.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/SpinnerWithDefaultHandler.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/TextFieldWithDefaultHandler.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/TextFieldWithDefaultHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/TextFieldWithDefaultHandler.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/TextFieldWithDefaultHandler.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ThinBevelBorder.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ThinBevelBorder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/ThinBevelBorder.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/ThinBevelBorder.java
diff --git a/utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/TriStateCheckBox.java b/utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/TriStateCheckBox.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/uitools/source/org/eclipse/persistence/tools/workbench/uitools/swing/TriStateCheckBox.java
rename to utils/eclipselink.utils.workbench/uitools/src/main/java/org/eclipse/persistence/tools/workbench/uitools/swing/TriStateCheckBox.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/AllUIToolsTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/AllUIToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/AllUIToolsTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/AllUIToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/BorderIcon.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/BorderIcon.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/BorderIcon.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/BorderIcon.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/ComponentEnablerTest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/ComponentEnablerTest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/ComponentEnablerTest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/ComponentEnablerTest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/ConsoleUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/ConsoleUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/ConsoleUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/ConsoleUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/DisplayableTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/DisplayableTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/DisplayableTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/DisplayableTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/FilteringListPanelUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/FilteringListPanelUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/FilteringListPanelUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/FilteringListPanelUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesBrowser.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesBrowser.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesBrowser.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesBrowser.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesPanel.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesPanel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesPanel.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesPanel.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesRecentFilesManagerTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesRecentFilesManagerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesRecentFilesManagerTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesRecentFilesManagerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesTestCase.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesTestCase.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesTestCase.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PreferencesTestCase.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PropertyValueModelDisplayableAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PropertyValueModelDisplayableAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/PropertyValueModelDisplayableAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/PropertyValueModelDisplayableAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/QuadrantIcon.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/QuadrantIcon.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/QuadrantIcon.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/QuadrantIcon.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/SimpleDisplayableTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/SimpleDisplayableTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/SimpleDisplayableTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/SimpleDisplayableTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/SplashScreenUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/SplashScreenUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/SplashScreenUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/SplashScreenUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/SwitcherPanelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/SwitcherPanelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/SwitcherPanelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/SwitcherPanelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/AllUIToolsAppTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/AllUIToolsAppTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/AllUIToolsAppTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/AllUIToolsAppTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/BufferedPropertyValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/BufferedPropertyValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/BufferedPropertyValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/BufferedPropertyValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionAspectAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionAspectAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionAspectAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionAspectAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionListValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionListValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionListValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionListValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionPropertyValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionPropertyValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionPropertyValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CollectionPropertyValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CompositeCollectionValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CompositeCollectionValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/CompositeCollectionValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/CompositeCollectionValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ExtendedListValueModelWrapperTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ExtendedListValueModelWrapperTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ExtendedListValueModelWrapperTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ExtendedListValueModelWrapperTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringCollectionValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringCollectionValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringCollectionValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringCollectionValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringPropertyValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringPropertyValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringPropertyValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/FilteringPropertyValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemCollectionListValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemCollectionListValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemCollectionListValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemCollectionListValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemListListValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemListListValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemListListValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemListListValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemPropertyListValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemPropertyListValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemPropertyListValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemPropertyListValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemStateListValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemStateListValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemStateListValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ItemStateListValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ListAspectAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ListAspectAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ListAspectAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ListAspectAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCollectionValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCollectionValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCollectionValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCollectionValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCuratorTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCuratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCuratorTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ListCuratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/NullCollectionValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/NullCollectionValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/NullCollectionValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/NullCollectionValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/NullListValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/NullListValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/NullListValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/NullListValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/NullPropertyValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/NullPropertyValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/NullPropertyValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/NullPropertyValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyAspectAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyAspectAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyAspectAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyAspectAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyCollectionValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyCollectionValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyCollectionValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/PropertyCollectionValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyCollectionValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyCollectionValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyCollectionValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyCollectionValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyListValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyListValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyListValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ReadOnlyListValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleCollectionValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleCollectionValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleCollectionValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleCollectionValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleListValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleListValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleListValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SimpleListValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SimplePropertyValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SimplePropertyValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SimplePropertyValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SimplePropertyValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SortedListValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SortedListValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SortedListValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SortedListValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/StaticValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/StaticValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/StaticValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/StaticValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedBag.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedBag.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedBag.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedBag.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedList.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedList.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedList.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/SynchronizedList.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationListValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationListValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationListValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationListValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationPropertyValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationPropertyValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationPropertyValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/TransformationPropertyValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/TreeAspectAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/TreeAspectAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/TreeAspectAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/TreeAspectAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueCollectionPropertyValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueCollectionPropertyValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueCollectionPropertyValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueCollectionPropertyValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueListPropertyValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueListPropertyValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueListPropertyValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueListPropertyValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValuePropertyPropertyValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValuePropertyPropertyValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValuePropertyPropertyValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValuePropertyPropertyValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueStatePropertyValueModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueStatePropertyValueModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueStatePropertyValueModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/ValueStatePropertyValueModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/AllUIToolsAppAdaptersTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/AllUIToolsAppAdaptersTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/AllUIToolsAppAdaptersTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/AllUIToolsAppAdaptersTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencePropertyValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencePropertyValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencePropertyValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencePropertyValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencesCollectionValueModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencesCollectionValueModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencesCollectionValueModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/adapters/PreferencesCollectionValueModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/AllUIToolsAppSwingTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/AllUIToolsAppSwingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/AllUIToolsAppSwingTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/AllUIToolsAppSwingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/CheckBoxModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest2.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest2.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest2.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ComboBoxModelAdapterUITest2.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DateSpinnerModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DateSpinnerModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DateSpinnerModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DateSpinnerModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/DocumentAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListSpinnerModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListSpinnerModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListSpinnerModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ListSpinnerModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/NumberSpinnerModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/NumberSpinnerModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/NumberSpinnerModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/NumberSpinnerModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ObjectListSelectionModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ObjectListSelectionModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ObjectListSelectionModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ObjectListSelectionModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/PrimitiveListTreeModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/PrimitiveListTreeModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/PrimitiveListTreeModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/PrimitiveListTreeModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/RadioButtonModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ReadOnlyTableModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ReadOnlyTableModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ReadOnlyTableModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/ReadOnlyTableModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/SpinnerModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TableModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/app/swing/TreeModelAdapterUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellEditorUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellEditorUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellEditorUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellEditorUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellRendererUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellRendererUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellRendererUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/cell/TreeCellRendererUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/AllUIToolsSwingTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/AllUIToolsSwingTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/AllUIToolsSwingTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/AllUIToolsSwingTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/CompositeIconUITest.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/CompositeIconUITest.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/CompositeIconUITest.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/CompositeIconUITest.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedComboBoxModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedComboBoxModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedComboBoxModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedComboBoxModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedListModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedListModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedListModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/ExtendedListModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelTests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelTests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelUITests.java b/utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelUITests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/uitools/source/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelUITests.java
rename to utils/eclipselink.utils.workbench/uitools/src/test/java/org/eclipse/persistence/tools/workbench/test/uitools/swing/IndirectComboBoxModelUITests.java
diff --git a/utils/eclipselink.utils.workbench/utility/build.properties b/utils/eclipselink.utils.workbench/utility/build.properties
deleted file mode 100644
index 5842a4e..0000000
--- a/utils/eclipselink.utils.workbench/utility/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0,
-# or the Eclipse Distribution License v. 1.0 which is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-#
-
-# Contributors:
-# Oracle - initial API and implementation
-
-#set defaults for values that should already be set
-_LibraryName=EclipseLink Mapping Workbench Utility Library
-_productName=EclipseLink
-release.version=3.0.0
-
-# Defines for basic build directories.
-_classesDestDir=${basedir}/classes
-_libDir=${basedir}/../../eclipselink.utils.workbench.lib/
-_jarDestDir=${_libDir}/mw
-_rootResourceDir=${basedir}/resource
-_rootSourceDir=${basedir}/source
-
-# Defined jarfile names.
-utility.jarfile=utility.jar
-utility.jarfile.src=utility_src.jar
-
-# Defines for build directories.
-compile.utility.resources=${_rootResourceDir}
-compile.utility.srcdir=${_rootSourceDir}
-compile.utility.destdir=${_classesDestDir}
-compile.utility.classpath=
diff --git a/utils/eclipselink.utils.workbench/utility/build.xml b/utils/eclipselink.utils.workbench/utility/build.xml
deleted file mode 100644
index 98db7f3..0000000
--- a/utils/eclipselink.utils.workbench/utility/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0,
- or the Eclipse Distribution License v. 1.0 which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<!--
- Contributors:
- Oracle - initial API and implementation
--->
-<!--
-* Ant naming conventions:
-* - regardless of the actual OS platform,'/' is the directory separator
-* (Ant will convert as appropriate).
-* - multi-word properties use periods '.'
-* - multi-word targets use hyphens '-'
-* - multi-word macros use underscores '_'
-* - multi-word macro attributes are concatenated
-* e.g. 'runpathref'
-* - multi-word tasks (taskdef) names are concatenated
-* e.g. 'validateconnection'
-* - OS environment variables are in ALLCAPS and have 'env' as a prefix
-* e.g. ${env.XXX}.
-* - Ant properties are lower case.
--->
-<project name="Build Utility Library" default="build-all" basedir=".">
- <!-- =================================================================== -->
- <target name="init">
- <tstamp>
- <format property="build.date" pattern="yyyyMMdd"/>
- <format property="build.time" pattern="HHmm"/>
- </tstamp>
- <property environment="env"/>
-
- <property name="stop.on.error" value="true"/>
- <property name="optimize.code" value="off"/>
- <property name="report.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.debuglevel" value="lines,vars,source"/>
- <property name="target.jvm" value="${javac.version}"/>
- <property name="_nowarn" value="on"/>
- <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
- <echo message="java.version='${java.version}'"/>
- <echo message="os.name='${os.name}'"/>
- <echo message="os.arch='${os.arch}'"/>
- <echo message="os.version='${os.version}'"/>
- <echo message="stop.on.error='${stop.on.error}'"/>
- <echo message="optimize.code='${optimize.code}'"/>
- <echo message="report.deprecation='${report.deprecation}'"/>
- <echo message="target.jvm='${target.jvm}'"/>
- <echo message="_nowarn='${_nowarn}'"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- =================================================================== -->
-
- <target name="build-all" depends="compile-utility, jar-utility"/>
-
- <!-- =================================================================== -->
- <!-- Properties -->
- <!-- =================================================================== -->
- <target name="properties-init" depends="init">
- <property file="build.properties"/>
- <property name="build.type" value="SNAPSHOT"/>
- <property name="release.designation" value="EclipseLink DeveloperBuild"/>
- <property name="version.string" value="${release.version}.qualifier"/>
- <mkdir dir="${_classesDestDir}"/>
- <mkdir dir="${_jarDestDir}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Clean -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <property file="build.properties"/>
-
- <delete dir="${_classesDestDir}" includeEmptyDirs="true" quiet="true"/>
- <delete file="${_jarDestDir}/${utility.jarfile}" quiet="true"/>
- <delete file="${_jarDestDir}/${utility.jarfile.src}" quiet="true"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compile -->
- <!-- =================================================================== -->
- <target name="compile-utility" depends="properties-init">
- <mkdir dir="${compile.utility.destdir}"/>
- <javac
- classpath="${compile.utility.classpath}"
- srcdir="${compile.utility.srcdir}"
- destdir="${compile.utility.destdir}"
- debug="${javac.debug}"
- debuglevel="${javac.debuglevel}"
- failonerror="${stop.on.error}"
- encoding="UTF-8"
- optimize="${optimize.code}"
- deprecation="${report.deprecation}"
- source="${target.jvm}"
- target="${target.jvm}"
- nowarn="${_nowarn}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Jar -->
- <!-- =================================================================== -->
- <target name="jar-utility" depends="jar-utility-lib, jar-utility-src"/>
-
- <target name="jar-utility-lib" depends="properties-init">
- <delete file="${_jarDestDir}/${utility.jarfile}"/>
- <jar jarfile="${_jarDestDir}/${utility.jarfile}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.utility" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.utility.destdir}"
- includes="**/*.class"
- />
- </jar>
- </target>
- <target name="jar-utility-src" depends="properties-init">
- <delete file="${_jarDestDir}/${utility.jarfile.src}"/>
- <jar jarfile="${_jarDestDir}/${utility.jarfile.src}">
- <manifest>
- <attribute name="Specification-Title" value="${_productName}" />
- <attribute name="Specification-Vendor" value="Eclipse Project" />
- <attribute name="Specification-Version" value="${release.version}" />
- <attribute name="Implementation-Title" value="org.eclipse.persistence.workbench.utility" />
- <attribute name="Implementation-Version" value="${version.string}"/>
- <attribute name="Implementation-Vendor" value="Eclipse Project" />
- <attribute name="Release-Designation" value="${release.designation}" />
- <attribute name="Library-Designation" value="${_LibraryName}" />
- </manifest>
- <fileset
- dir="${compile.utility.srcdir}"
- includes="**/*.java"
- excludes="**/*#*/**, **/.ade_path/**"
- />
- </jar>
- </target>
-
-</project>
diff --git a/utils/eclipselink.utils.workbench/utility/pom.xml b/utils/eclipselink.utils.workbench/utility/pom.xml
new file mode 100644
index 0000000..e582d6c
--- /dev/null
+++ b/utils/eclipselink.utils.workbench/utility/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0,
+ or the Eclipse Distribution License v. 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<!--
+ Contributors:
+ Lukas Jungmann - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.parent</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>workbench.utility</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Utility Library</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org.eclipse.persistence.tools.workbench.test.utility.AllUtilityTests</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/AbstractAssociation.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/AbstractAssociation.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/AbstractAssociation.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/AbstractAssociation.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/AbstractModel.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/AbstractModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/AbstractModel.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/AbstractModel.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Association.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Association.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Association.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Association.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Bag.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Bag.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Bag.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Bag.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/BidiTransformer.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/BidiTransformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/BidiTransformer.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/BidiTransformer.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ClassTools.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ClassTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ClassTools.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ClassTools.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Classpath.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Classpath.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Classpath.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Classpath.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/CollectionTools.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/CollectionTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/CollectionTools.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/CollectionTools.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Command.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Command.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Command.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Command.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Counter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Counter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Counter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Counter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/DriverWrapper.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/DriverWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/DriverWrapper.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/DriverWrapper.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ExceptionBroadcaster.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ExceptionBroadcaster.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ExceptionBroadcaster.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ExceptionBroadcaster.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ExceptionHandlerThreadGroup.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ExceptionHandlerThreadGroup.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ExceptionHandlerThreadGroup.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ExceptionHandlerThreadGroup.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ExceptionListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ExceptionListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ExceptionListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ExceptionListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/HashBag.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/HashBag.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/HashBag.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/HashBag.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/IdentityHashBag.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/IdentityHashBag.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/IdentityHashBag.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/IdentityHashBag.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ManifestInterrogator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ManifestInterrogator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ManifestInterrogator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ManifestInterrogator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Model.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Model.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Model.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Model.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/NameTools.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/NameTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/NameTools.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/NameTools.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/NullModel.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/NullModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/NullModel.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/NullModel.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/NullPreferences.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/NullPreferences.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/NullPreferences.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/NullPreferences.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Range.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Range.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Range.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Range.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ReverseComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ReverseComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/ReverseComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/ReverseComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/RunnableDeath.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/RunnableDeath.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/RunnableDeath.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/RunnableDeath.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SimpleAssociation.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SimpleAssociation.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SimpleAssociation.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SimpleAssociation.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SimpleExceptionBroadcaster.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SimpleExceptionBroadcaster.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SimpleExceptionBroadcaster.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SimpleExceptionBroadcaster.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SimpleStack.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SimpleStack.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SimpleStack.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SimpleStack.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Stack.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Stack.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Stack.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Stack.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SynchronizedBoolean.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SynchronizedBoolean.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SynchronizedBoolean.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SynchronizedBoolean.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SynchronizedObject.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SynchronizedObject.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SynchronizedObject.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SynchronizedObject.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SynchronizedStack.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SynchronizedStack.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/SynchronizedStack.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/SynchronizedStack.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Transformer.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Transformer.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/Transformer.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/Transformer.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/TriStateBoolean.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/TriStateBoolean.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/TriStateBoolean.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/TriStateBoolean.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/XMLTools.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/XMLTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/XMLTools.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/XMLTools.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/AbstractMethodRefConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/AbstractMethodRefConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/AbstractMethodRefConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/AbstractMethodRefConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/AnnotationDefaultAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/AnnotationDefaultAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/AnnotationDefaultAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/AnnotationDefaultAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Attribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Attribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Attribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Attribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/AttributePool.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/AttributePool.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/AttributePool.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/AttributePool.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ClassConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ClassConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ClassConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ClassConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ClassDeclaration.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ClassDeclaration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ClassDeclaration.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ClassDeclaration.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ClassFile.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ClassFile.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ClassFile.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ClassFile.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/CodeAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/CodeAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/CodeAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/CodeAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Constant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Constant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Constant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Constant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantPool.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantPool.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantPool.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantPool.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantValueAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantValueAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantValueAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ConstantValueAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/DeprecatedAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/DeprecatedAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/DeprecatedAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/DeprecatedAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/DoubleConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/DoubleConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/DoubleConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/DoubleConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/EnclosingMethodAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/EnclosingMethodAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/EnclosingMethodAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/EnclosingMethodAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionHandler.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionHandler.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionHandler.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionsAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionsAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionsAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/ExceptionsAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Field.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Field.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Field.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Field.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/FieldPool.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/FieldPool.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/FieldPool.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/FieldPool.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/FieldRefConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/FieldRefConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/FieldRefConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/FieldRefConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/FloatConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/FloatConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/FloatConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/FloatConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClass.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClass.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClass.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClassesAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClassesAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClassesAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InnerClassesAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/IntegerConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/IntegerConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/IntegerConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/IntegerConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InterfaceMethodRefConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InterfaceMethodRefConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InterfaceMethodRefConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InterfaceMethodRefConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InvokeDynamicConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InvokeDynamicConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/InvokeDynamicConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/InvokeDynamicConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumber.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumber.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumber.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumberTableAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumberTableAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumberTableAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LineNumberTableAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariable.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariable.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariable.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTableAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTableAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTableAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTableAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableType.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableType.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableType.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTypeTableAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTypeTableAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTypeTableAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LocalVariableTypeTableAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LongConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LongConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/LongConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/LongConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Member.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Member.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Member.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Member.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MemberRefConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MemberRefConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MemberRefConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MemberRefConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Method.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Method.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Method.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Method.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodHandleConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodHandleConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodHandleConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodHandleConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodPool.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodPool.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodPool.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodPool.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodRefConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodRefConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodRefConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodRefConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodTypeConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodTypeConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/MethodTypeConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/MethodTypeConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/NameAndTypeConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/NameAndTypeConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/NameAndTypeConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/NameAndTypeConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/NullConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/NullConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/NullConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/NullConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleAnnotationsAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleAnnotationsAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleAnnotationsAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleAnnotationsAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleParameterAnnotationsAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleParameterAnnotationsAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleParameterAnnotationsAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeInvisibleParameterAnnotationsAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleAnnotationsAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleAnnotationsAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleAnnotationsAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleAnnotationsAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleParameterAnnotationsAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleParameterAnnotationsAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleParameterAnnotationsAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/RuntimeVisibleParameterAnnotationsAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SignatureAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SignatureAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SignatureAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SignatureAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SourceDebugExtensionAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SourceDebugExtensionAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SourceDebugExtensionAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SourceDebugExtensionAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SourceFileAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SourceFileAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SourceFileAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SourceFileAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/StringConstant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/StringConstant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/StringConstant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/StringConstant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SyntheticAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SyntheticAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/SyntheticAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/SyntheticAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/UTF8Constant.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/UTF8Constant.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/UTF8Constant.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/UTF8Constant.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/UnknownAttribute.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/UnknownAttribute.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/UnknownAttribute.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/UnknownAttribute.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Visitor.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Visitor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/Visitor.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/Visitor.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/VisitorAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/VisitorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/VisitorAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/VisitorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ArrayType.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ArrayType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ArrayType.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ArrayType.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/BaseType.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/BaseType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/BaseType.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/BaseType.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/FieldType.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/FieldType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/FieldType.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/FieldType.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ObjectType.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ObjectType.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ObjectType.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/descriptor/ObjectType.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassDependencyGraph.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassDependencyGraph.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassDependencyGraph.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassDependencyGraph.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileDataInputStream.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileDataInputStream.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileDataInputStream.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileDataInputStream.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/classfile/tools/ClassFileIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ArrayAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ArrayAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ArrayAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ArrayAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/CollectionAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/CollectionAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/CollectionAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/CollectionAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/CompositeDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ContainerDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/Diff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/Diff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/Diff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/Diff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffEngine.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffEngine.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffEngine.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffEngine.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffWrapper.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffWrapper.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffWrapper.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/Diffable.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/Diffable.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/Diffable.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/Diffable.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffableAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffableAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffableAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffableAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffableDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffableDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DiffableDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DiffableDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/Differentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/Differentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/Differentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/Differentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorWrapper.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorWrapper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorWrapper.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/DifferentiatorWrapper.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/EqualityDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/EqualityDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/EqualityDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/EqualityDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/IdentityDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/IdentityDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/IdentityDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/IdentityDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ListAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ListAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ListAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ListAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/MapAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/MapAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/MapAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/MapAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/MapEntryDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/NullDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/NullDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/NullDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/NullDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/NullDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/NullDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/NullDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/NullDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerElementDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerElementDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerElementDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/OrderedContainerElementDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReferenceDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReferenceDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReferenceDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReferenceDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDifferentiator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDifferentiator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDifferentiator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveDifferentiator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveFieldDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveFieldDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveFieldDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/ReflectiveFieldDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/SimpleDiff.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/SimpleDiff.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/SimpleDiff.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/SimpleDiff.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/UnorderedArrayAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/UnorderedArrayAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/diff/UnorderedArrayAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/diff/UnorderedArrayAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/AWTChangeNotifier.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/AWTChangeNotifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/AWTChangeNotifier.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/AWTChangeNotifier.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ChangeNotifier.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ChangeNotifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ChangeNotifier.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ChangeNotifier.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ChangeSupport.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ChangeSupport.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ChangeSupport.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ChangeSupport.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeEvent.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeEvent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeEvent.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeEvent.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/CollectionChangeListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/DefaultChangeNotifier.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/DefaultChangeNotifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/DefaultChangeNotifier.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/DefaultChangeNotifier.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ListChangeAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ListChangeAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ListChangeAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ListChangeAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ListChangeEvent.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ListChangeEvent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ListChangeEvent.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ListChangeEvent.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ListChangeListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ListChangeListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ListChangeListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ListChangeListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/MultiMethodReflectiveChangeListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/MultiMethodReflectiveChangeListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/MultiMethodReflectiveChangeListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/MultiMethodReflectiveChangeListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/NullChangeNotifier.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/NullChangeNotifier.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/NullChangeNotifier.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/NullChangeNotifier.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ReflectiveChangeListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ReflectiveChangeListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/ReflectiveChangeListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/ReflectiveChangeListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/SingleMethodReflectiveChangeListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/SingleMethodReflectiveChangeListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/SingleMethodReflectiveChangeListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/SingleMethodReflectiveChangeListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/StateChangeEvent.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/StateChangeEvent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/StateChangeEvent.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/StateChangeEvent.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/StateChangeListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/StateChangeListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/StateChangeListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/StateChangeListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeEvent.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeEvent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeEvent.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeEvent.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/events/TreeChangeListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/ANDFilter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/ANDFilter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/ANDFilter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/ANDFilter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/BidiFilter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/BidiFilter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/BidiFilter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/BidiFilter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/CompoundFilter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/CompoundFilter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/CompoundFilter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/CompoundFilter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/Filter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/Filter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/Filter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/Filter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/NOTFilter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/NOTFilter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/NOTFilter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/NOTFilter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/ORFilter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/ORFilter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/ORFilter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/ORFilter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/SimpleFilter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/SimpleFilter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/SimpleFilter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/SimpleFilter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/XORFilter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/XORFilter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/filters/XORFilter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/filters/XORFilter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/FileTools.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/FileTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/FileTools.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/FileTools.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/IndentingPrintWriter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/IndentingPrintWriter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/IndentingPrintWriter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/IndentingPrintWriter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidInputStream.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidInputStream.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidInputStream.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidInputStream.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidOutputStream.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidOutputStream.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidOutputStream.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidOutputStream.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidReader.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidReader.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidReader.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidReader.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidWriter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidWriter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/InvalidWriter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/InvalidWriter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullInputStream.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullInputStream.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullInputStream.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullInputStream.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullOutputStream.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullOutputStream.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullOutputStream.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullOutputStream.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullReader.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullReader.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullReader.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullReader.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullWriter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullWriter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/NullWriter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/NullWriter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/Pipe.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/Pipe.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/Pipe.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/Pipe.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/StringBufferWriter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/StringBufferWriter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/StringBufferWriter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/StringBufferWriter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/TeeOutputStream.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/TeeOutputStream.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/TeeOutputStream.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/TeeOutputStream.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/TeeWriter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/TeeWriter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/TeeWriter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/TeeWriter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/TokenWriter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/TokenWriter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/io/TokenWriter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/io/TokenWriter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayListIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayListIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayListIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ArrayListIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ChainIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ChainIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ChainIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ChainIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CloneIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CloneIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CloneIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CloneIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CloneListIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CloneListIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CloneListIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CloneListIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeListIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeListIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeListIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/CompositeListIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/EnumerationIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/EnumerationIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/EnumerationIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/EnumerationIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/FilteringIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/FilteringIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/FilteringIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/FilteringIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/GraphIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/GraphIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/GraphIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/GraphIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/IteratorEnumeration.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/IteratorEnumeration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/IteratorEnumeration.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/IteratorEnumeration.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/NullEnumeration.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/NullEnumeration.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/NullEnumeration.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/NullEnumeration.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/NullIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/NullIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/NullIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/NullIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/NullListIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/NullListIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/NullListIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/NullListIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/PeekableIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/PeekableIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/PeekableIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/PeekableIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyListIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyListIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyListIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ReadOnlyListIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ResultSetIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ResultSetIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/ResultSetIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/ResultSetIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementListIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementListIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementListIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/SingleElementListIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationListIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationListIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationListIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/TransformationListIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/TreeIterator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/TreeIterator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/iterators/TreeIterator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/iterators/TreeIterator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/log/DeathHandler.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/log/DeathHandler.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/log/DeathHandler.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/log/DeathHandler.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/log/FileHandlerCleanup.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/log/FileHandlerCleanup.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/log/FileHandlerCleanup.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/log/FileHandlerCleanup.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/log/LoggingExceptionListener.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/log/LoggingExceptionListener.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/log/LoggingExceptionListener.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/log/LoggingExceptionListener.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/AbstractNodeModel.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/AbstractNodeModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/AbstractNodeModel.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/AbstractNodeModel.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/AsynchronousValidator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/AsynchronousValidator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/AsynchronousValidator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/AsynchronousValidator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/DefaultProblem.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/DefaultProblem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/DefaultProblem.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/DefaultProblem.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/Node.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/Node.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/Node.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/Node.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/NodeModel.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/NodeModel.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/NodeModel.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/NodeModel.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/PluggableValidator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/PluggableValidator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/PluggableValidator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/PluggableValidator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/Problem.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/Problem.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/Problem.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/Problem.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/RunnableValidation.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/RunnableValidation.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/RunnableValidation.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/RunnableValidation.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/SynchronousValidator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/SynchronousValidator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/node/SynchronousValidator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/node/SynchronousValidator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/AbstractStringHolder.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/AbstractStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/AbstractStringHolder.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/AbstractStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/AffixStrippingPartialStringComparatorEngine.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/AffixStrippingPartialStringComparatorEngine.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/AffixStrippingPartialStringComparatorEngine.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/AffixStrippingPartialStringComparatorEngine.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/BestFirstPartialStringComparatorEngine.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/BestFirstPartialStringComparatorEngine.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/BestFirstPartialStringComparatorEngine.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/BestFirstPartialStringComparatorEngine.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/BidiStringConverter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/BidiStringConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/BidiStringConverter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/BidiStringConverter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/CaseInsensitivePartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/CaseInsensitivePartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/CaseInsensitivePartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/CaseInsensitivePartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/CollectionStringHolder.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/CollectionStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/CollectionStringHolder.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/CollectionStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/EmptyStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/EmptyStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/EmptyStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/EmptyStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/ExhaustivePartialStringComparatorEngine.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/ExhaustivePartialStringComparatorEngine.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/ExhaustivePartialStringComparatorEngine.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/ExhaustivePartialStringComparatorEngine.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/InversePartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/InversePartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/InversePartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/InversePartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/LowerCasePartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/LowerCasePartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/LowerCasePartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/LowerCasePartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/NullPartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/NullPartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/NullPartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/NullPartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/ObjectStringHolder.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/ObjectStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/ObjectStringHolder.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/ObjectStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PFPartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PFPartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PFPartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PFPartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparatorEngine.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparatorEngine.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparatorEngine.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PartialStringComparatorEngine.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PartialStringMatcher.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PartialStringMatcher.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/PartialStringMatcher.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/PartialStringMatcher.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/RegExStringMatcherAdapter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/RegExStringMatcherAdapter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/RegExStringMatcherAdapter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/RegExStringMatcherAdapter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringMatcher.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringMatcher.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringMatcher.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimplePartialStringMatcher.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringHolder.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringHolder.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringHolder.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringMatcher.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringMatcher.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringMatcher.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/SimpleStringMatcher.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringConverter.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringConverter.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringConverter.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringConverter.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringHolder.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringHolder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringHolder.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringHolder.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringMatcher.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringMatcher.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringMatcher.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringMatcher.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringTools.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/StringTools.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/StringTools.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/UpperCasePartialStringComparator.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/UpperCasePartialStringComparator.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/UpperCasePartialStringComparator.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/UpperCasePartialStringComparator.java
diff --git a/utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/XMLStringEncoder.java b/utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/XMLStringEncoder.java
similarity index 100%
rename from utils/eclipselink.utils.workbench/utility/source/org/eclipse/persistence/tools/workbench/utility/string/XMLStringEncoder.java
rename to utils/eclipselink.utils.workbench/utility/src/main/java/org/eclipse/persistence/tools/workbench/utility/string/XMLStringEncoder.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/AbstractModelTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/AbstractModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/AbstractModelTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/AbstractModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/AllUtilityTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/AllUtilityTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/AllUtilityTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/AllUtilityTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/ClassToolsTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/ClassToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/ClassToolsTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/ClassToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/ClasspathTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/ClasspathTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/ClasspathTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/ClasspathTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/CollectionToolsTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/CollectionToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/CollectionToolsTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/CollectionToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/CounterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/CounterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/CounterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/CounterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/HashBagTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/HashBagTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/HashBagTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/HashBagTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/IdentityHashBagTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/IdentityHashBagTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/IdentityHashBagTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/IdentityHashBagTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/JavaTools.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/JavaTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/JavaTools.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/JavaTools.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/NameToolsTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/NameToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/NameToolsTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/NameToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/RangeTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/RangeTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/RangeTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/RangeTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/ReverseComparatorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/ReverseComparatorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/ReverseComparatorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/ReverseComparatorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SimpleAssociationTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SimpleAssociationTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SimpleAssociationTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SimpleAssociationTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SimpleExceptionBroadcasterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SimpleExceptionBroadcasterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SimpleExceptionBroadcasterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SimpleExceptionBroadcasterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SimpleStackTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SimpleStackTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SimpleStackTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SimpleStackTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedBooleanTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedBooleanTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedBooleanTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedBooleanTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedObjectTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedObjectTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedObjectTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedObjectTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedStackTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedStackTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedStackTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/SynchronizedStackTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/TestTools.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/TestTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/TestTools.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/TestTools.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/TriStateBooleanTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/TriStateBooleanTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/TriStateBooleanTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/TriStateBooleanTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsReadTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsReadTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsReadTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsReadTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsWriteTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsWriteTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsWriteTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/XMLToolsWriteTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/AllClassFileTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/AllClassFileTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/AllClassFileTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/AllClassFileTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTestClass.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTestClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTestClass.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTestClass.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassDependencyTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileDumper.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileDumper.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileDumper.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileDumper.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileJarScanner.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileJarScanner.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileJarScanner.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileJarScanner.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClass.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClass.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClass.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClass.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClassDefaultCtor.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClassDefaultCtor.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClassDefaultCtor.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestClassDefaultCtor.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestInterface.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestInterface.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestInterface.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTestInterface.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/classfile/ClassFileTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractCircularReferenceDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractCircularReferenceDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractCircularReferenceDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractCircularReferenceDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractReflectiveDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractReflectiveDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractReflectiveDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/AbstractReflectiveDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/AllDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/AllDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/AllDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/AllDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/ArrayDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/ArrayDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/ArrayDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/ArrayDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/CollectionDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/CollectionDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/CollectionDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/CollectionDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffEngineCircularReferenceDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffEngineCircularReferenceDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffEngineCircularReferenceDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffEngineCircularReferenceDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffTestTools.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffTestTools.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffTestTools.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffTestTools.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffableCircularReferenceDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffableCircularReferenceDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffableCircularReferenceDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/DiffableCircularReferenceDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/EqualityDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/EqualityDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/EqualityDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/EqualityDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/IdentityDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/IdentityDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/IdentityDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/IdentityDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/InheritanceReflectiveDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/InheritanceReflectiveDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/InheritanceReflectiveDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/InheritanceReflectiveDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/ListDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/ListDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/ListDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/ListDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/MapDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/MapDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/MapDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/MapDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/MultiClassReflectiveDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/MultiClassReflectiveDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/MultiClassReflectiveDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/MultiClassReflectiveDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/NullDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/NullDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/NullDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/NullDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/SimpleReflectiveDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/SimpleReflectiveDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/SimpleReflectiveDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/SimpleReflectiveDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/UnorderedArrayDiffTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/UnorderedArrayDiffTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/UnorderedArrayDiffTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/UnorderedArrayDiffTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Address.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Address.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Address.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Address.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Car.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Car.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Car.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Car.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Dependent.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Dependent.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Dependent.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Dependent.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Employee.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Employee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Employee.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/Employee.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/InheritanceEmployee.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/InheritanceEmployee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/InheritanceEmployee.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/InheritanceEmployee.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/MultiClassEmployee.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/MultiClassEmployee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/MultiClassEmployee.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/MultiClassEmployee.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/PhoneNumber.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/PhoneNumber.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/PhoneNumber.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/PhoneNumber.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/SimpleEmployee.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/SimpleEmployee.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/SimpleEmployee.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/SimpleEmployee.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/State.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/State.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/diff/model/State.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/diff/model/State.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/AllEventsTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/AllEventsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/AllEventsTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/AllEventsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveCollectionChangeListenerTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveCollectionChangeListenerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveCollectionChangeListenerTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveCollectionChangeListenerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveListChangeListenerTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveListChangeListenerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveListChangeListenerTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveListChangeListenerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectivePropertyChangeListenerTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectivePropertyChangeListenerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectivePropertyChangeListenerTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectivePropertyChangeListenerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveStateChangeListenerTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveStateChangeListenerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveStateChangeListenerTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveStateChangeListenerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveTreeChangeListenerTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveTreeChangeListenerTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveTreeChangeListenerTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/events/ReflectiveTreeChangeListenerTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/ANDFilterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/ANDFilterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/ANDFilterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/ANDFilterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/AllFilterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/AllFilterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/AllFilterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/AllFilterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/NOTFilterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/NOTFilterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/NOTFilterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/NOTFilterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/ORFilterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/ORFilterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/ORFilterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/ORFilterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/XORFilterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/XORFilterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/filters/XORFilterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/filters/XORFilterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/AllIOTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/AllIOTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/AllIOTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/AllIOTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/FileToolsTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/FileToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/FileToolsTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/FileToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/IndentingPrintWriterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/IndentingPrintWriterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/IndentingPrintWriterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/IndentingPrintWriterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidInputStreamTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidInputStreamTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidInputStreamTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidInputStreamTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidOutputStreamTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidOutputStreamTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidOutputStreamTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidOutputStreamTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidReaderTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidReaderTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidReaderTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidReaderTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidWriterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidWriterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidWriterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/InvalidWriterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullInputStreamTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullInputStreamTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullInputStreamTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullInputStreamTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullOutputStreamTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullOutputStreamTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullOutputStreamTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullOutputStreamTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullReaderTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullReaderTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullReaderTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullReaderTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullWriterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullWriterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/NullWriterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/NullWriterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/PipeTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/PipeTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/PipeTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/PipeTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/StringBufferWriterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/StringBufferWriterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/StringBufferWriterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/StringBufferWriterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/TeeOutputStreamTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/TeeOutputStreamTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/TeeOutputStreamTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/TeeOutputStreamTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/TeeWriterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/TeeWriterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/TeeWriterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/TeeWriterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/TokenTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/TokenTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/io/TokenTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/io/TokenTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/AllIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/AllIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/AllIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/AllIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayListIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayListIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayListIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ArrayListIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ChainIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ChainIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ChainIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ChainIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneListIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneListIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneListIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CloneListIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeListIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeListIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeListIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/CompositeListIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/EnumerationIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/EnumerationIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/EnumerationIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/EnumerationIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/FilteringIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/FilteringIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/FilteringIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/FilteringIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/GraphIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/GraphIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/GraphIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/GraphIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/IteratorEnumerationTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/IteratorEnumerationTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/IteratorEnumerationTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/IteratorEnumerationTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullEnumerationTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullEnumerationTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullEnumerationTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullEnumerationTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullListIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullListIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullListIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/NullListIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/PeekableIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/PeekableIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/PeekableIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/PeekableIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyListIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyListIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyListIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/ReadOnlyListIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementListIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementListIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementListIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/SingleElementListIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationListIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationListIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationListIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/TransformationListIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/TreeIteratorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/TreeIteratorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/iterators/TreeIteratorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/iterators/TreeIteratorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/node/AbstractNodeModelTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/node/AbstractNodeModelTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/node/AbstractNodeModelTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/node/AbstractNodeModelTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/node/AllNodeTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/node/AllNodeTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/node/AllNodeTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/node/AllNodeTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/AllStringTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/AllStringTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/AllStringTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/AllStringTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/BestFirstPartialStringComparatorEngineTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/BestFirstPartialStringComparatorEngineTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/BestFirstPartialStringComparatorEngineTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/BestFirstPartialStringComparatorEngineTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/CaseInsensitivePartialStringComparatorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/CaseInsensitivePartialStringComparatorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/CaseInsensitivePartialStringComparatorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/CaseInsensitivePartialStringComparatorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/ExhaustivePartialStringComparatorEngineTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/ExhaustivePartialStringComparatorEngineTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/ExhaustivePartialStringComparatorEngineTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/ExhaustivePartialStringComparatorEngineTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/InversePartialStringComparatorTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/InversePartialStringComparatorTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/InversePartialStringComparatorTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/InversePartialStringComparatorTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/PrefixStrippingPartialStringComparatorEngineTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/PrefixStrippingPartialStringComparatorEngineTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/PrefixStrippingPartialStringComparatorEngineTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/PrefixStrippingPartialStringComparatorEngineTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/RegularExpressionStringMatcherAdapterTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/RegularExpressionStringMatcherAdapterTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/RegularExpressionStringMatcherAdapterTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/RegularExpressionStringMatcherAdapterTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/SimpleStringMatcherTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/SimpleStringMatcherTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/SimpleStringMatcherTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/SimpleStringMatcherTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/StringToolsTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/StringToolsTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/StringToolsTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/StringToolsTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/SuffixStrippingPartialStringComparatorEngineTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/SuffixStrippingPartialStringComparatorEngineTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/SuffixStrippingPartialStringComparatorEngineTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/SuffixStrippingPartialStringComparatorEngineTests.java
diff --git a/utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/XMLStringEncoderTests.java b/utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/XMLStringEncoderTests.java
similarity index 100%
rename from utils/eclipselink.utils.workbench.test/utility/source/org/eclipse/persistence/tools/workbench/test/utility/string/XMLStringEncoderTests.java
rename to utils/eclipselink.utils.workbench/utility/src/test/java/org/eclipse/persistence/tools/workbench/test/utility/string/XMLStringEncoderTests.java
