Moved Employee services out of model project
diff --git a/dbws/dbws.simple/.settings/org.eclipse.core.resources.prefs b/dbws/dbws.simple/.settings/org.eclipse.core.resources.prefs
index f022440..99f26c0 100644
--- a/dbws/dbws.simple/.settings/org.eclipse.core.resources.prefs
+++ b/dbws/dbws.simple/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,2 @@
eclipse.preferences.version=1
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
diff --git a/jpa/employee/employee.model/.settings/org.eclipse.core.resources.prefs b/jpa/employee/employee.model/.settings/org.eclipse.core.resources.prefs
index d11aec2..839d647 100644
--- a/jpa/employee/employee.model/.settings/org.eclipse.core.resources.prefs
+++ b/jpa/employee/employee.model/.settings/org.eclipse.core.resources.prefs
@@ -1,7 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
-encoding//src/main/java/eclipselink/example/jpa/employee/services/AdminService.java=UTF-8
-encoding//src/main/java/eclipselink/example/jpa/employee/services/EmployeeRepository.java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
diff --git a/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch b/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch
index 97480c0..8977a42 100644
--- a/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch
@@ -1,7 +1,7 @@
<?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="/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/DiagnosticsTest.java"/>
+<listEntry value="/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/DiagnosticsTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -12,7 +12,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.DiagnosticsTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.model"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch b/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch
index 9d6a4f2..2918e4d 100644
--- a/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch
@@ -1,7 +1,7 @@
<?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="/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/EditEmployeeTest.java"/>
+<listEntry value="/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/EditEmployeeTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -12,7 +12,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.EditEmployeeTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.model"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch b/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch
index d591873..ef93444 100644
--- a/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch
@@ -2,7 +2,7 @@
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<stringAttribute key="bad_container_name" value="/employee.model/src/eclips"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/PageEmployeesTest.java"/>
+<listEntry value="/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/PageEmployeesTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -13,7 +13,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.PageEmployeesTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.model"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch b/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch
index d2e961d..3406a99 100644
--- a/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch
@@ -2,7 +2,7 @@
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<stringAttribute key="bad_container_name" value="/employee.model/src/eclips"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/PageIdsInEmployeesTest.java"/>
+<listEntry value="/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/PageIdsInEmployeesTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -13,7 +13,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.PageIdsInEmployeesTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.model"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch b/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch
index c708c0d..284c19a 100644
--- a/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch
@@ -2,10 +2,10 @@
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<stringAttribute key="bad_container_name" value="/employee.model/src/eclips"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/StreamEmployeesTest.java"/>
+<listEntry value="/employee.web"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -13,7 +13,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.StreamEmployeesTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.model"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/TestAdminService.launch b/jpa/employee/employee.model/src/eclipse/TestAdminService.launch
index 7c3854f..790e272 100644
--- a/jpa/employee/employee.model/src/eclipse/TestAdminService.launch
+++ b/jpa/employee/employee.model/src/eclipse/TestAdminService.launch
@@ -1,7 +1,7 @@
<?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="/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/TestAdminService.java"/>
+<listEntry value="/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/TestAdminService.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -12,7 +12,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.TestAdminService"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.model"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
</launchConfiguration>
diff --git a/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml b/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml
index c24c4b4..730c4f2 100644
--- a/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml
+++ b/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<persistence-unit name="employee" transaction-type="JTA">
- <jta-data-source>java:global/employeeDS</jta-data-source>
+ <jta-data-source>jdbc/TLDS_examples</jta-data-source>
<class>eclipselink.example.jpa.employee.model.Address</class>
<class>eclipselink.example.jpa.employee.model.Employee</class>
<class>eclipselink.example.jpa.employee.model.PhoneNumber</class>
diff --git a/jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/AdminService.java b/jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/AdminService.java
similarity index 100%
rename from jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/AdminService.java
rename to jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/AdminService.java
diff --git a/jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/EmployeeCriteria.java b/jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/EmployeeCriteria.java
similarity index 100%
rename from jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/EmployeeCriteria.java
rename to jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/EmployeeCriteria.java
diff --git a/jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/EmployeeRepository.java b/jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/EmployeeRepository.java
similarity index 100%
rename from jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/EmployeeRepository.java
rename to jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/EmployeeRepository.java
diff --git a/jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/paging/EntityPaging.java b/jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/paging/EntityPaging.java
similarity index 100%
rename from jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/paging/EntityPaging.java
rename to jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/paging/EntityPaging.java
diff --git a/jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/paging/FirstMaxPaging.java b/jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/paging/FirstMaxPaging.java
similarity index 100%
rename from jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/paging/FirstMaxPaging.java
rename to jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/paging/FirstMaxPaging.java
diff --git a/jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/paging/IdInPaging.java b/jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/paging/IdInPaging.java
similarity index 100%
rename from jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/paging/IdInPaging.java
rename to jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/paging/IdInPaging.java
diff --git a/jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/persistence/SQLCapture.java b/jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/persistence/SQLCapture.java
similarity index 100%
rename from jpa/employee/employee.model/src/main/java/eclipselink/example/jpa/employee/services/persistence/SQLCapture.java
rename to jpa/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/services/persistence/SQLCapture.java
diff --git a/jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/DiagnosticsTest.java b/jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/DiagnosticsTest.java
similarity index 100%
rename from jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/DiagnosticsTest.java
rename to jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/DiagnosticsTest.java
diff --git a/jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/EditEmployeeTest.java b/jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/EditEmployeeTest.java
similarity index 100%
rename from jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/EditEmployeeTest.java
rename to jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/EditEmployeeTest.java
diff --git a/jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/PageEmployeesTest.java b/jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/PageEmployeesTest.java
similarity index 100%
rename from jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/PageEmployeesTest.java
rename to jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/PageEmployeesTest.java
diff --git a/jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/PageIdsInEmployeesTest.java b/jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/PageIdsInEmployeesTest.java
similarity index 100%
rename from jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/PageIdsInEmployeesTest.java
rename to jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/PageIdsInEmployeesTest.java
diff --git a/jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/TestAdminService.java b/jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/TestAdminService.java
similarity index 100%
rename from jpa/employee/employee.model/src/test/java/eclipselink/example/jpa/employee/test/services/TestAdminService.java
rename to jpa/employee/employee.web/src/test/java/eclipselink/example/jpa/employee/test/services/TestAdminService.java
diff --git a/moxy/dynamic/flickr/.settings/org.eclipse.core.resources.prefs b/moxy/dynamic/flickr/.settings/org.eclipse.core.resources.prefs
index 29abf99..abdea9a 100644
--- a/moxy/dynamic/flickr/.settings/org.eclipse.core.resources.prefs
+++ b/moxy/dynamic/flickr/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,4 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
