diff --git a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
index 1dcc5d6..2781c0d 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright (c) 2007, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!-- 
 
 	This script build the Help plug-in by transforming the DITA source files into HTML.
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/about.html b/docs/org.eclipse.jst.server.ui.doc.user/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/about.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/build.properties b/docs/org.eclipse.jst.server.ui.doc.user/build.properties
index d75418d..a6ff5d5 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/build.properties
+++ b/docs/org.eclipse.jst.server.ui.doc.user/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = org.eclipse.jst.server.ui.doc.user_build_toc.xml,\
                *.xml,\
                plugin.properties,\
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml b/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml
index 4b38089..5d52ebd 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/build_toc.xml
@@ -2,9 +2,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
index 0f46c75..3da5b41 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
@@ -2,4 +2,17 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2010, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc/>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
index f5be97b..67a64ac 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
@@ -4,9 +4,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml
index f3200fa..0207082 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.userindex.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <index>
   <entry keyword="testing">
     <entry keyword="Web projects">
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
index 5adea4f..851357e 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
+# Copyright (c) 2001, 2006 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
index 90d3fea..8efa693 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
@@ -4,9 +4,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/pom.xml b/docs/org.eclipse.jst.server.ui.doc.user/pom.xml
index 55a94a9..842c005 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/pom.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/pom.xml
@@ -8,7 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
--->
+-->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
index 10fc98c..f774de2 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
@@ -2,6 +2,19 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc link_to="../org.eclipse.wst.server.ui.doc.user/wtp_create.xml#tomcat_create" label="tomcat_tasks" topic="topics/tomcat.html">
 <topic label="...Apache Tomcat" href="topics/tomcat.html"/>
 </toc>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
index 87ec3b3..1bcb2bf 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
@@ -2,6 +2,19 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc link_to="../org.eclipse.wst.server.ui.doc.user/wtp_create.xml#tomcat_pref" label="tomcat_tasks" topic="topics/twtomprf.html">
 <topic label="...for Apache Tomcat runtimes" href="topics/twtomprf.html"/>
 </toc>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
index b2dfd2e..1a753e1 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
index 4f81034..71cc4e5 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml b/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml
index 3f822bf..9954b0d 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/STjavaContexts.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml b/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml
index 16b563b..42b06bc 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/STtomcatContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.infopop/about.html b/docs/org.eclipse.jst.server.ui.infopop/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/about.html
+++ b/docs/org.eclipse.jst.server.ui.infopop/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.jst.server.ui.infopop/build.properties b/docs/org.eclipse.jst.server.ui.infopop/build.properties
index 25c3c39..23a9a86 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/build.properties
+++ b/docs/org.eclipse.jst.server.ui.infopop/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = STjavaContexts.xml,\
                STtomcatContexts.xml,\
                plugin.properties,\
diff --git a/docs/org.eclipse.jst.server.ui.infopop/plugin.properties b/docs/org.eclipse.jst.server.ui.infopop/plugin.properties
index 7825c7e..f8f44d1 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/plugin.properties
+++ b/docs/org.eclipse.jst.server.ui.infopop/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 # NLS_MESSAGEFORMAT_VAR
 
 pluginName = Server Tools infopops for J2EE Standard Tools
diff --git a/docs/org.eclipse.jst.server.ui.infopop/plugin.xml b/docs/org.eclipse.jst.server.ui.infopop/plugin.xml
index 877ae60..76b5233 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/plugin.xml
@@ -3,9 +3,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.jst.server.ui.infopop/pom.xml b/docs/org.eclipse.jst.server.ui.infopop/pom.xml
index fb5befd..976ed1a 100644
--- a/docs/org.eclipse.jst.server.ui.infopop/pom.xml
+++ b/docs/org.eclipse.jst.server.ui.infopop/pom.xml
@@ -8,7 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
--->
+-->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/docs/org.eclipse.server.doc.isv/about.html b/docs/org.eclipse.server.doc.isv/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.server.doc.isv/about.html
+++ b/docs/org.eclipse.server.doc.isv/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.server.doc.isv/build.properties b/docs/org.eclipse.server.doc.isv/build.properties
index bf6b205..1181ac2 100644
--- a/docs/org.eclipse.server.doc.isv/build.properties
+++ b/docs/org.eclipse.server.doc.isv/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2008, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = META-INF/,\
                plugin.xml,\
                topics_ExtPoint_Reference.xml,\
diff --git a/docs/org.eclipse.server.doc.isv/buildExtDocs.properties b/docs/org.eclipse.server.doc.isv/buildExtDocs.properties
index 6d984f1..c14f83d 100644
--- a/docs/org.eclipse.server.doc.isv/buildExtDocs.properties
+++ b/docs/org.eclipse.server.doc.isv/buildExtDocs.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.server.doc.isv/buildExtDocs.xml b/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
index 67432f6..1ab1ca6 100644
--- a/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
+++ b/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
 
 	<property file="buildExtDocs.properties"/>
diff --git a/docs/org.eclipse.server.doc.isv/extDocListings.xml b/docs/org.eclipse.server.doc.isv/extDocListings.xml
index 872ba5f..eae27e1 100644
--- a/docs/org.eclipse.server.doc.isv/extDocListings.xml
+++ b/docs/org.eclipse.server.doc.isv/extDocListings.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <components>
 	<component name="Server Tools" id="servertools" file="servertoolsextdocs.xml"/>
 </components>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
index b4c910c..2d77246 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
index 0e81b96..f1a5c11 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
index 71dcd4b..92eef94 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
index 5fbb1f2..4dcc302 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
index fe45e10..6bb34cb 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
index 9a48f9c..695aa2b 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
@@ -97,9 +97,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
index a598cf4..1218459 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
@@ -60,9 +60,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
index 08adc71..fdc9efa 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
@@ -47,9 +47,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
index a03fc91..ecdbe33 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
index b319629..af84e04 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
index e6341ec..32b0b69 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
@@ -237,9 +237,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
index 716e806..521b3e8 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
@@ -64,9 +64,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
index ff33f97..00ae7e8 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
index 71f83d5..3f6daef 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
@@ -45,9 +45,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
index 3705480..da0cf65 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
index 42c0a86..a5870b9 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
index 064244f..527fdfa 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
@@ -52,9 +52,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
index c08e040..856af90 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
@@ -54,9 +54,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
index ad57210..1c81a16 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
index bb63ee5..63f8a30 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
index 3e2b699..785a262 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
index 5b05283..1cb9434 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
@@ -57,9 +57,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
index be5eb39..ee86f8e 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
index 808d90f..ed00652 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
index f61b489..a5d9712 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
index c905ee0..b7aa427 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
@@ -48,9 +48,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
index f3f857a..9250143 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
index 850738d..f8614c7 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
index 40eeb41..af24736 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.server.doc.isv/javadoc.properties b/docs/org.eclipse.server.doc.isv/javadoc.properties
index 46cb22c..83c3269 100644
--- a/docs/org.eclipse.server.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.server.doc.isv/javadoc.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.server.doc.isv/javadoc.xml b/docs/org.eclipse.server.doc.isv/javadoc.xml
index 97af1e7..5ca5963 100644
--- a/docs/org.eclipse.server.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.server.doc.isv/javadoc.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.server.doc.isv/javadocBuild.xml b/docs/org.eclipse.server.doc.isv/javadocBuild.xml
index 5119a48..22330d9 100644
--- a/docs/org.eclipse.server.doc.isv/javadocBuild.xml
+++ b/docs/org.eclipse.server.doc.isv/javadocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.server.doc.isv/javadoctoc.xml b/docs/org.eclipse.server.doc.isv/javadoctoc.xml
index 542a3b3..e3d3a86 100644
--- a/docs/org.eclipse.server.doc.isv/javadoctoc.xml
+++ b/docs/org.eclipse.server.doc.isv/javadoctoc.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 <toc label="Javadoc Packages Reference">
+	
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+ <toc label="Javadoc Packages Reference">
 <topic label="org.eclipse.jst.server.core" href="html/api_reference/org/eclipse/jst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core" href="html/api_reference/org/eclipse/wst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core.model" href="html/api_reference/org/eclipse/wst/server/core/model/package-summary.html"/>
diff --git a/docs/org.eclipse.server.doc.isv/packages.xml b/docs/org.eclipse.server.doc.isv/packages.xml
index 089b76a..d0b114d 100644
--- a/docs/org.eclipse.server.doc.isv/packages.xml
+++ b/docs/org.eclipse.server.doc.isv/packages.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <packages><package></package><package>org.eclipse.jst.server.core</package><package>org.eclipse.wst.server.core</package><package>org.eclipse.wst.server.core.model</package><package>org.eclipse.wst.server.core.util</package><package>org.eclipse.wst.server.ui</package><package>org.eclipse.wst.server.ui.actions</package><package>org.eclipse.wst.server.ui.editor</package><package>org.eclipse.wst.server.ui.wizard</package></packages>
\ No newline at end of file
diff --git a/docs/org.eclipse.server.doc.isv/plugin.properties b/docs/org.eclipse.server.doc.isv/plugin.properties
index 465d8a1..7de52a5 100644
--- a/docs/org.eclipse.server.doc.isv/plugin.properties
+++ b/docs/org.eclipse.server.doc.isv/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.server.doc.isv/plugins.xml b/docs/org.eclipse.server.doc.isv/plugins.xml
index 7bc30d4..590338e 100644
--- a/docs/org.eclipse.server.doc.isv/plugins.xml
+++ b/docs/org.eclipse.server.doc.isv/plugins.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 org.eclipse.wst.internet.monitor.core;
 org.eclipse.wst.server.core;
 org.eclipse.wst.server.http.core;
diff --git a/docs/org.eclipse.server.doc.isv/pom.xml b/docs/org.eclipse.server.doc.isv/pom.xml
index 6becae9..6ead3cf 100644
--- a/docs/org.eclipse.server.doc.isv/pom.xml
+++ b/docs/org.eclipse.server.doc.isv/pom.xml
@@ -8,7 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
--->
+-->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml b/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
index c26677d..06945bd 100644
--- a/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
+++ b/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <files component="servertools"><file>org_eclipse_jst_server_core_internalRuntimeComponentProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeClasspathProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeFacetMappings.html</file>/n/n<file>org_eclipse_jst_server_core_serverProfilers.html</file>/n/n<file>org_eclipse_wst_server_core_clients.html</file>/n/n<file>org_eclipse_wst_server_core_installableRuntimes.html</file>/n/n<file>org_eclipse_wst_server_core_installableServers.html</file>/n/n<file>org_eclipse_wst_server_core_internalServerMonitors.html</file>/n/n<file>org_eclipse_wst_server_core_internalStartup.html</file>/n/n<file>org_eclipse_wst_server_core_launchableAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleArtifactAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleFactories.html</file>/n/n<file>org_eclipse_wst_server_core_moduleTypes.html</file>/n/n<file>org_eclipse_wst_server_core_publishTasks.html</file>/n/n<file>org_eclipse_wst_server_core_publishers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeFacetComponentProviders.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeLocators.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTargetHandlers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTypes.html</file>/n/n<file>org_eclipse_wst_server_core_serverLocators.html</file>/n/n<file>org_eclipse_wst_server_core_serverTypes.html</file>/n/n<file>org_eclipse_wst_server_ui_audio.html</file>/n/n<file>org_eclipse_wst_server_ui_editorActions.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPageSections.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPages.html</file>/n/n<file>org_eclipse_wst_server_ui_initialSelectionProvider.html</file>/n/n<file>org_eclipse_wst_server_ui_serverImages.html</file>/n/n<file>org_eclipse_wst_server_ui_serverToolTip.html</file>/n/n<file>org_eclipse_wst_server_ui_wizardFragments.html</file></files>
\ No newline at end of file
diff --git a/docs/org.eclipse.server.doc.isv/tocreference.xml b/docs/org.eclipse.server.doc.isv/tocreference.xml
index d52b879..fb524d6 100644
--- a/docs/org.eclipse.server.doc.isv/tocreference.xml
+++ b/docs/org.eclipse.server.doc.isv/tocreference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc label="Server Tools Reference" link_to="../org.eclipse.wst.doc.user/reference_toc.xml#javadoc_servertools"> 
 	<topic label="Server Tools API Reference" href="html/api_reference/overview-summary.html">
     <link toc="javadoctoc.xml"/>
diff --git a/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml b/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
index 5228142..52a5d7f 100644
--- a/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
+++ b/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 	<toc label="Extension Points Reference">
+	 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+	<toc label="Extension Points Reference">
 <topic label="org.eclipse.jst.server.core.internalRuntimeComponentProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeClasspathProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeFacetMappings" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/about.html b/docs/org.eclipse.servertools.doc.isv/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.servertools.doc.isv/about.html
+++ b/docs/org.eclipse.servertools.doc.isv/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.servertools.doc.isv/build.properties b/docs/org.eclipse.servertools.doc.isv/build.properties
index 6213ceb..378bec1 100644
--- a/docs/org.eclipse.servertools.doc.isv/build.properties
+++ b/docs/org.eclipse.servertools.doc.isv/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2008, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = .,\
                plugin.xml,\
                plugin.properties,\
diff --git a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties
index 6d984f1..c14f83d 100644
--- a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties
+++ b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml
index 67432f6..1ab1ca6 100644
--- a/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml
+++ b/docs/org.eclipse.servertools.doc.isv/buildExtDocs.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
 
 	<property file="buildExtDocs.properties"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/extDocListings.xml b/docs/org.eclipse.servertools.doc.isv/extDocListings.xml
index 872ba5f..eae27e1 100644
--- a/docs/org.eclipse.servertools.doc.isv/extDocListings.xml
+++ b/docs/org.eclipse.servertools.doc.isv/extDocListings.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <components>
 	<component name="Server Tools" id="servertools" file="servertoolsextdocs.xml"/>
 </components>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
index b4c910c..2d77246 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
index 0e81b96..f1a5c11 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
index 71dcd4b..92eef94 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
index 5fbb1f2..4dcc302 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_jst_server_core_serverProfilers.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2006 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
index fe45e10..6bb34cb 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_clients.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
index 9a48f9c..695aa2b 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableRuntimes.html
@@ -97,9 +97,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
index a598cf4..1218459 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_installableServers.html
@@ -60,9 +60,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
index 08adc71..fdc9efa 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalServerMonitors.html
@@ -47,9 +47,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
index a03fc91..ecdbe33 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_internalStartup.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
index b319629..af84e04 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_launchableAdapters.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
index e6341ec..32b0b69 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
@@ -237,9 +237,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
index 716e806..521b3e8 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleFactories.html
@@ -64,9 +64,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
index ff33f97..00ae7e8 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleTypes.html
@@ -49,9 +49,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
index 71f83d5..3f6daef 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishTasks.html
@@ -45,9 +45,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
index 3705480..da0cf65 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_publishers.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
index 42c0a86..a5870b9 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html
@@ -51,9 +51,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
index 064244f..527fdfa 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeLocators.html
@@ -52,9 +52,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
index c08e040..856af90 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html
@@ -54,9 +54,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
index ad57210..1c81a16 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_runtimeTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
index bb63ee5..63f8a30 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverLocators.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
index 3e2b699..785a262 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_serverTypes.html
@@ -72,9 +72,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
index 5b05283..1cb9434 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_audio.html
@@ -57,9 +57,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
index be5eb39..ee86f8e 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorActions.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
index 808d90f..ed00652 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPageSections.html
@@ -247,9 +247,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
index f61b489..a5d9712 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_editorPages.html
@@ -248,9 +248,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
index c905ee0..b7aa427 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html
@@ -48,9 +48,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
index f3f857a..9250143 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
index 850738d..f8614c7 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html
@@ -53,9 +53,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
index 40eeb41..af24736 100644
--- a/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
+++ b/docs/org.eclipse.servertools.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html
@@ -50,9 +50,9 @@
 <p class="note SchemaCopyright">
 Copyright (c) 2000, 2005 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
+available under the terms of the Eclipse Public License 2.0 which accompanies 
 this distribution, and is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
+<a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
 
 </p>
 </BODY>
diff --git a/docs/org.eclipse.servertools.doc.isv/javadoc.properties b/docs/org.eclipse.servertools.doc.isv/javadoc.properties
index 46cb22c..83c3269 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.servertools.doc.isv/javadoc.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 Oracle Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     Oracle Corporation - initial API and implementation
diff --git a/docs/org.eclipse.servertools.doc.isv/javadoc.xml b/docs/org.eclipse.servertools.doc.isv/javadoc.xml
index 97af1e7..5ca5963 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.servertools.doc.isv/javadoc.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml b/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml
index 5119a48..22330d9 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml
+++ b/docs/org.eclipse.servertools.doc.isv/javadocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!--overview="${basedir}/html/api_reference/erview/overview.html"-->
 <project default="main" basedir=".">
 
diff --git a/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml b/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml
index 542a3b3..e3d3a86 100644
--- a/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml
+++ b/docs/org.eclipse.servertools.doc.isv/javadoctoc.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 <toc label="Javadoc Packages Reference">
+	
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+ <toc label="Javadoc Packages Reference">
 <topic label="org.eclipse.jst.server.core" href="html/api_reference/org/eclipse/jst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core" href="html/api_reference/org/eclipse/wst/server/core/package-summary.html"/>
 <topic label="org.eclipse.wst.server.core.model" href="html/api_reference/org/eclipse/wst/server/core/model/package-summary.html"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/packages.xml b/docs/org.eclipse.servertools.doc.isv/packages.xml
index 089b76a..d0b114d 100644
--- a/docs/org.eclipse.servertools.doc.isv/packages.xml
+++ b/docs/org.eclipse.servertools.doc.isv/packages.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <packages><package></package><package>org.eclipse.jst.server.core</package><package>org.eclipse.wst.server.core</package><package>org.eclipse.wst.server.core.model</package><package>org.eclipse.wst.server.core.util</package><package>org.eclipse.wst.server.ui</package><package>org.eclipse.wst.server.ui.actions</package><package>org.eclipse.wst.server.ui.editor</package><package>org.eclipse.wst.server.ui.wizard</package></packages>
\ No newline at end of file
diff --git a/docs/org.eclipse.servertools.doc.isv/plugin.properties b/docs/org.eclipse.servertools.doc.isv/plugin.properties
index 07eb3d5..7f3c06d 100644
--- a/docs/org.eclipse.servertools.doc.isv/plugin.properties
+++ b/docs/org.eclipse.servertools.doc.isv/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.servertools.doc.isv/plugins.xml b/docs/org.eclipse.servertools.doc.isv/plugins.xml
index 7bc30d4..590338e 100644
--- a/docs/org.eclipse.servertools.doc.isv/plugins.xml
+++ b/docs/org.eclipse.servertools.doc.isv/plugins.xml
@@ -1,3 +1,15 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 org.eclipse.wst.internet.monitor.core;
 org.eclipse.wst.server.core;
 org.eclipse.wst.server.http.core;
diff --git a/docs/org.eclipse.servertools.doc.isv/pom.xml b/docs/org.eclipse.servertools.doc.isv/pom.xml
index 138f65f..806eb69 100644
--- a/docs/org.eclipse.servertools.doc.isv/pom.xml
+++ b/docs/org.eclipse.servertools.doc.isv/pom.xml
@@ -8,7 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
--->
+-->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml b/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml
index c26677d..06945bd 100644
--- a/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml
+++ b/docs/org.eclipse.servertools.doc.isv/servertoolsextdocs.xml
@@ -1 +1,13 @@
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
 <files component="servertools"><file>org_eclipse_jst_server_core_internalRuntimeComponentProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeClasspathProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeFacetMappings.html</file>/n/n<file>org_eclipse_jst_server_core_serverProfilers.html</file>/n/n<file>org_eclipse_wst_server_core_clients.html</file>/n/n<file>org_eclipse_wst_server_core_installableRuntimes.html</file>/n/n<file>org_eclipse_wst_server_core_installableServers.html</file>/n/n<file>org_eclipse_wst_server_core_internalServerMonitors.html</file>/n/n<file>org_eclipse_wst_server_core_internalStartup.html</file>/n/n<file>org_eclipse_wst_server_core_launchableAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleArtifactAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleFactories.html</file>/n/n<file>org_eclipse_wst_server_core_moduleTypes.html</file>/n/n<file>org_eclipse_wst_server_core_publishTasks.html</file>/n/n<file>org_eclipse_wst_server_core_publishers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeFacetComponentProviders.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeLocators.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTargetHandlers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTypes.html</file>/n/n<file>org_eclipse_wst_server_core_serverLocators.html</file>/n/n<file>org_eclipse_wst_server_core_serverTypes.html</file>/n/n<file>org_eclipse_wst_server_ui_audio.html</file>/n/n<file>org_eclipse_wst_server_ui_editorActions.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPageSections.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPages.html</file>/n/n<file>org_eclipse_wst_server_ui_initialSelectionProvider.html</file>/n/n<file>org_eclipse_wst_server_ui_serverImages.html</file>/n/n<file>org_eclipse_wst_server_ui_serverToolTip.html</file>/n/n<file>org_eclipse_wst_server_ui_wizardFragments.html</file></files>
\ No newline at end of file
diff --git a/docs/org.eclipse.servertools.doc.isv/tocreference.xml b/docs/org.eclipse.servertools.doc.isv/tocreference.xml
index d52b879..fb524d6 100644
--- a/docs/org.eclipse.servertools.doc.isv/tocreference.xml
+++ b/docs/org.eclipse.servertools.doc.isv/tocreference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc label="Server Tools Reference" link_to="../org.eclipse.wst.doc.user/reference_toc.xml#javadoc_servertools"> 
 	<topic label="Server Tools API Reference" href="html/api_reference/overview-summary.html">
     <link toc="javadoctoc.xml"/>
diff --git a/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml b/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml
index 5228142..52a5d7f 100644
--- a/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml
+++ b/docs/org.eclipse.servertools.doc.isv/topics_ExtPoint_Reference.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
-	 	<toc label="Extension Points Reference">
+	 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+	<toc label="Extension Points Reference">
 <topic label="org.eclipse.jst.server.core.internalRuntimeComponentProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeClasspathProviders" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html"/>
 <topic label="org.eclipse.jst.server.core.runtimeFacetMappings" href="html/extpts_reference/servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html"/>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
index ee647cd..b872889 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright (c) 2007, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <!-- 
 
 	This script build the Help plug-in by transforming the DITA source files into HTML.
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/about.html b/docs/org.eclipse.wst.server.ui.doc.user/about.html
index f3924bb..aa05246 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/about.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/about.html
@@ -18,8 +18,8 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">
-http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">
+https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/build.properties b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
index 33819b8..c762fdd 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/build.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = *.xml,\
                plugin.properties,\
                plugin.xml,\
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
index 3d30b56..d82df14 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
@@ -4,9 +4,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml
index 00a8bc4..cf6db05 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <index>
   <entry keyword="servers">
     <entry keyword="starting">
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
index cc08e51..2a7bcc5 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2001, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
index 3d30b56..2a27f2e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
@@ -4,9 +4,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/pom.xml b/docs/org.eclipse.wst.server.ui.doc.user/pom.xml
index 6262a7d..c338ab2 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/pom.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/pom.xml
@@ -8,7 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
--->
+-->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
index dfc7b63..dadcd60 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
index 63bbb30..57b2be8 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
index c8d8324..a0b11c1 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
index f71e7e6..10d6cc0 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
index dda84a4..c9f2a6c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
index 5cc0bbf..69675e3 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
index 96b248d..ffd6ce1 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
index cf4a470..fc1be81 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
index d2cec0b..c93fe85 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
index bbe611d..a4f7ebc 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html
index 6d6c229..1f9ff16 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
index 230243a..4f1c562 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
index 258ef71..f9fd87c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
index b7ceba9..33fc6b4 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
index 91cd9f8..35e8640 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
index c6e8a2c..eee6d8f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
index 2a7e6bc..c2f1f1f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
index 9f19cd6..42acb9c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
index 71690e4..00af50d 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
index 0883d2a..1ed7773 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
index c1b15b5..3027f8e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html
index e6e6d41..6da19d9 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
index 8631688..2b2cb48 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
index d2a61f4..6dd8730 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
index e933fdf..4a6e189 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
index fe6579f..76f3257 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
index 319ce12..97bf4fb 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
index 37ee2c6..13e7e32 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
index e109670..2f2bab4 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
index d646b92..6b68744 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
index 64489a2..c8ddd9c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
index 7945c85..ff8d72c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
index 7faa352..8026036 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
index 026dcbd..28661e5 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
index 154b23f..c153f58 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
index 80cc538..9e210d2 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
index 79aaa84..b2e002e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
@@ -2,7 +2,7 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="copyright" content="Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/. Contributors: IBM Corporation - initial API and implementation" />
 <meta name="DC.rights.owner" content="(C) Copyright 2000, 2011" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
index 571af2a..f4e6462 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
@@ -2,6 +2,19 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2006, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc label="Testing and publishing applications" topic="topics/cwover.html">
 <topic label="Testing and publishing on your server" href="topics/cwover.html">
 <topic label="Servers view" href="topics/rwrcview.html">
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
index 0f46c75..1d189ce 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
@@ -2,4 +2,17 @@
 
 <?NLS TYPE="org.eclipse.help.toc"?>
 
+<!--
+    Copyright (c) 2008, 2019 IBM Corporation and others.
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
 <toc/>
diff --git a/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml b/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml
index 91b275c..bd682ef 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/STtcpipContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml b/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml
index b7837f0..78e6e01 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/STuiContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml b/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml
index 206488b..67935b2 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/STutilitiesContexts.xml
@@ -3,9 +3,11 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.infopop/about.html b/docs/org.eclipse.wst.server.ui.infopop/about.html
index 2199df3..454947c 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/about.html
+++ b/docs/org.eclipse.wst.server.ui.infopop/about.html
@@ -18,7 +18,7 @@
 ("Content"). Unless otherwise indicated below, the Content is provided to you 
 under the terms and conditions of the Eclipse Public License Version 1.0 
 ("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+<A href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</A>. 
 For purposes of the EPL, "Program" will mean the Content.</P>
 
 <P>If you did not receive this Content directly from the Eclipse Foundation, the 
diff --git a/docs/org.eclipse.wst.server.ui.infopop/build.properties b/docs/org.eclipse.wst.server.ui.infopop/build.properties
index d0e0f7b..03757e6 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.server.ui.infopop/build.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = STtcpipContexts.xml,\
                STuiContexts.xml,\
                STutilitiesContexts.xml,\
diff --git a/docs/org.eclipse.wst.server.ui.infopop/plugin.properties b/docs/org.eclipse.wst.server.ui.infopop/plugin.properties
index 4dfddec..0f743e1 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/plugin.properties
+++ b/docs/org.eclipse.wst.server.ui.infopop/plugin.properties
@@ -1,3 +1,15 @@
+###############################################################################
+# Copyright (c) 2005, 2019 IBM Corporation and others.
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 # NLS_MESSAGEFORMAT_VAR
 
 pluginName   = Server Tools infopops for Web Standard Tools
diff --git a/docs/org.eclipse.wst.server.ui.infopop/plugin.xml b/docs/org.eclipse.wst.server.ui.infopop/plugin.xml
index 923bc30..14cfd97 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/plugin.xml
@@ -5,9 +5,9 @@
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 20010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/docs/org.eclipse.wst.server.ui.infopop/pom.xml b/docs/org.eclipse.wst.server.ui.infopop/pom.xml
index 2a6e1d1..9138293 100644
--- a/docs/org.eclipse.wst.server.ui.infopop/pom.xml
+++ b/docs/org.eclipse.wst.server.ui.infopop/pom.xml
@@ -8,7 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
--->
+-->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/pom.xml b/pom.xml
index 8473f43..63003d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2014 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at