diff --git a/README.md b/README.md
index 2271e49..8f90014 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,25 @@
+# Legacy Java EE Home
+
+The Java EE project has been contributed to Eclipse Foundation and has been renamed to Jakarta EE.
+All active work is taking place at this new location
+
++ https://projects.eclipse.org/projects/ee4j
++ https://jakarta.ee/specifications
+
+The following legacy archives are available for anyone who wishes to browse the extensive history, prior
+to contribution to Eclipse.
+
+# Key Java EE resources
+
+* Java EE Platform [Specification](https://javaee.github.io/javaee-spec/)
+* [GlassFish](https://javaee.github.io/glassfish/), the Open Source Java EE Reference Implementation
+* Java EE [Javadocs](https://javaee.github.io/javaee-spec/javadocs/)
+* Java EE API [Maven coordinates](https://mvnrepository.com/artifact/javax/javaee-api/8.0)
+* Java.net mailing list [archives](http://download.oracle.com/javaee-archive/)
+
# Migrated Projects
-The following Java EE projects have been recently migrated from Java.net to GitHub.
+The following Java EE projects were migrated from Java.net to GitHub.
* [cargotracker](http://javaee.github.io/cargotracker)
* [codemodel](http://javaee.github.io/jaxb-codemodel)
@@ -11,30 +30,34 @@ The following Java EE projects have been recently migrated from Java.net to GitH
* [ejb-spec](http://github.com/javaee/ejb-spec)
* [el-spec](http://github.com/javaee/el-spec)
* [fi](http://javaee.github.io/metro-fi)
+* [firstcup](https://github.com/javaee/firstcup)
* [Genericjmsra](http://javaee.github.io/glassfish-genericjmsra)
* [glassfish](http://javaee.github.io/glassfish)
* [glassfish-corba](http://javaee.github.io/glassfish-corba)
* [glassfish-samples](http://javaee.github.io/glassfish-samples)
* [gmbal](http://javaee.github.io/gmbal)
* [grizzly](http://javaee.github.io/grizzly)
-* [hk2](https://hk2-project.github.io/)
-* [interceptors-spec](http://github.com/javaee/interceptors-spec)
+* [hk2](https://javaee.github.io/hk2/)
+* [interceptors-spec](https://javaee.github.io/interceptors-spec/)
* [istack-commons](http://javaee.github.io/jaxb-istack-commons)
* [jacc-spec](http://javaee.github.io/jacc-spec)
* [jaspic-spec](http://javaee.github.io/jaspic-spec)
-* [javaee7-samples](http://github.com/javaee/javaee7-samples)
-* [javaee-security-spec](https://github.com/javaee/security-spec)
+* [javaee7-samples](https://javaee.github.io/javaee7-samples/)
+* [javaee-security-spec](https://javaee.github.io/security-spec/)
* [javaee-spec](http://javaee.github.io/javaee-spec)
+* [javaeetutorial](https://javaee.github.io/tutorial/)
* [javahelp](http://javaee.github.io/javahelp)
* [javamail](http://javaee.github.io/javamail)
-* [javaserverfaces](http://javaee.github.io/javaserverfaces-spec)
-* [jaxb](http://github.com/gf-metro/jaxb)
+* [javaservefaces](https://javaee.github.io/javaserverfaces/index-0.html)
+* [javaservefaces-spec-public](http://javaee.github.io/javaserverfaces-spec)
+* [jaxb](https://javaee.github.io/jaxb-v2/)
* [jaxb2-commons](http://github.com/javaee/jaxb2-commons)
* [jaxb-verification](http://github.com/javaee/jaxb-verification)
* [jax-rpc](http://github.com/javaee/jax-rpc-ri)
* [jax-rs-spec](http://github.com/jax-rs)
-* [jax-ws](http://github.com/gf-metro/jaxws)
+* [jax-ws](https://javaee.github.io/metro-jax-ws/)
* [jax-ws-commons](http://javaee.github.io/metro-jaxws-commons)
+* [jbatch](https://github.com/WASdev/standards.jsr352.batch-spec/wiki)
* [jersey](http://github.com/jersey)
* [jmsjca](http://github.com/javaee/glassfish-jmsjca)
* [jms-spec](http://javaee.github.io/jms-spec)
@@ -57,15 +80,15 @@ The following Java EE projects have been recently migrated from Java.net to GitH
* [maven-jaxb2-plugin](http://javaee.github.io/metro-maven-jaxb2-plugin)
* [metro](http://javaee.github.io/metro)
* [mimepull](http://javaee.github.io/metro-mimepull)
-* [mojarra](https://github.com/javaserverfaces/mojarra)
+* [mojarra](https://javaserverfaces.github.io/)
* [openmq](http://javaee.github.io/openmq)
* [package-rename-task](http://github.com/javaee/metro-package-rename-task)
* [policy](http://javaee.github.io/metro-policy)
-* [saaj](https://github.com/javaee/metro-saaj)
-* [servlet-spec](http://github.com/javaee/servlet-spec)
+* [saaj](https://javaee.github.io/metro-saaj/)
+* [servlet-spec](https://javaee.github.io/servlet-spec/)
* [shoal](http://javaee.github.io/shoal)
* [stax-ex](http://javaee.github.io/metro-stax-ex)
-* [tyrus](http://github.com/tyrus-project/tyrus)
+* [tyrus](https://github.com/javaee/tyrus)
* [uel](http://javaee.github.io/uel-ri)
* [wadl](http://javaee.github.io/wadl)
* [websocket-spec](http://github.com/javaee/websocket-spec)
diff --git a/_layouts/default.html b/_layouts/default.html
index 37c6d7e..9f61521 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -50,7 +50,7 @@
{% endif %}
{% if site.links.docs %}
-
+
{% endif %}
{% if site.links.faq %}
diff --git a/javaee7/hol/javaee7-hol.pdf b/javaee7/hol/javaee7-hol.pdf
new file mode 100644
index 0000000..357bac3
Binary files /dev/null and b/javaee7/hol/javaee7-hol.pdf differ
diff --git a/javaee7/hol/javaee7-hol_es.pdf b/javaee7/hol/javaee7-hol_es.pdf
new file mode 100644
index 0000000..195dc39
Binary files /dev/null and b/javaee7/hol/javaee7-hol_es.pdf differ
diff --git a/javaee7/hol/movieplex7-solution.zip b/javaee7/hol/movieplex7-solution.zip
new file mode 100644
index 0000000..550bd55
Binary files /dev/null and b/javaee7/hol/movieplex7-solution.zip differ
diff --git a/javaee7/hol/movieplex7-starting-template.zip b/javaee7/hol/movieplex7-starting-template.zip
new file mode 100644
index 0000000..7a00281
Binary files /dev/null and b/javaee7/hol/movieplex7-starting-template.zip differ
diff --git a/javaee7/techkit/JavaEE7-1hour.pdf b/javaee7/techkit/JavaEE7-1hour.pdf
new file mode 100644
index 0000000..e0504ff
Binary files /dev/null and b/javaee7/techkit/JavaEE7-1hour.pdf differ
diff --git a/javaee7/techkit/JavaEE7-1hour.pptx b/javaee7/techkit/JavaEE7-1hour.pptx
new file mode 100644
index 0000000..58dbd19
Binary files /dev/null and b/javaee7/techkit/JavaEE7-1hour.pptx differ
diff --git a/javaee7/techkit/index.MD b/javaee7/techkit/index.MD
new file mode 100644
index 0000000..7b0ce35
--- /dev/null
+++ b/javaee7/techkit/index.MD
@@ -0,0 +1,46 @@
+# Java Platform, Enterprise Edition 7 Technical Kit
+
+## Introduction
+
+The Java EE 7 Technical Kit is a bundle of in-depth material that brings developers quickly up to speed on the many new and updated features available in the platform.
+
+## Contents
+
+### Introduction Presentation
+
+One-hour Java EE 7 Presentation: [ppt](JavaEE7-1hour.pptx) (with speaker notes) and [pdf](JavaEE7-1hour.pdf).
+
+### Java EE 7 Tutorial
+
+Overview of Java EE 7 architecture and multi-tiered applications.
+
+* [Java EE 7 First Cup](https://docs.oracle.com/javaee/7/firstcup/index.html)
+* [Java EE 7 Tutorial](https://docs.oracle.com/javaee/7/tutorial/)
+
+### Java EE 7 SDK
+
+An [all-in-one bundle](http://www.oracle.com/technetwork/java/javaee/downloads/index.html) that includes Samples, Tutorial, API documentation and GlassFish Server Open Source Edition 4.
+
+### Java EE 7 Hands-On Lab
+
+A step-by-step guide to building an application that uses new and updated Java EE 7 features:
+* [Hands-On Lab Guide](../hol/javaee7-hol.pdf)
+* [Starting template](../hol/movieplex7-starting-template.zip)
+* [Solution](../hol/movieplex7-solution.zip)
+
+### Java EE 7 Technical Videos
+
+**Dynamic, Scalable HTML5 Applications**
+
+[](https://youtu.be/jkchA2WeZwA?list=PL74xrT3oGQfAai4VfDm_GOSDRCBssB9ex)
+
+**Increase Developer Productivity**
+
+[](https://youtu.be/NLprSmnar1k?list=PL74xrT3oGQfA21p-q34-6hzesB6Lb0nw7)
+
+**Meet Demanding Enterprise Needs**
+
+[](https://youtu.be/Bs3ZD00CcSs?list=PL74xrT3oGQfCVNAhT3JIOI3IP3gTYSVaQ)
+
+
+
diff --git a/other-migrated-projects.md b/other-migrated-projects.md
index 63ed4b7..5eda691 100644
--- a/other-migrated-projects.md
+++ b/other-migrated-projects.md
@@ -17,7 +17,6 @@ check for contact details associated with these project pages.
* [java-developpez-com](http://java.developpez.com/)
* [java-nio-charset-enhanced](http://jugkoeln.de/java-nio-charset-enhanced) - not available as of May 17, 2017
* [javabuild](http://javabuild.github.io/)
-* [jbatch](https://github.com/WASdev/standards.jsr352.batch-spec/wiki)
* [jdbc-odbc-enhanced](http://jugkoeln.de/JDBC-ODBC-enhanced) - not available as of May 17, 2017
* [jdtrace](http://github.com/amithur/jdtrace.git)
* [jemmy](http://hg.openjdk.java.net/code-tools/jemmy/v2/)
@@ -51,11 +50,11 @@ our discussion list at *glassfish at javaee dot groups dot io* (you must be a me
|:------|:------|:------|:------|
|ajax|atmosphere|avatar|avatar-js|
|certadmin|embedded-glassfish|facelets|fi-interop|
-|firscup|fuji|gf-cdi-porting-tck|gf-maven-plugin|
+|fuji|gf-cdi-porting-tck|gf-maven-plugin| |
|gf-repo|gf-tooling|glassfish-repo|glassfish-scripting|
|grizzly-servlet-container|hj3|hk2-gradle-plugin|http-client|
|hypercompass|hyperjaxb3|hyperubl|japex|
-|javaeetutorial|javaserverfaces-sources|javaserverfaces-spec-eg|javaserverfaces-spec-public|
+|javaserverfaces-sources|javaserverfaces-spec-eg| | |
|java-state-managemen|java-state-mgmt-ri|jaxb2-reflection|jaxb2-sources|
|jaxb-architecture-document|jaxbhelp|jaxb-tck|jaxp|
|jaxp-sources|jax-rpc-sources|jax-rpc-tck|jax-ws-sources|