Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/examples
diff --git a/dbws/dbws.simple/src/test/resources/create-schema.ddl b/dbws/dbws.simple/src/test/resources/create-schema.ddl
index 1e1cece..8f69878 100644
--- a/dbws/dbws.simple/src/test/resources/create-schema.ddl
+++ b/dbws/dbws.simple/src/test/resources/create-schema.ddl
@@ -1,12 +1,26 @@
-CREATE TABLE SIMPLETABLE (
- id NUMBER NOT NULL,
- name VARCHAR2(25),
- since DATE,
- PRIMARY KEY (id)
-)
+CREATE TABLE IF NOT EXISTS EMP (
+ EMPNO decimal(4,0),
+ ENAME varchar(10),
+ JOB varchar(9),
+ MGR decimal(4,0),
+ HIREDATE date,
+ SAL decimal(7,2),
+ COMM decimal(7,2),
+ DEPTNO decimal(2),
+ PRIMARY KEY (EMPNO)
+);
-
-
-INSERT INTO SIMPLETABLE (id, name, since) VALUES (1, 'mike', to_date('2001-12-25','YYYY-MM-DD'))
-INSERT INTO SIMPLETABLE (id, name, since) VALUES (2, 'blaise', to_date('2001-12-25','YYYY-MM-DD'))
-INSERT INTO SIMPLETABLE (id, name, since) VALUES (3, 'rick', to_date('2001-12-25','YYYY-MM-DD'))
+INSERT INTO EMP VALUES (7369,'SMITH','CLERK',7902,'1980-12--17',800,NULL,20);
+INSERT INTO EMP VALUES (7499,'ALLEN','SALESMAN',7698,'1981-2-20',1600,300,30);
+INSERT INTO EMP VALUES (7521,'WARD','SALESMAN',7698,'1981-2-22',1250,500,30);
+INSERT INTO EMP VALUES (7566,'JONES','MANAGER',7839,'1981-4-2',2975,NULL,20);
+INSERT INTO EMP VALUES (7654,'MARTIN','SALESMAN',7698,'1981-9-28',1250,1400,30);
+INSERT INTO EMP VALUES (7698,'BLAKE','MANAGER',7839,'1981-5-1',2850,NULL,30);
+INSERT INTO EMP VALUES (7782,'CLARK','MANAGER',7839,'1981-6-9',2450,NULL,10);
+INSERT INTO EMP VALUES (7788,'SCOTT','ANALYST',7566,'1981-06-09',3000,NULL,20);
+INSERT INTO EMP VALUES (7839,'KING','PRESIDENT',NULL,'1981-11-17',5000,NULL,10);
+INSERT INTO EMP VALUES (7844,'TURNER','SALESMAN',7698,'1981-9-8',1500,0,30);
+INSERT INTO EMP VALUES (7876,'ADAMS','CLERK',7788,'1987-05-23',1100,NULL,20);
+INSERT INTO EMP VALUES (7900,'JAMES','CLERK',7698,'1981-12-03',950,NULL,30);
+INSERT INTO EMP VALUES (7902,'FORD','ANALYST',7566,'1981-12-03',3000,NULL,20);
+INSERT INTO EMP VALUES (7934,'MILLER','CLERK',7782,'1982-01-23',1300,NULL,10);
diff --git a/dbws/dbws.simple/src/test/resources/drop-schema.ddl b/dbws/dbws.simple/src/test/resources/drop-schema.ddl
new file mode 100644
index 0000000..562a90f
--- /dev/null
+++ b/dbws/dbws.simple/src/test/resources/drop-schema.ddl
@@ -0,0 +1 @@
+DROP TABLE EMP
diff --git a/jpa/employee/employee.web/pom.xml b/jpa/employee/employee.web/pom.xml
index bb48021..d8cd95b 100644
--- a/jpa/employee/employee.web/pom.xml
+++ b/jpa/employee/employee.web/pom.xml
@@ -69,7 +69,7 @@
<build>
- <finalName>employe.web</finalName>
+ <finalName>employee.web</finalName>
<defaultGoal>package</defaultGoal>
<plugins>
