diff --git a/dbws/dbws.simple/.classpath b/dbws/dbws.simple/.classpath
index 2784a1b..1abed5e 100644
--- a/dbws/dbws.simple/.classpath
+++ b/dbws/dbws.simple/.classpath
@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -28,5 +28,10 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dbws/dbws.simple/.project b/dbws/dbws.simple/.project
index 85977ec..4998bfc 100644
--- a/dbws/dbws.simple/.project
+++ b/dbws/dbws.simple/.project
@@ -21,12 +21,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/dbws/dbws.simple/.settings/org.eclipse.core.resources.prefs b/dbws/dbws.simple/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..29abf99
--- /dev/null
+++ b/dbws/dbws.simple/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+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
diff --git a/dbws/dbws.simple/.settings/org.eclipse.jdt.core.prefs b/dbws/dbws.simple/.settings/org.eclipse.jdt.core.prefs
index 45a6e0e..443e085 100644
--- a/dbws/dbws.simple/.settings/org.eclipse.jdt.core.prefs
+++ b/dbws/dbws.simple/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/dbws/dbws.simple/.settings/org.eclipse.wst.common.component b/dbws/dbws.simple/.settings/org.eclipse.wst.common.component
index a973b07..80e2d19 100644
--- a/dbws/dbws.simple/.settings/org.eclipse.wst.common.component
+++ b/dbws/dbws.simple/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,7 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
         <property name="context-root" value="dbws.simple"/>
         <property name="java-output-path" value="/dbws.simple/target/classes"/>
     </wb-module>
diff --git a/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..c8e0439
--- /dev/null
+++ b/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,12 @@
+<root>
+  <facet id="jst.jaxrs">
+    <node name="libprov">
+      <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
+    </node>
+  </facet>
+  <facet id="jst.jsf">
+    <node name="libprov">
+      <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>
diff --git a/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml b/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml
index d74c55e..2cb0b6e 100644
--- a/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/dbws/dbws.simple/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.web" version="2.3"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.jaxrs" version="1.1"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="jst.jsf" version="2.0"/>
 </faceted-project>
diff --git a/dbws/dbws.simple/README.md b/dbws/dbws.simple/README.md
index fa2675d..bddfba0 100644
--- a/dbws/dbws.simple/README.md
+++ b/dbws/dbws.simple/README.md
@@ -1,6 +1,17 @@
 EclipseLink DBWS: Simple Example
 ================================
 
-This simple example illustrates how EclipseLink DBWS can be used to generate a JAX-WS web service based on a very simple database schema.
+This simple example illustrates how EclipseLink DBWS can be used to generate a JAX-WS web service based on a very simple database schema.This example is based on:
 
-For more DBWS examples please see: http://wiki.eclipse.org/EclipseLink/Examples/DBWS
\ No newline at end of file
+http://wiki.eclipse.org/EclipseLink/Examples/DBWS/DBWSBasicTable
+
+For more DBWS examples please see: http://wiki.eclipse.org/EclipseLink/Examples/DBWS
+
+Running the Example
+-------------------
+
+1. Download the example - Clone the examples GIT repo
+2. Configure the database information
+3. Run the tests: mvn test
+4. Run the Packaging: mvn package
+5. Deploy WAR file to compatible target server
\ No newline at end of file
diff --git a/dbws/dbws.simple/builder/eclipselink-dbwsutils.jar b/dbws/dbws.simple/builder/eclipselink-dbwsutils.jar
new file mode 100644
index 0000000..233c373
--- /dev/null
+++ b/dbws/dbws.simple/builder/eclipselink-dbwsutils.jar
Binary files differ
diff --git a/dbws/dbws.simple/builder/install.sh b/dbws/dbws.simple/builder/install.sh
new file mode 100755
index 0000000..b0a41dd
--- /dev/null
+++ b/dbws/dbws.simple/builder/install.sh
@@ -0,0 +1,5 @@
+mvn install:install-file -Dpackaging=jar -Dfile=eclipselink-dbwsutils.jar -DgroupId=org.eclipse.persistence -DartifactId=dbws.builder -Dversion="2.4.2-RC1"
+
+mvn install:install-file -Dpackaging=jar -Dfile=org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar -DgroupId=org.eclipse.persistence -DartifactId=oracleddlparser -Dversion="2.4.2-RC1" -DsourceFile=org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar
+
+mvn install:install-file -Dpackaging=jar -Dfile=javax.wsdl_1.6.2.v201012040545.jar -DgroupId=org.eclipse.persistence -DartifactId=javax.wsdl -Dversion="1.6.2"
diff --git a/dbws/dbws.simple/builder/javax.servlet_2.4.0.v200806031604.jar b/dbws/dbws.simple/builder/javax.servlet_2.4.0.v200806031604.jar
new file mode 100644
index 0000000..9bc73d5
--- /dev/null
+++ b/dbws/dbws.simple/builder/javax.servlet_2.4.0.v200806031604.jar
Binary files differ
diff --git a/dbws/dbws.simple/builder/javax.wsdl_1.6.2.v201012040545.jar b/dbws/dbws.simple/builder/javax.wsdl_1.6.2.v201012040545.jar
new file mode 100644
index 0000000..8bb7cb3
--- /dev/null
+++ b/dbws/dbws.simple/builder/javax.wsdl_1.6.2.v201012040545.jar
Binary files differ
diff --git a/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar b/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar
new file mode 100644
index 0000000..f311703
--- /dev/null
+++ b/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar
Binary files differ
diff --git a/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar b/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar
new file mode 100644
index 0000000..5bee1e3
--- /dev/null
+++ b/dbws/dbws.simple/builder/org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar
Binary files differ
diff --git a/dbws/dbws.simple/pom.xml b/dbws/dbws.simple/pom.xml
index 0fbf85e..e423ec3 100644
--- a/dbws/dbws.simple/pom.xml
+++ b/dbws/dbws.simple/pom.xml
@@ -1,21 +1,154 @@
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>eclipselink.example.dbws</groupId>
-  <artifactId>dbws.simple</artifactId>
-  <packaging>war</packaging>
-  <version>2.4.2-SNAPSHOT</version>
-  <name>dbws.simple Maven Webapp</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>dbws.simple</finalName>
-  </build>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>eclipselink.example.dbws</groupId>
+	<artifactId>dbws.simple</artifactId>
+	<packaging>war</packaging>
+	<version>2.4.2-SNAPSHOT</version>
+
+	<name>EclipseLink Simple DBWS Example</name>
+	<url>http://wiki.eclipse.org/EclipseLink/Examples/DBWS</url>
+
+	<scm>
+		<connection>git://git.eclipse.org/gitroot/eclipselink/examples.git</connection>
+		<url>http://git.eclipse.org/c/eclipselink/examples.git/</url>
+	</scm>
+
+	<licenses>
+		<license>
+			<name>EPL: Eclipse Public License</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+		</license>
+		<license>
+			<name>EDL: Eclipse Distribution License</name>
+			<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<name>Doug Clarke</name>
+			<organization>Oracle</organization>
+			<email>douglas.clarke@oracle.com</email>
+			<url>java-persistence.blogspot.com</url>
+		</developer>
+		<developer>
+			<name>Dave McCann</name>
+			<organization>Oracle</organization>
+			<email>david.nccann@oracle.com</email>
+		</developer>
+	</developers>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
+		<eclipselink.artifactid>eclipselink</eclipselink.artifactid>
+		<eclipselink.version>2.4.2-SNAPSHOT</eclipselink.version>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>Java.Net</id>
+			<url>http://download.java.net/maven/2/</url>
+		</repository>
+		<repository>
+			<id>EclipseLink</id>
+			<url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${eclipselink.groupid}</groupId>
+			<artifactId>${eclipselink.artifactid}</artifactId>
+			<version>${eclipselink.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commonj.sdo</artifactId>
+					<groupId>commonj.sdo</groupId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-api</artifactId>
+			<version>6.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.24</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>oracleddlparser</artifactId>
+			<version>2.4.2-RC1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>dbws.builder</artifactId>
+			<version>2.4.2-RC1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>javax.wsdl</artifactId>
+			<version>1.6.2</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+
+		<finalName>dbws.simple</finalName>
+		<defaultGoal>package</defaultGoal>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.5.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generateDTOs</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>java</goal>
+						</goals>
+						<configuration>
+							<classpathScope>test</classpathScope>
+							<mainClass>org.eclipse.persistence.tools.dbws.DBWSBuilder</mainClass>
+							<arguments>
+								<argument>-builderFile ${project.basedir}/src/main/resources/dbws-builder.xml</argument>
+								<argument>-stageDir ${project.basedir}/target/dbws</argument>
+								<argument>-packageAs eclipse</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
 </project>
diff --git a/dbws/dbws.simple/src/main/java/resources/application.properties b/dbws/dbws.simple/src/main/java/resources/application.properties
new file mode 100644
index 0000000..5b9198d
--- /dev/null
+++ b/dbws/dbws.simple/src/main/java/resources/application.properties
@@ -0,0 +1,7 @@
+# -- welcome --
+welcomeTitle=JSF Blank Application
+
+welcomeHeading=Welcome!
+
+welcomeMessage=This is a JSF blank application. \
+	You can find the application.properties file with this message in the src/resources folder.
diff --git a/dbws/dbws.simple/src/main/resources/dbws-builder.xml b/dbws/dbws.simple/src/main/resources/dbws-builder.xml
new file mode 100644
index 0000000..09c523a
--- /dev/null
+++ b/dbws/dbws.simple/src/main/resources/dbws-builder.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dbws-builder xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<properties>
+		<property name="projectName">emp</property>
+		... database properties
+	</properties>
+	<table catalogPattern="%" tableNamePattern="EMP" />
+</dbws-builder>
\ No newline at end of file
diff --git a/dbws/dbws.simple/src/main/webapp/index.xhtml b/dbws/dbws.simple/src/main/webapp/index.xhtml
new file mode 100644
index 0000000..f902af8
--- /dev/null
+++ b/dbws/dbws.simple/src/main/webapp/index.xhtml
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core">
+
+<f:loadBundle basename="resources.application" var="msg"/>
+
+<head>
+    <title><h:outputText value="#{msg.welcomeTitle}" /></title>
+</head>
+
+<body>
+<h3><h:outputText value="#{msg.welcomeHeading}" /></h3>
+<p><h:outputText value="#{msg.welcomeMessage}" /></p>
+</body>
+</html>
diff --git a/dbws/dbws.simple/src/test/resources/create-schema.ddl b/dbws/dbws.simple/src/test/resources/create-schema.ddl
new file mode 100644
index 0000000..1e1cece
--- /dev/null
+++ b/dbws/dbws.simple/src/test/resources/create-schema.ddl
@@ -0,0 +1,12 @@
+CREATE TABLE SIMPLETABLE (
+    id NUMBER NOT NULL,
+    name VARCHAR2(25),
+    since DATE,
+    PRIMARY KEY (id)
+)
+
+    
+
+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'))
diff --git a/dbws/install-builder/install.sh b/dbws/install-builder/install.sh
new file mode 100755
index 0000000..b0a41dd
--- /dev/null
+++ b/dbws/install-builder/install.sh
@@ -0,0 +1,5 @@
+mvn install:install-file -Dpackaging=jar -Dfile=eclipselink-dbwsutils.jar -DgroupId=org.eclipse.persistence -DartifactId=dbws.builder -Dversion="2.4.2-RC1"
+
+mvn install:install-file -Dpackaging=jar -Dfile=org.eclipse.persistence.oracleddlparser_1.0.0.v20121122.jar -DgroupId=org.eclipse.persistence -DartifactId=oracleddlparser -Dversion="2.4.2-RC1" -DsourceFile=org.eclipse.persistence.oracleddlparser.source_1.0.0.v20121122.jar
+
+mvn install:install-file -Dpackaging=jar -Dfile=javax.wsdl_1.6.2.v201012040545.jar -DgroupId=org.eclipse.persistence -DartifactId=javax.wsdl -Dversion="1.6.2"
diff --git a/dbws/install-builder/pom.xml b/dbws/install-builder/pom.xml
new file mode 100644
index 0000000..b1f7ca3
--- /dev/null
+++ b/dbws/install-builder/pom.xml
@@ -0,0 +1,58 @@
+<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>com.oracle.toplink</groupId>
+	<artifactId>maven-install</artifactId>
+	<version>12.1.2</version>
+	<packaging>pom</packaging>
+
+	<properties>
+		<oracle.version>${project.version}-0-0</oracle.version>
+	</properties>
+
+	<build>
+		<defaultGoal>com.oracle.maven:oracle-maven-sync:push</defaultGoal>
+
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.3.1</version>
+				<configuration>
+					<pomFile>${oracleHome}/oracle_common/plugins/maven/com/oracle/maven/oracle-maven-sync/${project.version}/oracle-maven-sync.${project.version}.pom</pomFile>
+					<file>${oracleHome}/oracle_common/plugins/maven/com/oracle/maven/oracle-maven-sync/${project.version}/oracle-maven-sync.${project.version}.jar</file>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>com.oracle.maven</groupId>
+				<artifactId>oracle-maven-sync</artifactId>
+				<version>${oracle.version}</version>
+				<configuration>
+					<oracleHome>${oracleHome}</oracleHome>
+					<testOnly>false</testOnly>
+					<failOnError>false</failOnError>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>2.4.1</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${settings.localRepository}/org/eclipse/persistence/</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/jpa/employee/pom.xml b/jpa/employee/pom.xml
index 47d270f..1580b6d 100644
--- a/jpa/employee/pom.xml
+++ b/jpa/employee/pom.xml
@@ -74,8 +74,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
         </plugins>