You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/08/31 17:30:18 UTC

[GitHub] matthiasblaesing closed pull request #807: [NETBEANS-1171] Invalid license files in web.core.syntax module

matthiasblaesing closed pull request #807: [NETBEANS-1171] Invalid license files in web.core.syntax module
URL: https://github.com/apache/incubator-netbeans/pull/807
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/harness/apisupport.harness/external/harness-launchers-8.2-license.txt b/harness/apisupport.harness/external/harness-launchers-8.2-license.txt
index aea4e05840..b0e7d132b0 100644
--- a/harness/apisupport.harness/external/harness-launchers-8.2-license.txt
+++ b/harness/apisupport.harness/external/harness-launchers-8.2-license.txt
@@ -313,16 +313,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -336,7 +327,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -352,7 +343,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -394,13 +385,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/harness/jemmy/external/jemmy-2.3.1.1-license.txt b/harness/jemmy/external/jemmy-2.3.1.1-license.txt
index eff4e19018..b9ea433526 100644
--- a/harness/jemmy/external/jemmy-2.3.1.1-license.txt
+++ b/harness/jemmy/external/jemmy-2.3.1.1-license.txt
@@ -315,16 +315,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -338,7 +329,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -354,7 +345,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -396,13 +387,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/harness/libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt b/harness/libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt
index d49a732aff..0631731c5b 100644
--- a/harness/libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt
+++ b/harness/libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt
@@ -313,16 +313,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -336,7 +327,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -352,7 +343,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -394,13 +385,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/ide/dlight.nativeexecution/external/exechlp-1.0-license.txt b/ide/dlight.nativeexecution/external/exechlp-1.0-license.txt
index 777d759071..b71517ad3a 100644
--- a/ide/dlight.nativeexecution/external/exechlp-1.0-license.txt
+++ b/ide/dlight.nativeexecution/external/exechlp-1.0-license.txt
@@ -313,16 +313,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -336,7 +327,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -352,7 +343,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -394,13 +385,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/ide/extbrowser/external/extbrowser-dlls-18.03.15-license.txt b/ide/extbrowser/external/extbrowser-dlls-18.03.15-license.txt
index df8ad2baf7..4fbe0329c1 100644
--- a/ide/extbrowser/external/extbrowser-dlls-18.03.15-license.txt
+++ b/ide/extbrowser/external/extbrowser-dlls-18.03.15-license.txt
@@ -313,16 +313,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -336,7 +327,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -352,7 +343,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -394,13 +385,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/ide/swing.validation/external/ValidationAPI-b26b94cc001a41ab9138496b11e2ae256a159ffd-license.txt b/ide/swing.validation/external/ValidationAPI-b26b94cc001a41ab9138496b11e2ae256a159ffd-license.txt
index 04d236a5bb..3e27350ab6 100644
--- a/ide/swing.validation/external/ValidationAPI-b26b94cc001a41ab9138496b11e2ae256a159ffd-license.txt
+++ b/ide/swing.validation/external/ValidationAPI-b26b94cc001a41ab9138496b11e2ae256a159ffd-license.txt
@@ -313,16 +313,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -336,7 +327,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -352,7 +343,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -394,13 +385,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/java/websvc.jaxws21/external/jaxws-2.2.6-cddl10-license.txt b/java/websvc.jaxws21/external/jaxws-2.2.6-cddl10-license.txt
index e188dcf01c..2d131eb733 100644
--- a/java/websvc.jaxws21/external/jaxws-2.2.6-cddl10-license.txt
+++ b/java/websvc.jaxws21/external/jaxws-2.2.6-cddl10-license.txt
@@ -314,16 +314,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -337,7 +328,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -353,7 +344,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -395,13 +386,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
index 22884369dc..ad23612deb 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
@@ -139,14 +139,14 @@ public FileSet createModuleFiles() {
     void execute() throws BuildException {
         if (modules == null || modules.isEmpty()) {
             modules = new TreeSet<>();
-            for (String cluster : getProject().getProperty("nb.clusters.list").split("[, ]+")) {
-                modules.addAll(Arrays.asList(getProject().getProperty(cluster).split("[, ]+")));
+            if(getProject().getProperty("allmodules") != null) {
+                modules.addAll(Arrays.asList(getProject().getProperty("allmodules").split("[, ]+")));
             }
             modules.add("nbbuild");
         }
-        
+
         pseudoTests = new LinkedHashMap<>();
-        
+
         try (PrintWriter licenseWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(license), "UTF-8"));
                 PrintWriter noticeWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(notice), "UTF-8"))) {
 
@@ -369,50 +369,45 @@ private String getMaybeMissing(Map<String, String> headers, String headerName) {
 
     private Map<Long, Map<String, String>> findCrc2LicenseHeaderMapping() throws IOException {
         Map<Long, Map<String, String>> crc2LicenseHeaders = new HashMap<>();
-        for (String cluster : getProject().getProperty("nb.clusters.list").split("[, ]+")) {
-            for (String module : getProject().getProperty(cluster).split("[, ]+")) {
-                File d = new File(new File(nball, module), "external");
-                Set<String> hgFiles = VerifyLibsAndLicenses.findHgControlledFiles(d);
-                Map<String, Map<String, String>> binary2License = findBinary2LicenseHeaderMapping(hgFiles, d);
-                for (String n : hgFiles) {
-                    if (!n.endsWith(".jar") && !n.endsWith(".zip") && !n.endsWith(".xml")
-                            && !n.endsWith(".js") && !n.endsWith(".dylib")) {
-                        continue;
-                    }
-                    Map<String, String> headers = binary2License.get(n);
-                    if (headers == null) {
-                        continue;
-                    }
-                    File f = new File(d, n);
-                    InputStream is = new FileInputStream(f);
-                    try {
-                        crc2LicenseHeaders.put(computeCRC32(is), headers);
-                    } finally {
-                        is.close();
-                    }
-                    if (!n.endsWith(".jar") && !n.endsWith(".zip")) {
-                        continue;
-                    }
-                    ZipFile zf = new ZipFile(f);
-                    try {
-                        Enumeration<? extends ZipEntry> entries = zf.entries();
-                        while (entries.hasMoreElements()) {
-                            ZipEntry entry = entries.nextElement();
-                            String innerName = entry.getName();
-                            if (!innerName.endsWith(".jar") && !innerName.endsWith(".zip")) {
-                                continue;
-                            }
-                            Map<String, String> nestedHeaders = binary2License.get(n + "!/" + innerName);
-                            if (nestedHeaders == null) nestedHeaders = headers;
-                            is = zf.getInputStream(entry);
-                            try {
-                                crc2LicenseHeaders.put(computeCRC32(is), nestedHeaders);
-                            } finally {
-                                is.close();
-                            }
+        for(String module: modules) {
+            File d = new File(new File(nball, module), "external");
+            Set<String> hgFiles = VerifyLibsAndLicenses.findHgControlledFiles(d);
+            Map<String, Map<String, String>> binary2License = findBinary2LicenseHeaderMapping(hgFiles, d);
+            for (String n : hgFiles) {
+                if (!n.endsWith(".jar") && !n.endsWith(".zip") && !n.endsWith(".xml")
+                        && !n.endsWith(".js") && !n.endsWith(".dylib")) {
+                    continue;
+                }
+                Map<String, String> headers = binary2License.get(n);
+                if (headers == null) {
+                    continue;
+                }
+
+                File f = new File(d, n);
+
+                try(InputStream is = new FileInputStream(f)) {
+                    crc2LicenseHeaders.put(computeCRC32(is), headers);
+                }
+                if (!n.endsWith(".jar") && !n.endsWith(".zip")) {
+                    continue;
+                }
+
+                try(ZipFile zf = new ZipFile(f)) {
+                    Enumeration<? extends ZipEntry> entries = zf.entries();
+                    while (entries.hasMoreElements()) {
+                        ZipEntry entry = entries.nextElement();
+                        String innerName = entry.getName();
+                        if (!innerName.endsWith(".jar") && !innerName.endsWith(".zip")) {
+                            continue;
+                        }
+                        Map<String, String> nestedHeaders = binary2License.get(n + "!/" + innerName);
+                        if (nestedHeaders == null) {
+                            nestedHeaders = headers;
+                        }
+
+                        try(InputStream is = zf.getInputStream(entry)) {
+                            crc2LicenseHeaders.put(computeCRC32(is), nestedHeaders);
                         }
-                    } finally {
-                        zf.close();
                     }
                 }
             }
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
index 3e40d8a071..ff17324d9b 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
@@ -364,34 +364,38 @@ private void testLicenses() throws IOException {
                         }
                     }
                 }
-                String files = headers.get("Files");
-                if (files != null) {
-                    for (String file : files.split("[, ]+")) {
-                        referencedBinaries.add(file);
-                        String nested = null;
-                        if (file.contains("!/")) {
-                            final int nestedStart = file.indexOf("!/");
-                            nested = file.substring(nestedStart + 2);
-                            file = file.substring(0, nestedStart);
-                        }
-                        if (!hgFiles.contains(file)) {
-                            msg.append("\n" + path + " mentions a nonexistent binary in Files: " + file);
-                        } else if (nested != null) {
-                            try (JarFile jf = new JarFile(new File(d, file))) {
-                                ZipEntry e = jf.getEntry(nested);
-                                if (e == null) {
-                                    msg.append("\n" + path + " mentions a nonexistent nested binary in Files: " + nested + "; enclosing jar: " + file);
+                if(! headers.getOrDefault("Type", "").equals("generated")) {
+                    // Generated files are created by the build system, for
+                    // example by post-procession other downloaded files
+                    String files = headers.get("Files");
+                    if (files != null) {
+                        for (String file : files.split("[, ]+")) {
+                            referencedBinaries.add(file);
+                            String nested = null;
+                            if (file.contains("!/")) {
+                                final int nestedStart = file.indexOf("!/");
+                                nested = file.substring(nestedStart + 2);
+                                file = file.substring(0, nestedStart);
+                            }
+                            if (!hgFiles.contains(file)) {
+                                msg.append("\n" + path + " mentions a nonexistent binary in Files: " + file);
+                            } else if (nested != null) {
+                                try (JarFile jf = new JarFile(new File(d, file))) {
+                                    ZipEntry e = jf.getEntry(nested);
+                                    if (e == null) {
+                                        msg.append("\n" + path + " mentions a nonexistent nested binary in Files: " + nested + "; enclosing jar: " + file);
+                                    }
                                 }
                             }
                         }
-                    }
-                } else {
-                    String matchingJar = n.replaceFirst("-license\\.txt$", ".jar");
-                    String matchingZip = n.replaceFirst("-license\\.txt$", ".zip");
-                    referencedBinaries.add(matchingJar);
-                    referencedBinaries.add(matchingZip);
-                    if (!hgFiles.contains(matchingJar) && !hgFiles.contains(matchingZip)) {
-                        msg.append("\n" + path + " has no Files header and no corresponding " + matchingJar + " or " + matchingZip + " could be found");
+                    } else {
+                        String matchingJar = n.replaceFirst("-license\\.txt$", ".jar");
+                        String matchingZip = n.replaceFirst("-license\\.txt$", ".zip");
+                        referencedBinaries.add(matchingJar);
+                        referencedBinaries.add(matchingZip);
+                        if (!hgFiles.contains(matchingJar) && !hgFiles.contains(matchingZip)) {
+                            msg.append("\n" + path + " has no Files header and no corresponding " + matchingJar + " or " + matchingZip + " could be found");
+                        }
                     }
                 }
             }
@@ -642,9 +646,12 @@ private void findStrayThirdPartyBinaries(File dir, String prefix, Set<String> vi
             if (isDir && new File(f, ".hg").isDirectory()) {
                 continue; // skip contrib, misc repos if present
             }
-            for (Pattern p : ignoredPatterns) {
-                if (p.matcher(fullname).find() || (isDir && p.matcher(fullname + "/").find())) {
-                    continue FILES;
+            if (!n.startsWith("generated-")) {
+                // Hack to support resources generated by the build system
+                for (Pattern p : ignoredPatterns) {
+                    if (p.matcher(fullname).find() || (isDir && p.matcher(fullname + "/").find())) {
+                        continue FILES;
+                    }
                 }
             }
             files.add(n);
diff --git a/nbbuild/licenses/BSD-tlddoc b/nbbuild/licenses/BSD-tlddoc
new file mode 100644
index 0000000000..effedff0df
--- /dev/null
+++ b/nbbuild/licenses/BSD-tlddoc
@@ -0,0 +1,26 @@
+Copyright (c) 2003-2004, Sun Microsystems, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Sun Microsystems, Inc. nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/nbbuild/licenses/BSD-tldxslt b/nbbuild/licenses/BSD-tldxslt
new file mode 100644
index 0000000000..37e0355be0
--- /dev/null
+++ b/nbbuild/licenses/BSD-tldxslt
@@ -0,0 +1,26 @@
+Copyright (c) 2010, Oracle.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Oracle nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/nbbuild/licenses/CDDL-1.0 b/nbbuild/licenses/CDDL-1.0
index 381df1a4ab..d8a1597351 100644
--- a/nbbuild/licenses/CDDL-1.0
+++ b/nbbuild/licenses/CDDL-1.0
@@ -306,16 +306,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -329,7 +320,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -345,7 +336,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -387,13 +378,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/nbbuild/licenses/names.properties b/nbbuild/licenses/names.properties
index c6436036bd..3132854c39 100644
--- a/nbbuild/licenses/names.properties
+++ b/nbbuild/licenses/names.properties
@@ -34,6 +34,8 @@ BSD-antlr-runtime3=BSD-like Antlr Runtime 3 license
 BSD-antlr-runtime4=BSD-like Antlr Runtime 4 license
 BSD-iri=BSD-like iri license
 BSD-jing=BSD-like jing license
+BSD-tlddoc=BSD license with Sun Microsystems, Inc. copyright
+BSD-tldxslt=BSD licenses with Oracle copyright
 CC0-v10=Creative Commons CC0 1.0 Universal
 EPL-v10=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html)
 EPL-v10-eclipselink=Eclipse Public License v1, eclipselink variant
diff --git a/platform/applemenu/external/applemenu-external-desktop-classes-8.2-license.txt b/platform/applemenu/external/applemenu-external-desktop-classes-8.2-license.txt
index 2026c7efba..f7a0f76927 100644
--- a/platform/applemenu/external/applemenu-external-desktop-classes-8.2-license.txt
+++ b/platform/applemenu/external/applemenu-external-desktop-classes-8.2-license.txt
@@ -315,16 +315,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -338,7 +329,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -354,7 +345,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -396,13 +387,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/profiler/lib.profiler/external/profiler-external-binaries-8.2-license.txt b/profiler/lib.profiler/external/profiler-external-binaries-8.2-license.txt
index 3a6c1fb70a..28452edc6e 100644
--- a/profiler/lib.profiler/external/profiler-external-binaries-8.2-license.txt
+++ b/profiler/lib.profiler/external/profiler-external-binaries-8.2-license.txt
@@ -313,16 +313,7 @@ Participant Software against such Participant either
 unilaterally or pursuant to a written agreement with
 Participant.
 
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
+6.3. In the event of termination under Sections 6.1 or 6.2
 above, all end user licenses that have been validly granted
 by You or any distributor hereunder prior to termination
 (excluding licenses granted to You by any distributor)
@@ -336,7 +327,7 @@ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
 COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
 LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
 STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
 COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
 INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
@@ -352,7 +343,7 @@ APPLY TO YOU.
 The Covered Software is a "commercial item," as that term is
 defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
 computer software" (as that term is defined at 48 C.F.R.
-§ 252.227-7014(a)(1)) and "commercial computer software
+252.227-7014(a)(1)) and "commercial computer software
 documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
 through 227.7202-4 (June 1995), all U.S. Government End Users
@@ -394,13 +385,3 @@ and You agree to work with Initial Developer and Contributors to
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/web.core.syntax/build.xml b/web.core.syntax/build.xml
index 4c5e365fcf..2ea6661eeb 100644
--- a/web.core.syntax/build.xml
+++ b/web.core.syntax/build.xml
@@ -24,14 +24,113 @@
     <import file="../j2ee.kit/register_server.xml"/> 
     <import file="../nbbuild/templates/projectized.xml"/>
 
-    <property name="xslt.dir" value="./tlddoc/xslt/"/>
-    <property name="tlddoc.dir" value="./tlddoc/doc/"/>
-    <target name="test" depends="test-unit"/>
-    <target name="build-init" depends="projectized.build-init">
-        <copy todir="${tlddoc.dir}">
-            <fileset dir="external">
-                <exclude name="syntaxref20.zip"/>
-            </fileset>
-        </copy>
-   </target>
+    <!-- Hook into harness "basic-init" task -->
+    <target name="-process.release.files" depends="prepare-doc"/>
+    
+    <!-- Check if taglib doc was already generated -->
+    <target name="-check-prepared-doc">
+        <condition property="web.core.syntax.doccreated" value="present">
+            <and>
+                <available file="external/generated-jstl11-doc-1.1.2.zip" />
+                <available file="external/generated-struts-tags-1.3.10.zip" />
+                <available file="external/generated-jsf12-tlddoc-1.2-20.zip" />
+            </and>
+        </condition>
+    </target>
+    
+    <target name="prepare-doc" depends="-check-prepared-doc,-define-FileCRC32Calculator" unless="web.core.syntax.doccreated">
+        <!--
+        
+        This task prepares the tld doc, that are downloaded as pre-build
+        binaries. The procedure:
+        
+        - the Tag Library Documentation Generator is loaded via the external binaries task
+        - the jars the docs are build for are also downloaded by the same mechanism
+        - the generator expects in each generation invocation, that the short
+          names of the type libraries are unique. To archive this, the conflicting
+          names are modified below
+        - the generated files are the zipped and need to be manually uploaded
+          to the netbeans binaries server
+        
+        -->
+        <delete dir="build/tlddoc-build" />
+        <mkdir dir="build/tlddoc-build/jstl11" />
+        <mkdir dir="build/tlddoc-build/jstl11-out" />
+        <mkdir dir="build/tlddoc-build/jsf12-out" />
+        <mkdir dir="build/tlddoc-build/struts.out" />
+
+        <unzip dest="build/tlddoc-build/jstl11" src="external/standard-1.1.2.jar">
+            <patternset>
+                <include name="**/*.tld" />
+            </patternset>
+            <mapper type="flatten" />
+        </unzip>
+
+        <replace file="build/tlddoc-build/jstl11/c-1_0-rt.tld" token="&lt;short-name&gt;c_rt&lt;/short-name&gt;" value="&lt;short-name&gt;c10_rt&lt;/short-name&gt;" />
+        <replace file="build/tlddoc-build/jstl11/c-1_0.tld" token="&lt;short-name&gt;c&lt;/short-name&gt;" value="&lt;short-name&gt;c10&lt;/short-name&gt;" />
+        <replace file="build/tlddoc-build/jstl11/fmt-1_0-rt.tld" token="&lt;short-name&gt;fmt_rt&lt;/short-name&gt;" value="&lt;short-name&gt;fmt10_rt&lt;/short-name&gt;" />
+        <replace file="build/tlddoc-build/jstl11/fmt-1_0.tld" token="&lt;short-name&gt;fmt&lt;/short-name&gt;" value="&lt;short-name&gt;fmt10&lt;/short-name&gt;" />
+        <replace file="build/tlddoc-build/jstl11/sql-1_0-rt.tld" token="&lt;short-name&gt;sql_rt&lt;/short-name&gt;" value="&lt;short-name&gt;sql10_rt&lt;/short-name&gt;" />
+        <replace file="build/tlddoc-build/jstl11/sql-1_0.tld" token="&lt;short-name&gt;sql&lt;/short-name&gt;" value="&lt;short-name&gt;sql10&lt;/short-name&gt;" />
+        <replace file="build/tlddoc-build/jstl11/x-1_0-rt.tld" token="&lt;short-name&gt;x_rt&lt;/short-name&gt;" value="&lt;short-name&gt;x10_rt&lt;/short-name&gt;" />
+        <replace file="build/tlddoc-build/jstl11/x-1_0.tld" token="&lt;short-name&gt;x&lt;/short-name&gt;" value="&lt;short-name&gt;x10&lt;/short-name&gt;" />
+        <jar destfile="build/tlddoc-build/jstl11-input.jar">
+            <zipfileset dir="build/tlddoc-build/jstl11/" includes="*.tld" prefix="META-INF"/>
+        </jar>
+        <java classname="com.sun.tlddoc.TLDDoc">
+            <classpath>
+                <pathelement location="external/tlddoc-1.3.jar" />
+            </classpath>
+            <arg value="-d" />
+            <arg value="build/tlddoc-build/jstl11-out" />
+            <arg value="-xslt" />
+            <arg value="tlddoc/xslt/" />
+            <arg value="-doctitle" />
+            <arg value="JavaServer Pages Standard Tag Library 1.1 Tag Reference" />
+            <arg value="-windowtitle" />
+            <arg value="JSPL 1.1 - Generated Documentation" />
+            <arg value="build/tlddoc-build/jstl11-input.jar" />
+        </java>
+        <java classname="com.sun.tlddoc.TLDDoc">
+            <classpath>
+                <pathelement location="external/tlddoc-1.3.jar" />
+            </classpath>
+            <arg value="-d" />
+            <arg value="build/tlddoc-build/jsf12-out" />
+            <arg value="-xslt" />
+            <arg value="tlddoc/xslt/" />
+            <arg value="-doctitle" />
+            <arg value="JavaServer Faces 1.2" />
+            <arg value="-windowtitle" />
+            <arg value="JSF 1.2 - Generated Documentation" />
+            <arg value="external/jsf-impl-1.2-20.jar" />
+        </java>
+        <java classname="com.sun.tlddoc.TLDDoc">
+            <classpath>
+                <pathelement location="external/tlddoc-1.3.jar" />
+            </classpath>
+            <arg value="-d" />
+            <arg value="build/tlddoc-build/struts.out" />
+            <arg value="-xslt" />
+            <arg value="tlddoc/xslt/" />
+            <arg value="-doctitle" />
+            <arg value="The Struts Framework Project" />
+            <arg value="-windowtitle" />
+            <arg value="Struts - Generated Documentation" />
+            <arg value="external/struts-taglib-1.3.10.jar" />
+            <arg value="external/struts-tiles-1.3.10.jar" />
+        </java>
+
+        <jar destfile="external/generated-jstl11-doc-1.1.2.zip">
+            <zipfileset dir="build/tlddoc-build/jstl11-out" includes="**" />
+        </jar>
+
+        <jar destfile="external/generated-struts-tags-1.3.10.zip">
+            <zipfileset dir="build/tlddoc-build/struts.out" includes="**" />
+        </jar>
+
+        <jar destfile="external/generated-jsf12-tlddoc-1.2-20.zip">
+            <zipfileset dir="build/tlddoc-build/jsf12-out" includes="**" />
+        </jar>
+    </target>
 </project>
diff --git a/web.core.syntax/external/binaries-list b/web.core.syntax/external/binaries-list
index 45654bad57..daa57e4cea 100644
--- a/web.core.syntax/external/binaries-list
+++ b/web.core.syntax/external/binaries-list
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 F6E990DF59BD1FD2058320002A853A5411A45CD4 syntaxref20.zip
-41990E587485D3C6360FFF0EC8F8D2D3F53EC874 jsf12-tlddoc.zip
-9D80B456AFA21D92147F4BC4BB532335ADAC2C03 jstl11-doc.zip
-6D49835237D1208A14C20F658D5EFE30558C2560 struts-tags.zip
+19A11941D9810CE0ADFFBAE407F00FAECD51B2B4 javax.faces:jsf-impl:1.2-20
+A17E8A4D9A1F7FCC5EED606721C9ED6B7F18ACF7 taglibs:standard:1.1.2
+40693E3AA8A8586B8BAA0317D0127597CAD3D5EC org.apache.struts:struts-tiles:1.3.10
+9EF247D8EB03A09A3B1C9D434F9F9ACD45BA1C62 org.apache.struts:struts-taglib:1.3.10
+E13A7B513152F62EB4F6586DE23D9502953C573B taglibrarydoc:tlddoc:1.3
diff --git a/web.core.syntax/external/cddl_11_license.txt b/web.core.syntax/external/cddl_11_license.txt
deleted file mode 100644
index 3180e9367d..0000000000
--- a/web.core.syntax/external/cddl_11_license.txt
+++ /dev/null
@@ -1,747 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
-
-1. Definitions.
- 
-  1.1. "Contributor" means each individual or entity that creates or
-  contributes to the creation of Modifications.
-
-  1.2. "Contributor Version" means the combination of the Original
-  Software, prior Modifications used by a Contributor (if any), and
-  the Modifications made by that particular Contributor.
-
-  1.3. "Covered Software" means (a) the Original Software, or (b)
-  Modifications, or (c) the combination of files containing Original
-  Software with files containing Modifications, in each case including
-  portions thereof.
-
-  1.4. "Executable" means the Covered Software in any form other than
-  Source Code.
-
-  1.5. "Initial Developer" means the individual or entity that first
-  makes Original Software available under this License.
-
-  1.6. "Larger Work" means a work which combines Covered Software or
-  portions thereof with code not governed by the terms of this License.
-
-  1.7. "License" means this document.
-
-  1.8. "Licensable" means having the right to grant, to the maximum
-  extent possible, whether at the time of the initial grant or
-  subsequently acquired, any and all of the rights conveyed herein.
-
-  1.9. "Modifications" means the Source Code and Executable form of
-  any of the following:
-
-  A. Any file that results from an addition to, deletion from or
-  modification of the contents of a file containing Original Software
-  or previous Modifications;
-
-  B. Any new file that contains any part of the Original Software or
-  previous Modification; or
-
-  C. Any new file that is contributed or otherwise made available
-  under the terms of this License.
-
-  1.10. "Original Software" means the Source Code and Executable form
-  of computer software code that is originally released under this
-  License.
-
-  1.11. "Patent Claims" means any patent claim(s), now owned or
-  hereafter acquired, including without limitation, method, process,
-  and apparatus claims, in any patent Licensable by grantor.
-
-  1.12. "Source Code" means (a) the common form of computer software
-  code in which modifications are made and (b) associated
-  documentation included in or with such code.
-
-  1.13. "You" (or "Your") means an individual or a legal entity
-  exercising rights under, and complying with all of the terms of,
-  this License. For legal entities, "You" includes any entity which
-  controls, is controlled by, or is under common control with You. For
-  purposes of this definition, "control" means (a) the power, direct
-  or indirect, to cause the direction or management of such entity,
-  whether by contract or otherwise, or (b) ownership of more than
-  fifty percent (50%) of the outstanding shares or beneficial
-  ownership of such entity.
-
-2. License Grants.
-
-  2.1. The Initial Developer Grant.
-
-  Conditioned upon Your compliance with Section 3.1 below and subject
-  to third party intellectual property claims, the Initial Developer
-  hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-  (a) under intellectual property rights (other than patent or
-  trademark) Licensable by Initial Developer, to use, reproduce,
-  modify, display, perform, sublicense and distribute the Original
-  Software (or portions thereof), with or without Modifications,
-  and/or as part of a Larger Work; and
-
-  (b) under Patent Claims infringed by the making, using or selling of
-  Original Software, to make, have made, use, practice, sell, and
-  offer for sale, and/or otherwise dispose of the Original Software
-  (or portions thereof).
-
-  (c) The licenses granted in Sections 2.1(a) and (b) are effective on
-  the date Initial Developer first distributes or otherwise makes the
-  Original Software available to a third party under the terms of this
-  License.
-
-  (d) Notwithstanding Section 2.1(b) above, no patent license is
-  granted: (1) for code that You delete from the Original Software, or
-  (2) for infringements caused by: (i) the modification of the
-  Original Software, or (ii) the combination of the Original Software
-  with other software or devices.
-
-  2.2. Contributor Grant.
-
-  Conditioned upon Your compliance with Section 3.1 below and subject
-  to third party intellectual property claims, each Contributor hereby
-  grants You a world-wide, royalty-free, non-exclusive license:
-
-  (a) under intellectual property rights (other than patent or
-  trademark) Licensable by Contributor to use, reproduce, modify,
-  display, perform, sublicense and distribute the Modifications
-  created by such Contributor (or portions thereof), either on an
-  unmodified basis, with other Modifications, as Covered Software
-  and/or as part of a Larger Work; and
-
-  (b) under Patent Claims infringed by the making, using, or selling
-  of Modifications made by that Contributor either alone and/or in
-  combination with its Contributor Version (or portions of such
-  combination), to make, use, sell, offer for sale, have made, and/or
-  otherwise dispose of: (1) Modifications made by that Contributor (or
-  portions thereof); and (2) the combination of Modifications made by
-  that Contributor with its Contributor Version (or portions of such
-  combination).
-
-  (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
-  on the date Contributor first distributes or otherwise makes the
-  Modifications available to a third party.
-
-  (d) Notwithstanding Section 2.2(b) above, no patent license is
-  granted: (1) for any code that Contributor has deleted from the
-  Contributor Version; (2) for infringements caused by: (i) third
-  party modifications of Contributor Version, or (ii) the combination
-  of Modifications made by that Contributor with other software
-  (except as part of the Contributor Version) or other devices; or (3)
-  under Patent Claims infringed by Covered Software in the absence of
-  Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-  3.1. Availability of Source Code.
-
-  Any Covered Software that You distribute or otherwise make available
-  in Executable form must also be made available in Source Code form
-  and that Source Code form must be distributed only under the terms
-  of this License. You must include a copy of this License with every
-  copy of the Source Code form of the Covered Software You distribute
-  or otherwise make available. You must inform recipients of any such
-  Covered Software in Executable form as to how they can obtain such
-  Covered Software in Source Code form in a reasonable manner on or
-  through a medium customarily used for software exchange.
-
-  3.2. Modifications.
-
-  The Modifications that You create or to which You contribute are
-  governed by the terms of this License. You represent that You
-  believe Your Modifications are Your original creation(s) and/or You
-  have sufficient rights to grant the rights conveyed by this License.
-
-  3.3. Required Notices.
-
-  You must include a notice in each of Your Modifications that
-  identifies You as the Contributor of the Modification. You may not
-  remove or alter any copyright, patent or trademark notices contained
-  within the Covered Software, or any notices of licensing or any
-  descriptive text giving attribution to any Contributor or the
-  Initial Developer.
-
-  3.4. Application of Additional Terms.
-
-  You may not offer or impose any terms on any Covered Software in
-  Source Code form that alters or restricts the applicable version of
-  this License or the recipients' rights hereunder. You may choose to
-  offer, and to charge a fee for, warranty, support, indemnity or
-  liability obligations to one or more recipients of Covered Software.
-  However, you may do so only on Your own behalf, and not on behalf of
-  the Initial Developer or any Contributor. You must make it
-  absolutely clear that any such warranty, support, indemnity or
-  liability obligation is offered by You alone, and You hereby agree
-  to indemnify the Initial Developer and every Contributor for any
-  liability incurred by the Initial Developer or such Contributor as a
-  result of warranty, support, indemnity or liability terms You offer.
-
-  3.5. Distribution of Executable Versions.
-
-  You may distribute the Executable form of the Covered Software under
-  the terms of this License or under the terms of a license of Your
-  choice, which may contain terms different from this License,
-  provided that You are in compliance with the terms of this License
-  and that the license for the Executable form does not attempt to
-  limit or alter the recipient's rights in the Source Code form from
-  the rights set forth in this License. If You distribute the Covered
-  Software in Executable form under a different license, You must make
-  it absolutely clear that any terms which differ from this License
-  are offered by You alone, not by the Initial Developer or
-  Contributor. You hereby agree to indemnify the Initial Developer and
-  every Contributor for any liability incurred by the Initial
-  Developer or such Contributor as a result of any such terms You offer.
-
-  3.6. Larger Works.
-
-  You may create a Larger Work by combining Covered Software with
-  other code not governed by the terms of this License and distribute
-  the Larger Work as a single product. In such a case, You must make
-  sure the requirements of this License are fulfilled for the Covered
-  Software.
-
-4. Versions of the License.
-
-  4.1. New Versions.
-
-  Oracle is the initial license steward and may publish revised and/or
-  new versions of this License from time to time. Each version will be
-  given a distinguishing version number. Except as provided in Section
-  4.3, no one other than the license steward has the right to modify
-  this License.
-
-  4.2. Effect of New Versions.
-
-  You may always continue to use, distribute or otherwise make the
-  Covered Software available under the terms of the version of the
-  License under which You originally received the Covered Software. If
-  the Initial Developer includes a notice in the Original Software
-  prohibiting it from being distributed or otherwise made available
-  under any subsequent version of the License, You must distribute and
-  make the Covered Software available under the terms of the version
-  of the License under which You originally received the Covered
-  Software. Otherwise, You may also choose to use, distribute or
-  otherwise make the Covered Software available under the terms of any
-  subsequent version of the License published by the license steward.
-
-  4.3. Modified Versions.
-
-  When You are an Initial Developer and You want to create a new
-  license for Your Original Software, You may create and use a
-  modified version of this License if You: (a) rename the license and
-  remove any references to the name of the license steward (except to
-  note that the license differs from this License); and (b) otherwise
-  make it clear that the license contains terms which differ from this
-  License.
-
-5. DISCLAIMER OF WARRANTY.
-
-  COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-  INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE
-  IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
-  NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
-  THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
-  DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
-  OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
-  REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-  ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS
-  AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-  6.1. This License and the rights granted hereunder will terminate
-  automatically if You fail to comply with terms herein and fail to
-  cure such breach within 30 days of becoming aware of the breach.
-  Provisions which, by their nature, must remain in effect beyond the
-  termination of this License shall survive.
-
-  6.2. If You assert a patent infringement claim (excluding
-  declaratory judgment actions) against Initial Developer or a
-  Contributor (the Initial Developer or Contributor against whom You
-  assert such claim is referred to as "Participant") alleging that the
-  Participant Software (meaning the Contributor Version where the
-  Participant is a Contributor or the Original Software where the
-  Participant is the Initial Developer) directly or indirectly
-  infringes any patent, then any and all rights granted directly or
-  indirectly to You by such Participant, the Initial Developer (if the
-  Initial Developer is not the Participant) and all Contributors under
-  Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
-  from Participant terminate prospectively and automatically at the
-  expiration of such 60 day notice period, unless if within such 60
-  day period You withdraw Your claim with respect to the Participant
-  Software against such Participant either unilaterally or pursuant to
-  a written agreement with Participant.
-
-  6.3. If You assert a patent infringement claim against Participant
-  alleging that the Participant Software directly or indirectly
-  infringes any patent where such claim is resolved (such as by
-  license or settlement) prior to the initiation of patent
-  infringement litigation, then the reasonable value of the licenses
-  granted by such Participant under Sections 2.1 or 2.2 shall be taken
-  into account in determining the amount or value of any payment or
-  license.
-
-  6.4. In the event of termination under Sections 6.1 or 6.2 above,
-  all end user licenses that have been validly granted by You or any
-  distributor hereunder prior to termination (excluding licenses
-  granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-  UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-  (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-  INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-  COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE
-  TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-  CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-  LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
-  FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-  LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-  POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT
-  APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
-  PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
-  LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
-  LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
-  AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-  The Covered Software is a "commercial item," as that term is defined
-  in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-  software" (as that term is defined at 48 C.F.R. §
-  252.227-7014(a)(1)) and "commercial computer software documentation"
-  as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
-  with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
-  (June 1995), all U.S. Government End Users acquire Covered Software
-  with only those rights set forth herein. This U.S. Government Rights
-  clause is in lieu of, and supersedes, any other FAR, DFAR, or other
-  clause or provision that addresses Government rights in computer
-  software under this License.
-
-9. MISCELLANEOUS.
-
-  This License represents the complete agreement concerning subject
-  matter hereof. If any provision of this License is held to be
-  unenforceable, such provision shall be reformed only to the extent
-  necessary to make it enforceable. This License shall be governed by
-  the law of the jurisdiction specified in a notice contained within
-  the Original Software (except to the extent applicable law, if any,
-  provides otherwise), excluding such jurisdiction's conflict-of-law
-  provisions. Any litigation relating to this License shall be subject
-  to the jurisdiction of the courts located in the jurisdiction and
-  venue specified in a notice contained within the Original Software,
-  with the losing party responsible for costs, including, without
-  limitation, court costs and reasonable attorneys' fees and expenses.
-  The application of the United Nations Convention on Contracts for
-  the International Sale of Goods is expressly excluded. Any law or
-  regulation which provides that the language of a contract shall be
-  construed against the drafter shall not apply to this License. You
-  agree that You alone are responsible for compliance with the United
-  States export administration regulations (and the export control
-  laws and regulation of any other countries) when You use, distribute
-  or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-  As between Initial Developer and the Contributors, each party is
-  responsible for claims and damages arising, directly or indirectly,
-  out of its utilization of rights under this License and You agree to
-  work with Initial Developer and Contributors to distribute such
-  responsibility on an equitable basis. Nothing herein is intended or
-  shall be deemed to constitute any admission of liability.
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-The code released under the CDDL shall be governed by the laws of the
-State of California (excluding conflict-of-law provisions). Any
-litigation relating to this License shall be subject to the jurisdiction
-of the Federal Courts of the Northern District of California and the
-state courts of the State of California, with venue lying in Santa Clara
-County, California.
-The GNU General Public License (GPL) Version 2, June 1991
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor
-Boston, MA 02110-1335
-USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public
-License applies to most of the Free Software Foundation's software and
-to any other program whose authors commit to using it. (Some other Free
-Software Foundation software is covered by the GNU Library General
-Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this
-service if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis
-or for a fee, you must give the recipients all the rights that you have.
-You must make sure that they, too, receive or can get the source code.
-And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary. To prevent this, we have made it clear that any patent must
-be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a
-notice placed by the copyright holder saying it may be distributed under
-the terms of this General Public License. The "Program", below, refers
-to any such program or work, and a "work based on the Program" means
-either the Program or any derivative work under copyright law: that is
-to say, a work containing the Program or a portion of it, either
-verbatim or with modifications and/or translated into another language.
-(Hereinafter, translation is included without limitation in the term
-"modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-the Program is not restricted, and the output from the Program is
-covered only if its contents constitute a work based on the Program
-(independent of having been made by running the Program). Whether that
-is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any part
-    thereof, to be licensed as a whole at no charge to all third parties
-    under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a notice
-    that there is no warranty (or else, saying that you provide a
-    warranty) and that users may redistribute the program under these
-    conditions, and telling the user how to view a copy of this License.
-    (Exception: if the Program itself is interactive but does not
-    normally print such an announcement, your work based on the Program
-    is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program, and
-can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based on
-the Program, the distribution of the whole must be on the terms of this
-License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections 1
-    and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your cost
-    of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer to
-    distribute corresponding source code. (This alternative is allowed
-    only for noncommercial distribution and only if you received the
-    program in object code or executable form with such an offer, in
-    accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to control
-compilation and installation of the executable. However, as a special
-exception, the source code distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies the
-executable.
-
-If distribution of executable or object code is made by offering access
-to copy from a designated place, then offering equivalent access to copy
-the source code from the same place counts as distribution of the source
-code, even though third parties are not compelled to copy the source
-along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and will
-automatically terminate your rights under this License. However, parties
-who have received copies, or rights, from you under this License will
-not have their licenses terminated so long as such parties remain in
-full compliance.
-
-5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and all
-its terms and conditions for copying, distributing or modifying the
-Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License and
-any other pertinent obligations, then as a consequence you may not
-distribute the Program at all. For example, if a patent license would
-not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you
-could satisfy both it and this License would be to refrain entirely from
-distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is implemented
-by public license practices. Many people have made generous
-contributions to the wide range of software distributed through that
-system in reliance on consistent application of that system; it is up to
-the author/donor to decide if he or she is willing to distribute
-software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be
-a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License may
-add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among countries
-not thus excluded. In such case, this License incorporates the
-limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new
-versions of the General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a version
-number of this License, you may choose any version ever published by the
-Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the
-author to ask for permission. For software which is copyrighted by the
-Free Software Foundation, write to the Free Software Foundation; we
-sometimes make exceptions for this. Our decision will be guided by the
-two goals of preserving the free status of all derivatives of our free
-software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    One line to give the program's name and a brief idea of what it does.
-    Copyright (C) <year> <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
-    `show w'. This is free software, and you are welcome to redistribute
-    it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License. Of course, the commands
-you use may be called something other than `show w' and `show c'; they
-could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the
-    program `Gnomovision' (which makes passes at compilers) written by
-    James Hacker.
-
-    signature of Ty Coon, 1 April 1989
-    Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications
-with the library. If this is what you want to do, use the GNU Library
-General Public License instead of this License.
-Certain source files distributed by Oracle America, Inc. and/or its
-affiliates are subject to the following clarification and special
-exception to the GPLv2, based on the GNU Project exception for its
-Classpath libraries, known as the GNU Classpath Exception, but only
-where Oracle has expressly included in the particular source file's
-header the words "Oracle designates this particular file as subject to
-the "Classpath" exception as provided by Oracle in the LICENSE file
-that accompanied this code."
-
-You should also note that Oracle includes multiple, independent
-programs in this software package. Some of those programs are provided
-under licenses deemed incompatible with the GPLv2 by the Free Software
-Foundation and others.  For example, the package includes programs
-licensed under the Apache License, Version 2.0.  Such programs are
-licensed to you under their original licenses.
-
-Oracle facilitates your further distribution of this package by adding
-the Classpath Exception to the necessary parts of its GPLv2 code, which
-permits you to use that code in combination with other independent
-modules not licensed under the GPLv2.  However, note that this would
-not permit you to commingle code under an incompatible license with
-Oracle's GPLv2 licensed code by, for example, cutting and pasting such
-code into a file also containing Oracle's GPLv2 licensed code and then
-distributing the result.  Additionally, if you were to remove the
-Classpath Exception from any of the files to which it applies and
-distribute the result, you would likely be required to license some or
-all of the other code in that distribution under the GPLv2 as well, and
-since the GPLv2 is incompatible with the license terms of some items
-included in the distribution by Oracle, removing the Classpath
-Exception could therefore effectively compromise your ability to
-further distribute the package.
-
-Proceed with caution and we recommend that you obtain the advice of a
-lawyer skilled in open source matters before removing the Classpath
-Exception or making modifications to this package which may
-subsequently be redistributed and/or involve the use of third party
-software.
-
-CLASSPATH EXCEPTION
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License version 2 cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from or
-based on this library.  If you modify this library, you may extend this
-exception to your version of the library, but you are not obligated to
-do so.  If you do not wish to do so, delete this exception statement
-from your version.
diff --git a/web.core.syntax/external/generated-jsf12-tlddoc-1.2-20-license.txt b/web.core.syntax/external/generated-jsf12-tlddoc-1.2-20-license.txt
new file mode 100644
index 0000000000..4ddf3ddf63
--- /dev/null
+++ b/web.core.syntax/external/generated-jsf12-tlddoc-1.2-20-license.txt
@@ -0,0 +1,388 @@
+Name: Taglibrary documentation for Mojarra JSF Implementation
+Version: 1.2-20
+Description: Taglibrary documentation for Reference Implementation of the JSF Specification
+License: CDDL-1.0
+Origin: Generated from taglibrary jar
+Source: https://github.com/javaserverfaces/mojarra
+Type: generated
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. "Contributor" means each individual or entity that
+creates or contributes to the creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the
+Original Software, prior Modifications used by a
+Contributor (if any), and the Modifications made by that
+particular Contributor.
+
+1.3. "Covered Software" means (a) the Original Software, or
+(b) Modifications, or (c) the combination of files
+containing Original Software with files containing
+Modifications, in each case including portions thereof.
+
+1.4. "Executable" means the Covered Software in any form
+other than Source Code.
+
+1.5. "Initial Developer" means the individual or entity
+that first makes Original Software available under this
+License.
+
+1.6. "Larger Work" means a work which combines Covered
+Software or portions thereof with code not governed by the
+terms of this License.
+
+1.7. "License" means this document.
+
+1.8. "Licensable" means having the right to grant, to the
+maximum extent possible, whether at the time of the initial
+grant or subsequently acquired, any and all of the rights
+conveyed herein.
+
+1.9. "Modifications" means the Source Code and Executable
+form of any of the following:
+
+A. Any file that results from an addition to,
+deletion from or modification of the contents of a
+file containing Original Software or previous
+Modifications;
+
+B. Any new file that contains any part of the
+Original Software or previous Modification; or
+
+C. Any new file that is contributed or otherwise made
+available under the terms of this License.
+
+1.10. "Original Software" means the Source Code and
+Executable form of computer software code that is
+originally released under this License.
+
+1.11. "Patent Claims" means any patent claim(s), now owned
+or hereafter acquired, including without limitation,
+method, process, and apparatus claims, in any patent
+Licensable by grantor.
+
+1.12. "Source Code" means (a) the common form of computer
+software code in which modifications are made and (b)
+associated documentation included in or with such code.
+
+1.13. "You" (or "Your") means an individual or a legal
+entity exercising rights under, and complying with all of
+the terms of, this License. For legal entities, "You"
+includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this
+definition, "control" means (a) the power, direct or
+indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (b) ownership
+of more than fifty percent (50%) of the outstanding shares
+or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, the
+Initial Developer hereby grants You a world-wide,
+royalty-free, non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Initial Developer,
+to use, reproduce, modify, display, perform,
+sublicense and distribute the Original Software (or
+portions thereof), with or without Modifications,
+and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using or selling of Original Software, to make, have
+made, use, practice, sell, and offer for sale, and/or
+otherwise dispose of the Original Software (or
+portions thereof).
+
+(c) The licenses granted in Sections 2.1(a) and (b)
+are effective on the date Initial Developer first
+distributes or otherwise makes the Original Software
+available to a third party under the terms of this
+License.
+
+(d) Notwithstanding Section 2.1(b) above, no patent
+license is granted: (1) for code that You delete from
+the Original Software, or (2) for infringements
+caused by: (i) the modification of the Original
+Software, or (ii) the combination of the Original
+Software with other software or devices.
+
+2.2. Contributor Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, each
+Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Contributor to
+use, reproduce, modify, display, perform, sublicense
+and distribute the Modifications created by such
+Contributor (or portions thereof), either on an
+unmodified basis, with other Modifications, as
+Covered Software and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using, or selling of Modifications made by that
+Contributor either alone and/or in combination with
+its Contributor Version (or portions of such
+combination), to make, use, sell, offer for sale,
+have made, and/or otherwise dispose of: (1)
+Modifications made by that Contributor (or portions
+thereof); and (2) the combination of Modifications
+made by that Contributor with its Contributor Version
+(or portions of such combination).
+
+(c) The licenses granted in Sections 2.2(a) and
+2.2(b) are effective on the date Contributor first
+distributes or otherwise makes the Modifications
+available to a third party.
+
+(d) Notwithstanding Section 2.2(b) above, no patent
+license is granted: (1) for any code that Contributor
+has deleted from the Contributor Version; (2) for
+infringements caused by: (i) third party
+modifications of Contributor Version, or (ii) the
+combination of Modifications made by that Contributor
+with other software (except as part of the
+Contributor Version) or other devices; or (3) under
+Patent Claims infringed by Covered Software in the
+absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make
+available in Executable form must also be made available in
+Source Code form and that Source Code form must be
+distributed only under the terms of this License. You must
+include a copy of this License with every copy of the
+Source Code form of the Covered Software You distribute or
+otherwise make available. You must inform recipients of any
+such Covered Software in Executable form as to how they can
+obtain such Covered Software in Source Code form in a
+reasonable manner on or through a medium customarily used
+for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You
+contribute are governed by the terms of this License. You
+represent that You believe Your Modifications are Your
+original creation(s) and/or You have sufficient rights to
+grant the rights conveyed by this License.
+
+3.3. Required Notices.
+
+You must include a notice in each of Your Modifications
+that identifies You as the Contributor of the Modification.
+You may not remove or alter any copyright, patent or
+trademark notices contained within the Covered Software, or
+any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+
+You may not offer or impose any terms on any Covered
+Software in Source Code form that alters or restricts the
+applicable version of this License or the recipients'
+rights hereunder. You may choose to offer, and to charge a
+fee for, warranty, support, indemnity or liability
+obligations to one or more recipients of Covered Software.
+However, you may do so only on Your own behalf, and not on
+behalf of the Initial Developer or any Contributor. You
+must make it absolutely clear that any such warranty,
+support, indemnity or liability obligation is offered by
+You alone, and You hereby agree to indemnify the Initial
+Developer and every Contributor for any liability incurred
+by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+
+You may distribute the Executable form of the Covered
+Software under the terms of this License or under the terms
+of a license of Your choice, which may contain terms
+different from this License, provided that You are in
+compliance with the terms of this License and that the
+license for the Executable form does not attempt to limit
+or alter the recipient's rights in the Source Code form
+from the rights set forth in this License. If You
+distribute the Covered Software in Executable form under a
+different license, You must make it absolutely clear that
+any terms which differ from this License are offered by You
+alone, not by the Initial Developer or Contributor. You
+hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial
+Developer or such Contributor as a result of any such terms
+You offer.
+
+3.6. Larger Works.
+
+You may create a Larger Work by combining Covered Software
+with other code not governed by the terms of this License
+and distribute the Larger Work as a single product. In such
+a case, You must make sure the requirements of this License
+are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+
+Sun Microsystems, Inc. is the initial license steward and
+may publish revised and/or new versions of this License
+from time to time. Each version will be given a
+distinguishing version number. Except as provided in
+Section 4.3, no one other than the license steward has the
+right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. If the Initial Developer includes a
+notice in the Original Software prohibiting it from being
+distributed or otherwise made available under any
+subsequent version of the License, You must distribute and
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. Otherwise, You may also choose to
+use, distribute or otherwise make the Covered Software
+available under the terms of any subsequent version of the
+License published by the license steward.
+
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a
+new license for Your Original Software, You may create and
+use a modified version of this License if You: (a) rename
+the license and remove any references to the name of the
+license steward (except to note that the license differs
+from this License); and (b) otherwise make it clear that
+the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will
+terminate automatically if You fail to comply with terms
+herein and fail to cure such breach within 30 days of
+becoming aware of the breach. Provisions which, by their
+nature, must remain in effect beyond the termination of
+this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding
+declaratory judgment actions) against Initial Developer or
+a Contributor (the Initial Developer or Contributor against
+whom You assert such claim is referred to as "Participant")
+alleging that the Participant Software (meaning the
+Contributor Version where the Participant is a Contributor
+or the Original Software where the Participant is the
+Initial Developer) directly or indirectly infringes any
+patent, then any and all rights granted directly or
+indirectly to You by such Participant, the Initial
+Developer (if the Initial Developer is not the Participant)
+and all Contributors under Sections 2.1 and/or 2.2 of this
+License shall, upon 60 days notice from Participant
+terminate prospectively and automatically at the expiration
+of such 60 day notice period, unless if within such 60 day
+period You withdraw Your claim with respect to the
+Participant Software against such Participant either
+unilaterally or pursuant to a written agreement with
+Participant.
+
+6.3. In the event of termination under Sections 6.1 or 6.2
+above, all end user licenses that have been validly granted
+by You or any distributor hereunder prior to termination
+(excluding licenses granted to You by any distributor)
+shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a "commercial item," as that term is
+defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" (as that term is defined at 48 C.F.R.
+252.227-7014(a)(1)) and "commercial computer software
+documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users
+acquire Covered Software with only those rights set forth herein.
+This U.S. Government Rights clause is in lieu of, and supersedes,
+any other FAR, DFAR, or other clause or provision that addresses
+Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the
+extent necessary to make it enforceable. This License shall be
+governed by the law of the jurisdiction specified in a notice
+contained within the Original Software (except to the extent
+applicable law, if any, provides otherwise), excluding such
+jurisdiction's conflict-of-law provisions. Any litigation
+relating to this License shall be subject to the jurisdiction of
+the courts located in the jurisdiction and venue specified in a
+notice contained within the Original Software, with the losing
+party responsible for costs, including, without limitation, court
+costs and reasonable attorneys' fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or
+regulation which provides that the language of a contract shall
+be construed against the drafter shall not apply to this License.
+You agree that You alone are responsible for compliance with the
+United States export administration regulations (and the export
+control laws and regulation of any other countries) when You use,
+distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is
+responsible for claims and damages arising, directly or
+indirectly, out of its utilization of rights under this License
+and You agree to work with Initial Developer and Contributors to
+distribute such responsibility on an equitable basis. Nothing
+herein is intended or shall be deemed to constitute any admission
+of liability.
diff --git a/web.core.syntax/external/generated-jstl11-doc-1.1.2-license.txt b/web.core.syntax/external/generated-jstl11-doc-1.1.2-license.txt
new file mode 100644
index 0000000000..0334547994
--- /dev/null
+++ b/web.core.syntax/external/generated-jstl11-doc-1.1.2-license.txt
@@ -0,0 +1,209 @@
+Name: Taglibrary documentation for jakarta-taglibs 'standard'
+Description: Taglibrary documentation for for an implementation of JavaServer Pages Standard Tag Library (JSTL)
+Origin: Generated from taglibrary jar
+Version: 1.1.2
+License: Apache-2.0
+URL: http://archive.apache.org/dist/jakarta/taglibs/standard/
+Type: generated
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/web.core.syntax/external/generated-struts-tags-1.3.10-license.txt b/web.core.syntax/external/generated-struts-tags-1.3.10-license.txt
new file mode 100644
index 0000000000..1b18c0cdd9
--- /dev/null
+++ b/web.core.syntax/external/generated-struts-tags-1.3.10-license.txt
@@ -0,0 +1,209 @@
+Name: Taglibrary documentation for Apache Struts
+Description: Taglibrary documentation for Apache Struts is a free, open-source, MVC framework for creating elegant, modern Java web applications.
+Origin: Generated from taglibrary jar
+Version: 1.3.10
+License: Apache-2.0
+URL: http://archive.apache.org/dist/jakarta/taglibs/standard/
+Type: generated
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/web.core.syntax/external/generated-struts-tags-1.3.10-notice.txt b/web.core.syntax/external/generated-struts-tags-1.3.10-notice.txt
new file mode 100644
index 0000000000..1c95a95f21
--- /dev/null
+++ b/web.core.syntax/external/generated-struts-tags-1.3.10-notice.txt
@@ -0,0 +1,6 @@
+Apache Struts Taglib
+Apache Struts Tiles
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/web.core.syntax/external/jsf-impl-1.2-20-license.txt b/web.core.syntax/external/jsf-impl-1.2-20-license.txt
new file mode 100644
index 0000000000..12c2f14e34
--- /dev/null
+++ b/web.core.syntax/external/jsf-impl-1.2-20-license.txt
@@ -0,0 +1,389 @@
+Name: Taglibrary documentation for Mojarra JSF Implementation
+Version: 1.2-20
+Description: Taglibrary documentation for Reference Implementation of the JSF Specification
+License: CDDL-1.0
+Origin: Generated from taglibrary jar
+Source: https://github.com/javaserverfaces/mojarra
+Type: compile-time
+Comment: Only used to create tag library documentation
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. "Contributor" means each individual or entity that
+creates or contributes to the creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the
+Original Software, prior Modifications used by a
+Contributor (if any), and the Modifications made by that
+particular Contributor.
+
+1.3. "Covered Software" means (a) the Original Software, or
+(b) Modifications, or (c) the combination of files
+containing Original Software with files containing
+Modifications, in each case including portions thereof.
+
+1.4. "Executable" means the Covered Software in any form
+other than Source Code.
+
+1.5. "Initial Developer" means the individual or entity
+that first makes Original Software available under this
+License.
+
+1.6. "Larger Work" means a work which combines Covered
+Software or portions thereof with code not governed by the
+terms of this License.
+
+1.7. "License" means this document.
+
+1.8. "Licensable" means having the right to grant, to the
+maximum extent possible, whether at the time of the initial
+grant or subsequently acquired, any and all of the rights
+conveyed herein.
+
+1.9. "Modifications" means the Source Code and Executable
+form of any of the following:
+
+A. Any file that results from an addition to,
+deletion from or modification of the contents of a
+file containing Original Software or previous
+Modifications;
+
+B. Any new file that contains any part of the
+Original Software or previous Modification; or
+
+C. Any new file that is contributed or otherwise made
+available under the terms of this License.
+
+1.10. "Original Software" means the Source Code and
+Executable form of computer software code that is
+originally released under this License.
+
+1.11. "Patent Claims" means any patent claim(s), now owned
+or hereafter acquired, including without limitation,
+method, process, and apparatus claims, in any patent
+Licensable by grantor.
+
+1.12. "Source Code" means (a) the common form of computer
+software code in which modifications are made and (b)
+associated documentation included in or with such code.
+
+1.13. "You" (or "Your") means an individual or a legal
+entity exercising rights under, and complying with all of
+the terms of, this License. For legal entities, "You"
+includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this
+definition, "control" means (a) the power, direct or
+indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (b) ownership
+of more than fifty percent (50%) of the outstanding shares
+or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, the
+Initial Developer hereby grants You a world-wide,
+royalty-free, non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Initial Developer,
+to use, reproduce, modify, display, perform,
+sublicense and distribute the Original Software (or
+portions thereof), with or without Modifications,
+and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using or selling of Original Software, to make, have
+made, use, practice, sell, and offer for sale, and/or
+otherwise dispose of the Original Software (or
+portions thereof).
+
+(c) The licenses granted in Sections 2.1(a) and (b)
+are effective on the date Initial Developer first
+distributes or otherwise makes the Original Software
+available to a third party under the terms of this
+License.
+
+(d) Notwithstanding Section 2.1(b) above, no patent
+license is granted: (1) for code that You delete from
+the Original Software, or (2) for infringements
+caused by: (i) the modification of the Original
+Software, or (ii) the combination of the Original
+Software with other software or devices.
+
+2.2. Contributor Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, each
+Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than
+patent or trademark) Licensable by Contributor to
+use, reproduce, modify, display, perform, sublicense
+and distribute the Modifications created by such
+Contributor (or portions thereof), either on an
+unmodified basis, with other Modifications, as
+Covered Software and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making,
+using, or selling of Modifications made by that
+Contributor either alone and/or in combination with
+its Contributor Version (or portions of such
+combination), to make, use, sell, offer for sale,
+have made, and/or otherwise dispose of: (1)
+Modifications made by that Contributor (or portions
+thereof); and (2) the combination of Modifications
+made by that Contributor with its Contributor Version
+(or portions of such combination).
+
+(c) The licenses granted in Sections 2.2(a) and
+2.2(b) are effective on the date Contributor first
+distributes or otherwise makes the Modifications
+available to a third party.
+
+(d) Notwithstanding Section 2.2(b) above, no patent
+license is granted: (1) for any code that Contributor
+has deleted from the Contributor Version; (2) for
+infringements caused by: (i) third party
+modifications of Contributor Version, or (ii) the
+combination of Modifications made by that Contributor
+with other software (except as part of the
+Contributor Version) or other devices; or (3) under
+Patent Claims infringed by Covered Software in the
+absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make
+available in Executable form must also be made available in
+Source Code form and that Source Code form must be
+distributed only under the terms of this License. You must
+include a copy of this License with every copy of the
+Source Code form of the Covered Software You distribute or
+otherwise make available. You must inform recipients of any
+such Covered Software in Executable form as to how they can
+obtain such Covered Software in Source Code form in a
+reasonable manner on or through a medium customarily used
+for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You
+contribute are governed by the terms of this License. You
+represent that You believe Your Modifications are Your
+original creation(s) and/or You have sufficient rights to
+grant the rights conveyed by this License.
+
+3.3. Required Notices.
+
+You must include a notice in each of Your Modifications
+that identifies You as the Contributor of the Modification.
+You may not remove or alter any copyright, patent or
+trademark notices contained within the Covered Software, or
+any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+
+You may not offer or impose any terms on any Covered
+Software in Source Code form that alters or restricts the
+applicable version of this License or the recipients'
+rights hereunder. You may choose to offer, and to charge a
+fee for, warranty, support, indemnity or liability
+obligations to one or more recipients of Covered Software.
+However, you may do so only on Your own behalf, and not on
+behalf of the Initial Developer or any Contributor. You
+must make it absolutely clear that any such warranty,
+support, indemnity or liability obligation is offered by
+You alone, and You hereby agree to indemnify the Initial
+Developer and every Contributor for any liability incurred
+by the Initial Developer or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+
+You may distribute the Executable form of the Covered
+Software under the terms of this License or under the terms
+of a license of Your choice, which may contain terms
+different from this License, provided that You are in
+compliance with the terms of this License and that the
+license for the Executable form does not attempt to limit
+or alter the recipient's rights in the Source Code form
+from the rights set forth in this License. If You
+distribute the Covered Software in Executable form under a
+different license, You must make it absolutely clear that
+any terms which differ from this License are offered by You
+alone, not by the Initial Developer or Contributor. You
+hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial
+Developer or such Contributor as a result of any such terms
+You offer.
+
+3.6. Larger Works.
+
+You may create a Larger Work by combining Covered Software
+with other code not governed by the terms of this License
+and distribute the Larger Work as a single product. In such
+a case, You must make sure the requirements of this License
+are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+
+Sun Microsystems, Inc. is the initial license steward and
+may publish revised and/or new versions of this License
+from time to time. Each version will be given a
+distinguishing version number. Except as provided in
+Section 4.3, no one other than the license steward has the
+right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. If the Initial Developer includes a
+notice in the Original Software prohibiting it from being
+distributed or otherwise made available under any
+subsequent version of the License, You must distribute and
+make the Covered Software available under the terms of the
+version of the License under which You originally received
+the Covered Software. Otherwise, You may also choose to
+use, distribute or otherwise make the Covered Software
+available under the terms of any subsequent version of the
+License published by the license steward.
+
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a
+new license for Your Original Software, You may create and
+use a modified version of this License if You: (a) rename
+the license and remove any references to the name of the
+license steward (except to note that the license differs
+from this License); and (b) otherwise make it clear that
+the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will
+terminate automatically if You fail to comply with terms
+herein and fail to cure such breach within 30 days of
+becoming aware of the breach. Provisions which, by their
+nature, must remain in effect beyond the termination of
+this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding
+declaratory judgment actions) against Initial Developer or
+a Contributor (the Initial Developer or Contributor against
+whom You assert such claim is referred to as "Participant")
+alleging that the Participant Software (meaning the
+Contributor Version where the Participant is a Contributor
+or the Original Software where the Participant is the
+Initial Developer) directly or indirectly infringes any
+patent, then any and all rights granted directly or
+indirectly to You by such Participant, the Initial
+Developer (if the Initial Developer is not the Participant)
+and all Contributors under Sections 2.1 and/or 2.2 of this
+License shall, upon 60 days notice from Participant
+terminate prospectively and automatically at the expiration
+of such 60 day notice period, unless if within such 60 day
+period You withdraw Your claim with respect to the
+Participant Software against such Participant either
+unilaterally or pursuant to a written agreement with
+Participant.
+
+6.3. In the event of termination under Sections 6.1 or 6.2
+above, all end user licenses that have been validly granted
+by You or any distributor hereunder prior to termination
+(excluding licenses granted to You by any distributor)
+shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a "commercial item," as that term is
+defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" (as that term is defined at 48 C.F.R.
+252.227-7014(a)(1)) and "commercial computer software
+documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users
+acquire Covered Software with only those rights set forth herein.
+This U.S. Government Rights clause is in lieu of, and supersedes,
+any other FAR, DFAR, or other clause or provision that addresses
+Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the
+extent necessary to make it enforceable. This License shall be
+governed by the law of the jurisdiction specified in a notice
+contained within the Original Software (except to the extent
+applicable law, if any, provides otherwise), excluding such
+jurisdiction's conflict-of-law provisions. Any litigation
+relating to this License shall be subject to the jurisdiction of
+the courts located in the jurisdiction and venue specified in a
+notice contained within the Original Software, with the losing
+party responsible for costs, including, without limitation, court
+costs and reasonable attorneys' fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or
+regulation which provides that the language of a contract shall
+be construed against the drafter shall not apply to this License.
+You agree that You alone are responsible for compliance with the
+United States export administration regulations (and the export
+control laws and regulation of any other countries) when You use,
+distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is
+responsible for claims and damages arising, directly or
+indirectly, out of its utilization of rights under this License
+and You agree to work with Initial Developer and Contributors to
+distribute such responsibility on an equitable basis. Nothing
+herein is intended or shall be deemed to constitute any admission
+of liability.
diff --git a/web.core.syntax/external/standard-1.1.2-license.txt b/web.core.syntax/external/standard-1.1.2-license.txt
new file mode 100644
index 0000000000..806dacecc2
--- /dev/null
+++ b/web.core.syntax/external/standard-1.1.2-license.txt
@@ -0,0 +1,209 @@
+Name: jakarta-taglibs 'standard'
+Description: An implementation of JavaServer Pages Standard Tag Library (JSTL)
+Origin: Apache Software Foundation
+Version: 1.1.2
+License: Apache-2.0
+URL: http://archive.apache.org/dist/jakarta/taglibs/standard/
+Comment: Only used to create tag library documentation
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/web.core.syntax/external/struts-1.3.10-license.txt b/web.core.syntax/external/struts-1.3.10-license.txt
new file mode 100644
index 0000000000..ebaf83dae1
--- /dev/null
+++ b/web.core.syntax/external/struts-1.3.10-license.txt
@@ -0,0 +1,211 @@
+Name: Apache Struts
+Description: Apache Struts is a free, open-source, MVC framework for creating elegant, modern Java web applications.
+Origin: Apache Software Foundation
+Version: 1.3.10
+License: Apache-2.0
+Files: struts-taglib-1.3.10.jar, struts-tiles-1.3.10.jar
+URL: http://archive.apache.org/dist/jakarta/taglibs/standard/
+Type: compile-time
+Comment: Only used to create tag library documentation
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/web.core.syntax/external/struts-1.3.10-notice.txt b/web.core.syntax/external/struts-1.3.10-notice.txt
new file mode 100644
index 0000000000..b8efca6841
--- /dev/null
+++ b/web.core.syntax/external/struts-1.3.10-notice.txt
@@ -0,0 +1,10 @@
+Apache Struts Taglib
+Apache Struts Tiles
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes the ANTLR parsing library,
+developed by JGuru.com (http://www.antlr.org and
+http://www.jguru.com).
\ No newline at end of file
diff --git a/web.core.syntax/external/struts-tags_apache20_license.txt b/web.core.syntax/external/struts-tags_apache20_license.txt
deleted file mode 100644
index 0c8a80022e..0000000000
--- a/web.core.syntax/external/struts-tags_apache20_license.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. 
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
diff --git a/web.core.syntax/external/tlddoc-1.3-license.txt b/web.core.syntax/external/tlddoc-1.3-license.txt
new file mode 100644
index 0000000000..c6187d760a
--- /dev/null
+++ b/web.core.syntax/external/tlddoc-1.3-license.txt
@@ -0,0 +1,34 @@
+Name: taglibrarydoc
+Version: 1.3
+Description: Tag Library Documentation Generator is a utility for automatically generating javadoc-style documentation for JavaServer Pages (JSP) Technology Tag Libraries.
+License: BSD-tlddoc
+Origin: Sun Microsystems, Inc.
+Source: https://repo1.maven.org/maven2/taglibrarydoc/tlddoc/1.3/
+Type: compile-time
+
+Copyright (c) 2003-2004, Sun Microsystems, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Sun Microsystems, Inc. nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/web.core.syntax/licenseinfo.xml b/web.core.syntax/licenseinfo.xml
index 2e2b500b10..5e79c6bed2 100644
--- a/web.core.syntax/licenseinfo.xml
+++ b/web.core.syntax/licenseinfo.xml
@@ -33,6 +33,24 @@
         <file>src/org/netbeans/modules/web/core/syntax/resources/ELExample</file>
         <file>src/org/netbeans/modules/web/core/syntax/resources/JSPExample</file>
         <license ref="Apache-2.0-ASF" />
-        <comment type="GUI_USABILITY"/>        
-    </fileset>   
+        <comment type="GUI_USABILITY"/>
+    </fileset>
+    <fileset>
+        <file>tlddoc/xslt/alltags-frame.html.xsl</file>
+        <file>tlddoc/xslt/alltags-noframe.html.xsl</file>
+        <file>tlddoc/xslt/function.html.xsl</file>
+        <file>tlddoc/xslt/help-doc.html.xsl</file>
+        <file>tlddoc/xslt/index.html.xsl</file>
+        <file>tlddoc/xslt/overview-frame.html.xsl</file>
+        <file>tlddoc/xslt/overview-summary.html.xsl</file>
+        <file>tlddoc/xslt/tag.html.xsl</file>
+        <file>tlddoc/xslt/tld-frame.html.xsl</file>
+        <file>tlddoc/xslt/tld-summary.html.xsl</file>
+        <file>tlddoc/xslt/tld1_1-tld1_2.xsl</file>
+        <file>tlddoc/xslt/tld1_2-tld2_0.xsl</file>
+        <file>tlddoc/xslt/tld2_0-tld2_1.xsl</file>
+        <file>tlddoc/xslt/tld2_1-tld2_1.xsl</file>
+        <license ref="BSD-tldxslt" />
+        <sourceOnly />
+    </fileset>
 </licenseinfo>
diff --git a/web.core.syntax/nbproject/project.properties b/web.core.syntax/nbproject/project.properties
index 1b51e4559d..af745f1a88 100644
--- a/web.core.syntax/nbproject/project.properties
+++ b/web.core.syntax/nbproject/project.properties
@@ -17,9 +17,9 @@
 
 javac.compilerargs=-Xlint:unchecked
 release.external/syntaxref20.zip=docs/syntaxref20.zip
-release.tlddoc/doc/jstl11-doc.zip=docs/jstl11-doc.zip
-release.tlddoc/doc/jsf12-tlddoc.zip=docs/jsf12-tlddoc.zip
-release.tlddoc/doc/struts-tags.zip=docs/struts-tags.zip
+release.external/generated-jstl11-doc-1.1.2.zip=docs/jstl11-doc.zip
+release.external/generated-jsf12-tlddoc-1.2-20.zip=docs/jsf12-tlddoc.zip
+release.external/generated-struts-tags-1.3.10.zip=docs/struts-tags.zip
 
 javac.source=1.6
 requires.nb.javac=true
diff --git a/web.core.syntax/tlddoc/HowGenerateDocumentation.html b/web.core.syntax/tlddoc/HowGenerateDocumentation.html
deleted file mode 100644
index f542985c69..0000000000
--- a/web.core.syntax/tlddoc/HowGenerateDocumentation.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-    <head>
-        <title>How to generate documentation</title>
-    </head>
-    <body>
-        <h2>How to generate documentation from tld</h2>
-
-        This document describes step by step, how to generate documentation from tld and put this documentation in the build. It has only sense, when there are descriptions for tags and attributes in the tld file.
-
-        <ul>
-            <li>Download the <a href="https://taglibrarydoc.dev.java.net/">Tag Library Documentation Generator</a>.</li>
-            <li>Generate the documentation. You have to use changed xslt files which are in the cvs repository. The changed xslt files include special anchors, which are used during displaying the help in java popup window in the IDE.
-                <br><br>
-                For example this is command, which I used for generating documentation for JSTL 1.1:<br>
-                <table border='1' bgcolor='#aaaaaa'>
-                    <tr>
-                        <td>
-                            <code>
-                                java -jar tlddoc.jar -d /space/tmp/jstl -xslt /space/cvs/tlddoc/xslt -doctitle "JavaServer Pages Standard Tag Library 1.1 Tag Reference" -windowtitle "JSPL 1.1 - Generated Documentation" standard.jar
-                            </code>
-                        </td>
-                    </tr>
-                </table>
-                <blockquote>
-                    <font size='-1'/>
-                        The standard.jar for jstl 1.1.1 contains tld files, where is defined the same short name for two libraries. 
-                        The tool can not generate documentation, when there are more libraries with the same short name. So you can change the short name in tld by hand.
-                    </font>
-                </blockquote>
-            </li>
-            <li>Create zip file from the generated files. The index.html file has to be in the root of the zip file.</li>
-
-            <li>Put the zip file in the web/tlddoc/doc/ folder and commit in the cvs.</li>
-
-            <li>Put copy task in the web/jspsyntax/build.xml. The zip file should be placed in the {$nbinstal}/ide/docs</li>
-
-            <li>Edit method initHelp in the JspSyntaxSupport.java file. Put into the static helpMap appropriate items. </li>
-        </ul>
-    </body>
-</html>
diff --git a/web.core.syntax/tlddoc/xslt/alltags-frame.html.xsl b/web.core.syntax/tlddoc/xslt/alltags-frame.html.xsl
new file mode 100644
index 0000000000..5def102e5a
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/alltags-frame.html.xsl
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : alltags-frame.html.xsl
+    Created on : October 1, 2002, 5:37 PM
+    Author     : mroth
+    Description:
+        Creates the all tags frame (lower left corner), listing all tags
+        and functions included in all tag libraries for this generation.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <html>
+        <head>
+          <title>All Tags / Functions</title>
+          <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/>
+        </head>
+        <script>
+          function asd()
+          {
+            parent.document.title="All Tags / Functions";
+          }
+        </script>
+        <body bgcolor="white" onload="asd();">
+          <font size="+1" class="FrameHeadingFont">
+          <b>All Tags / Functions</b></font>
+          <br/>
+          <table border="0" width="100%">
+            <tr>
+              <td nowrap="true"><font class="FrameItemFont">
+                <xsl:apply-templates 
+                    select="javaee:tlds/javaee:taglib/javaee:tag|javaee:tlds/javaee:taglib/javaee:tag-file|javaee:tlds/javaee:taglib/javaee:function">
+                  <xsl:sort select="../javaee:short-name"/>
+                  <xsl:sort select="javaee:name"/>
+                </xsl:apply-templates>
+              </font></td>
+            </tr>
+          </table>
+        </body>
+      </html>    
+    </xsl:template>
+    
+    <xsl:template match="javaee:tag|javaee:tag-file">
+      <xsl:element name="a">
+        <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.html</xsl:attribute>
+        <xsl:attribute name="target">tagFrame</xsl:attribute>
+        <xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>
+      </xsl:element>
+      <br/>
+    </xsl:template>
+    
+    <!-- 
+      - Same as above, but add the () to indicate it's a function 
+      - and change the HTML to .fn.html
+      -->
+    <xsl:template match="javaee:function">
+      <xsl:element name="a">
+        <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute>
+        <xsl:attribute name="target">tagFrame</xsl:attribute>
+        <i><xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>()</i>
+      </xsl:element>
+      <br/>
+    </xsl:template>
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/alltags-noframe.html.xsl b/web.core.syntax/tlddoc/xslt/alltags-noframe.html.xsl
new file mode 100644
index 0000000000..69a91f19fa
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/alltags-noframe.html.xsl
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : alltags-frame.html.xsl
+    Created on : October 1, 2002, 5:37 PM
+    Author     : mroth
+    Description:
+        Creates the all tags page, listing all tags
+        and functions included in all tag libraries for this generation.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <html>
+        <head>
+          <title>All Tags / Functions</title>
+          <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/>
+        </head>
+        <script>
+          function asd()
+          {
+            parent.document.title="All Tags / Functions";
+          }
+        </script>
+        <body bgcolor="white" onload="asd();">
+          <font size="+1" class="FrameHeadingFont">
+          <b>All Tags / Functions</b></font>
+          <br/>
+          <table border="0" width="100%">
+            <tr>
+              <td nowrap="true"><font class="FrameItemFont">
+                <xsl:apply-templates 
+                    select="javaee:tlds/javaee:taglib/javaee:tag|javaee:tlds/javaee:taglib/javaee:tag-file|javaee:tlds/javaee:taglib/javaee:function">
+                  <xsl:sort select="../javaee:short-name"/>
+                  <xsl:sort select="javaee:name"/>
+                </xsl:apply-templates>
+              </font></td>
+            </tr>
+          </table>
+        </body>
+      </html>    
+    </xsl:template>
+    
+    <xsl:template match="javaee:tag|javaee:tag-file">
+      <xsl:element name="a">
+        <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.html</xsl:attribute>
+        <xsl:attribute name="target"></xsl:attribute>
+        <xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>
+      </xsl:element>
+      <br/>
+    </xsl:template>
+    
+    <!-- 
+      - Same as above, but add the () to indicate it's a function 
+      - and change the HTML to .fn.html
+      -->
+    <xsl:template match="javaee:function">
+      <xsl:element name="a">
+        <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute>
+        <xsl:attribute name="target">tagFrame</xsl:attribute>
+        <i><xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>()</i>
+      </xsl:element>
+      <br/>
+    </xsl:template>
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/function.html.xsl b/web.core.syntax/tlddoc/xslt/function.html.xsl
new file mode 100644
index 0000000000..c476f13b7a
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/function.html.xsl
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : function.html.xsl
+    Created on : Februrary 25, 2003, 7:39 PM
+    Author     : mroth
+    Description:
+        Creates the function detail page (right frame), listing the known
+        information for a given function in a tag library.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+    
+    <xsl:param name="tlddoc-shortName">default</xsl:param>
+    <xsl:param name="tlddoc-functionName">default</xsl:param>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <xsl:apply-templates select="javaee:tlds/javaee:taglib"/>
+    </xsl:template>
+    
+    <xsl:template match="javaee:taglib">
+      <xsl:if test="javaee:short-name=$tlddoc-shortName">
+        <xsl:apply-templates select="javaee:function"/>
+      </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="javaee:function">
+      <xsl:if test="javaee:name=$tlddoc-functionName">
+        <xsl:variable name="tldname">
+          <xsl:choose>
+            <xsl:when test="../javaee:display-name!=''">
+              <xsl:value-of select="../javaee:display-name"/>
+            </xsl:when>
+            <xsl:when test="../javaee:short-name!=''">
+              <xsl:value-of select="../javaee:short-name"/>
+            </xsl:when>
+            <xsl:otherwise>
+              Unnamed TLD
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="title">
+          <xsl:value-of select="javaee:name"/>
+          (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>)
+        </xsl:variable>
+        <html>
+          <head>
+            <title><xsl:value-of select="$title"/></title>
+            <meta name="keywords" content="$title"/>
+            <link rel="stylesheet" type="text/css" href="../stylesheet.css" 
+                  title="Style"/>
+          </head>
+          <script>
+            function asd()
+            {
+            parent.document.title="<xsl:value-of select="normalize-space($title)"/>";
+            }
+          </script>
+          <body bgcolor="white" onload="asd();">
+            <!-- =========== START OF NAVBAR =========== -->
+            <a name="navbar_top"><!-- --></a>
+            <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_top_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a>&#160;</td>
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &#160;<font CLASS="NavBarFont1Rev">&#160;Tag&#160;</font>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                <!--&#160;PREV TAGLIB&#160;-->
+                <!--&#160;NEXT TAGLIB&#160;-->
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<xsl:element name="a">
+                  <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute>
+                  <xsl:attribute name="target">_top</xsl:attribute>
+                  <b>NO FRAMES</b>
+                </xsl:element>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+            </table>
+            <!-- =========== END OF NAVBAR =========== -->
+            
+            <hr/>
+            <h2><font size="-1"><xsl:value-of select="$tldname"/></font><br/>
+            Function <xsl:value-of select="javaee:name"/></h2>
+            <code>
+              <xsl:value-of select='substring-before(normalize-space(javaee:function-signature)," ")'/>
+              <b>&#160;<xsl:value-of select="javaee:name"/></b>(<xsl:value-of 
+              select='substring-after(normalize-space(javaee:function-signature),"(")'/>
+            </code>
+            <hr/>
+            <xsl:value-of select="javaee:description" disable-output-escaping="yes"/><br/>
+            <p/>
+            <xsl:if test="javaee:example!=''">
+              <b>Example:</b><br/>
+              <pre>
+<xsl:value-of select="javaee:example"/>              
+              </pre>
+              <p/>
+            </xsl:if>
+            <hr/>
+            
+            <!-- Function Information -->
+            <table border="1" cellpadding="3" cellspacing="0" width="100%">
+              <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                <td colspan="2">
+                  <font size="+2">
+                    <b>Function Information</b>
+                  </font>
+                </td>
+              </tr>
+              <tr>
+                <td>Function Class</td>
+                <td>
+                  <xsl:choose>
+                    <xsl:when test="javaee:function-class!=''">
+                      <xsl:value-of select="javaee:function-class"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <i>None</i>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </td>
+              </tr>
+              <tr>
+                <td>Function Signature</td>
+                <td>
+                  <xsl:choose>
+                    <xsl:when test="javaee:function-signature!=''">
+                      <xsl:value-of select="javaee:function-signature"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <i>None</i>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </td>
+              </tr>
+              <tr>
+                <td>Display Name</td>
+                <td>
+                  <xsl:choose>
+                    <xsl:when test="javaee:display-name!=''">
+                      <xsl:value-of select="javaee:display-name"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <i>None</i>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </td>
+              </tr>
+            </table>
+            <br/>
+            <p/>
+            
+            <!-- =========== START OF NAVBAR =========== -->
+            <a name="navbar_bottom"><!-- --></a>
+            <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_bottom_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a>&#160;</td>
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &#160;<font CLASS="NavBarFont1Rev">&#160;Tag&#160;</font>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                <!--&#160;PREV TAGLIB&#160;-->
+                <!--&#160;NEXT TAGLIB&#160;-->
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<xsl:element name="a">
+                  <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute>
+                  <xsl:attribute name="target">_top</xsl:attribute>
+                  <b>NO FRAMES</b>
+                </xsl:element>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+            </table>
+            <!-- =========== END OF NAVBAR =========== -->
+            <hr/>            
+            <small><i>
+            Output Generated by 
+            <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>.
+            Java, JSP, and JavaServer Pages are trademarks or 
+            registered trademarks of Sun Microsystems, Inc. in the US and other
+            countries.  Copyright 2002-4 Sun Microsystems, Inc.
+            4150 Network Circle
+            Santa Clara, CA 95054, U.S.A.
+            All Rights Reserved. 
+            </i></small>
+          </body>
+        </html>
+      </xsl:if>
+    </xsl:template>
+
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/help-doc.html.xsl b/web.core.syntax/tlddoc/xslt/help-doc.html.xsl
new file mode 100644
index 0000000000..d6f6f2f4fb
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/help-doc.html.xsl
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : help-doc.html.xsl
+    Created on : October 2, 2002, 5:37 PM
+    Author     : mroth
+    Description:
+        Creates the help-doc page for Tag Library Documentation Generator
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <HTML>
+        <HEAD>
+          <TITLE>
+            API Help (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>)
+          </TITLE>
+          <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"/>
+        </HEAD>
+        <SCRIPT>
+          function asd() {
+            parent.document.title="API Help (<xsl:value-of select="normalize-space(/javaee:tlds/javaee:config/javaee:window-title)"/>)";
+          }
+        </SCRIPT>
+        <BODY BGCOLOR="white" onload="asd();">
+          <a name="navbar_top"><!-- --></a>
+          <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_top_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> &#160;<a href="overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Library&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Tag&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1Rev">    &#160;<font CLASS="NavBarFont1Rev"><b>Help</b></font>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;PREV&#160;
+                &#160;NEXT&#160;
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<a HREF="help-doc.html" TARGET="_top"><b>NO FRAMES</b></a>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+          </table>
+          <HR/>
+          <CENTER>
+            <H1>How This Tag Library Document Is Organized</H1>
+          </CENTER>
+          This TLD (Tag Library Descriptor) document has pages corresponding 
+          to the items in the navigation bar, described as follows.
+          <H3>Overview</H3>
+          <BLOCKQUOTE>
+            <P/>
+            The <A HREF="overview-summary.html">Overview</A> page is the front 
+            page of this TLD document and provides a list of all tag libraries
+            with a summary for each.
+          </BLOCKQUOTE>
+          <H3>Library</H3>
+          <BLOCKQUOTE>
+            <P/>
+            Each tag library has a page that contains a list of its 
+            validator, listeners, tags, and functions, with a summary for each.
+            This page can contain four categories:
+            <UL>
+              <li>Validator</li>
+              <li>Listeners</li>
+              <li>Tags</li>
+              <li>Functions</li>
+            </UL>
+          </BLOCKQUOTE>
+          <H3>Validator</H3>
+          <BLOCKQUOTE>
+            <P/>
+            A tag library can have at most one validator.  If a tag library
+            has a validator, it has its own page describing the validator,
+            the class that implements the validator, and the available
+            initialization parameters.
+          </BLOCKQUOTE>
+          <h3>Listeners</h3>
+          <blockquote>
+            <p/>
+            A tag library can have zero or more listeners.  If a tag library
+            has at least one listener, a page is generated that lists all
+            listener classes registered for the tag library.
+          </blockquote>
+          <h3>Tags</h3>
+          <blockquote>
+            <p/>
+            A tag library can have zero or more tags.  Each tag has its own
+            page that describes the tag, its display name, its unique action
+            name, the class that implements the tag, the TagExtraInfo class,
+            the body content type, scripting variable information, attributes,
+            whether the tag supports dynamic attributes, and an optional 
+            example use of the tag.
+          </blockquote>
+          <h3>Functions</h3>
+          <blockquote>
+            <p/>
+            A tag library can contain zero or more EL functions.  If a tag
+            library has at least one function, a page is generated that lists
+            all functions, the class that implements the function, the
+            function signature, and an optional example use of the function.
+          </blockquote>
+          <!--
+          <H3>Index</H3>
+          <BLOCKQUOTE>
+            The <A HREF="index-files/index-1.html">Index</A> contains an 
+            alphabetic list of all validators, listeners, tags, functions, 
+            variables, and attributes.
+          </BLOCKQUOTE>
+          -->
+          <H3>Prev/Next</H3>
+          <blockquote>
+            These links take you to the next or previous validator, listener, 
+            tag, function, or related page.
+          </blockquote>
+          <H3>Frames/No Frames</H3>
+          <blockquote>
+            These links show and hide the HTML frames.  All pages are available 
+            with or without frames.
+          </blockquote>
+          <BR/>
+          <HR/>
+          <a name="navbar_bottom"><!-- --></a>
+          <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_bottom_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> &#160;<a href="overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Library&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Tag&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1Rev">    &#160;<font CLASS="NavBarFont1Rev"><b>Help</b></font>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;PREV&#160;
+                &#160;NEXT&#160;
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<a HREF="help-doc.html" TARGET="_top"><b>NO FRAMES</b></a>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+          </table>
+          <HR/>
+          <small><i>
+          Output Generated by 
+          <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>.
+          Java, JSP, and JavaServer Pages are trademarks or 
+          registered trademarks of Sun Microsystems, Inc. in the US and other
+          countries.  Copyright 2002-4 Sun Microsystems, Inc.
+          4150 Network Circle
+          Santa Clara, CA 95054, U.S.A.
+          All Rights Reserved. 
+          </i></small>
+        </BODY>
+      </HTML>
+    </xsl:template>
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/index.html.xsl b/web.core.syntax/tlddoc/xslt/index.html.xsl
new file mode 100644
index 0000000000..c2ed6956f5
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/index.html.xsl
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : index.html.xsl
+    Created on : October 1, 2002, 5:37 PM
+    Author     : mroth
+    Description:
+        Creates the index page for Tag Library Documentation Generator
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <html>
+        <head>
+          <title>
+            <xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>
+          </title>
+        </head>
+        <frameset cols="20%,80%">
+          <frameset rows="30%,70%">
+            <frame src="overview-frame.html" name="tldListFrame"/>
+            <frame src="alltags-frame.html" name="tldFrame"/>
+          </frameset>
+          <frame src="overview-summary.html" name="tagFrame"/>
+        </frameset>
+        <noframes>
+          <h2>Frame Alert</h2>
+          <p/>
+          This document is designed to be viewed using the frames feature.  
+          If you see this message, you are using a non-frame-capable web 
+          client.
+          <br/>
+          Link to <a href="overview-summary.html">Non-frame version.</a>
+        </noframes>
+      </html>
+    </xsl:template>
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/overview-frame.html.xsl b/web.core.syntax/tlddoc/xslt/overview-frame.html.xsl
new file mode 100644
index 0000000000..37e5a16aa0
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/overview-frame.html.xsl
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : overview-frame.html.xsl
+    Created on : October 1, 2002, 5:37 PM
+    Author     : mroth
+    Description:
+        Creates the overview frame (upper left corner), listing all tag 
+        libraries included in this generation.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee">
+    
+    <xsl:output method="html" indent="yes"/>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <html>
+        <head>
+          <title>
+            Overview (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>)
+          </title>
+          <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/>
+        </head>
+        <script>
+          function asd() {
+            parent.document.title="Overview (<xsl:value-of select="normalize-space(/javaee:tlds/javaee:config/javaee:window-title)"/>)";
+          }
+        </script>
+        <body bgcolor="white" onload="asd();">
+          <table border="0" width="100%">
+            <tr>
+              <td nowrap="true">
+                <font size="+1" class="FrameTitleFont">
+                  <b><xsl:value-of select="/javaee:tlds/javaee:config/javaee:doc-title"/></b>
+                </font>
+              </td>
+            </tr>
+          </table>
+          <table border="0" width="100%">
+            <tr>
+              <td nowrap="true">
+                <font class="FrameItemFont">
+                  <a href="alltags-frame.html" target="tldFrame"><xsl:text>All Tags / Functions</xsl:text></a>
+                </font>
+                <p/>
+                <font size="+1" class="FrameHeadingFont">
+                  Tag Libraries
+                </font>
+                <br/>
+                <xsl:apply-templates select="javaee:tlds/javaee:taglib"/>
+              </td>
+            </tr>
+          </table>
+          <p/>
+        </body>
+      </html>
+    </xsl:template>
+    
+    <xsl:template match="javaee:taglib">
+      <font class="FrameItemFont">
+        <xsl:element name="a">
+          <xsl:attribute name="href"><xsl:value-of select="javaee:short-name"/>/tld-frame.html</xsl:attribute>
+          <xsl:attribute name="target">tldFrame</xsl:attribute>
+          <xsl:choose>
+            <xsl:when test="javaee:display-name!=''">
+              <xsl:value-of select="javaee:display-name"/>
+            </xsl:when>
+            <xsl:when test="javaee:short-name!=''">
+              <xsl:value-of select="javaee:short-name"/>
+            </xsl:when>
+            <xsl:otherwise>
+              Unnamed TLD
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:element>
+      </font>
+      <br/>
+    </xsl:template>
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/overview-summary.html.xsl b/web.core.syntax/tlddoc/xslt/overview-summary.html.xsl
new file mode 100644
index 0000000000..7edf7bdef8
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/overview-summary.html.xsl
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : overview-summary.html.xsl
+    Created on : October 1, 2002, 5:37 PM
+    Author     : mroth
+    Description:
+        Creates an overview summary (right frame), listing all tag 
+        libraries included in this generation.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <html>
+        <head>
+          <title>
+            Overview (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>)
+          </title>
+          <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/>
+        </head>
+        <script>
+          function asd() {
+            parent.document.title="Overview (<xsl:value-of select="normalize-space(/javaee:tlds/javaee:config/javaee:window-title)"/>)";
+          }
+        </script>
+        <body bgcolor="white" onload="asd();">
+          <!-- =========== START OF NAVBAR =========== -->
+          <a name="navbar_top"><!-- --></a>
+          <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_top_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <font CLASS="NavBarFont1Rev"><b>&#160;Overview&#160;</b></font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Library&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Tag&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                <!--&#160;PREV&#160;-->
+                <!--&#160;NEXT&#160;-->
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<a HREF="overview-summary.html" TARGET="_top"><b>NO FRAMES</b></a>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+          </table>
+          <!-- =========== END OF NAVBAR =========== -->
+          <hr/>
+          <center>
+            <h2><xsl:value-of select="/javaee:tlds/javaee:config/javaee:doc-title"/></h2>
+          </center>
+          <table BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
+            <tr BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+              <td COLSPAN="2"><font SIZE="+2">
+                <b>Tag Libraries</b>
+              </font></td>
+            </tr>
+            <xsl:apply-templates select="/javaee:tlds/javaee:taglib"/>
+          </table>
+          <p/>
+          <hr/>
+          <!-- =========== START OF NAVBAR =========== -->
+          <a name="navbar_bottom"><!-- --></a>
+          <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_bottom_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <font CLASS="NavBarFont1Rev"><b>&#160;Overview&#160;</b></font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Library&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Tag&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                <!--&#160;PREV&#160;-->
+                <!--&#160;NEXT&#160;-->
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<a HREF="overview-summary.html" TARGET="_top"><b>NO FRAMES</b></a>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+          </table>
+          <!-- =========== END OF NAVBAR =========== -->
+          <hr/>
+          <small><i>
+          Output Generated by 
+          <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>.
+          Java, JSP, and JavaServer Pages are trademarks or 
+          registered trademarks of Sun Microsystems, Inc. in the US and other
+          countries.  Copyright 2002-4 Sun Microsystems, Inc.
+          4150 Network Circle
+          Santa Clara, CA 95054, U.S.A.
+          All Rights Reserved. 
+          </i></small>
+        </body>
+      </html>
+    </xsl:template>
+    
+    <xsl:template match="javaee:taglib">
+      <tr BGCOLOR="white" valign="top" CLASS="TableRowColor">
+        <td WIDTH="20%"><b>
+          <xsl:element name="a">
+            <xsl:attribute name="href"><xsl:value-of select="javaee:short-name"/>/tld-summary.html</xsl:attribute>
+            <xsl:choose>
+              <xsl:when test="javaee:display-name!=''">
+                <xsl:value-of select="javaee:display-name"/>
+              </xsl:when>
+              <xsl:when test="javaee:short-name!=''">
+                <xsl:value-of select="javaee:short-name"/>
+              </xsl:when>
+              <xsl:otherwise>
+                Unnamed TLD
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:element>
+        </b></td>
+        <td>
+          <xsl:choose>
+              <xsl:when test="javaee:description!=''">
+                <pre>
+                  <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+                </pre>
+              </xsl:when>
+              <xsl:otherwise>
+                <i>No Description</i>
+              </xsl:otherwise>
+          </xsl:choose>
+        </td>
+      </tr>
+    </xsl:template>
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/stylesheet.css b/web.core.syntax/tlddoc/xslt/stylesheet.css
index aa5001a0cb..1f674b816e 100644
--- a/web.core.syntax/tlddoc/xslt/stylesheet.css
+++ b/web.core.syntax/tlddoc/xslt/stylesheet.css
@@ -1,5 +1,3 @@
-/* Javadoc style sheet */
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/web.core.syntax/tlddoc/xslt/tag.html.xsl b/web.core.syntax/tlddoc/xslt/tag.html.xsl
new file mode 100644
index 0000000000..bd279ab41b
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/tag.html.xsl
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : tag.html.xsl
+    Created on : December 18, 2002, 5:22 PM
+    Author     : mroth
+    Description:
+        Creates the tag detail page (right frame), listing the known
+        information for a given tag in a tag library.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+    
+    <xsl:param name="tlddoc-shortName">default</xsl:param>
+    <xsl:param name="tlddoc-tagName">default</xsl:param>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+        <xsl:apply-templates select="javaee:tlds/javaee:taglib"/>
+    </xsl:template>
+    
+    <xsl:template match="javaee:taglib">
+        <xsl:if test="javaee:short-name=$tlddoc-shortName">
+            <xsl:apply-templates select="javaee:tag|javaee:tag-file"/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="javaee:tag|javaee:tag-file">
+        <xsl:if test="javaee:name=$tlddoc-tagName">
+            <xsl:variable name="tldname">
+                <xsl:choose>
+                    <xsl:when test="../javaee:display-name!=''">
+                        <xsl:value-of select="../javaee:display-name"/>
+                    </xsl:when>
+                    <xsl:when test="../javaee:short-name!=''">
+                        <xsl:value-of select="../javaee:short-name"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        Unnamed TLD
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            <xsl:variable name="title">
+                <xsl:value-of select="javaee:name"/>
+                (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>)
+            </xsl:variable>
+            <html>
+                <head>
+                    <title><xsl:value-of select="$title"/></title>
+                    <meta name="keywords" content="$title"/>
+                    <link rel="stylesheet" type="text/css" href="../stylesheet.css" 
+                    title="Style"/>
+                </head>
+                <script>
+                    function asd()
+                    {
+                    parent.document.title="<xsl:value-of select="normalize-space($title)"/>";
+                    }
+                </script>
+                <body bgcolor="white" onload="asd();">
+                    <!-- =========== START OF NAVBAR =========== -->
+                    <a name="navbar_top"><!-- --></a>
+                    <table border="0" width="100%" cellpadding="1" cellspacing="0">
+                        <tr>
+                            <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                                <a NAME="navbar_top_firstrow"><!-- --></a>
+                                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                                    <tr ALIGN="center" VALIGN="top">
+                                        <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                                        <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a>&#160;</td>
+                                        <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &#160;<font CLASS="NavBarFont1Rev">&#160;Tag&#160;</font>&#160;</td>
+                                        <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                                    </tr>
+                                </table>
+                            </td>
+                            <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                            </em>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                                <!--&#160;PREV TAGLIB&#160;-->
+                                <!--&#160;NEXT TAGLIB&#160;-->
+                            </font></td>
+                            <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                                &#160;<a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                                &#160;<xsl:element name="a">
+                                    <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute>
+                                    <xsl:attribute name="target">_top</xsl:attribute>
+                                    <b>NO FRAMES</b>
+                                </xsl:element>&#160;
+                                <script>
+                                    <!--
+                                    if(window==top) {
+                                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                                    }
+                                    //-->
+                                </script>
+                                <noscript>
+                                    <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                                </noscript>
+                            </font></td>
+                        </tr>
+                    </table>
+                    <!-- =========== END OF NAVBAR =========== -->
+            
+                    <hr/>
+                    <xsl:element name="a">
+                        <xsl:attribute name="href">#tag-start-<xsl:value-of select="javaee:name"/></xsl:attribute>
+                    </xsl:element>
+
+                    <h2><font size="-1"><xsl:value-of select="$tldname"/></font><br/>
+                    Tag <xsl:value-of select="javaee:name"/></h2>
+                    <hr/>
+                    <xsl:value-of select="javaee:description" disable-output-escaping="yes"/><br/>
+                    <p/>
+                    <xsl:if test="javaee:example!=''">
+                        <b>Example:</b><br/>
+                        <pre>
+                            <xsl:value-of select="javaee:example"/>              
+                        </pre>
+                        <p/>
+                    </xsl:if>
+                    <hr/>
+            
+                    <!-- Tag Information -->
+                    <table border="1" cellpadding="3" cellspacing="0" width="100%">
+                        <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                            <td colspan="2">
+                                <font size="+2">
+                                    <b>Tag Information</b>
+                                </font>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Tag Class</td>
+                            <td>
+                                <xsl:choose>
+                                    <xsl:when test="javaee:tag-class!=''">
+                                        <xsl:value-of select="javaee:tag-class"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <i>None</i>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>TagExtraInfo Class</td>
+                            <td>
+                                <xsl:choose>
+                                    <xsl:when test="javaee:tei-class!=''">
+                                        <xsl:value-of select="javaee:tei-class"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <i>None</i>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Body Content</td>
+                            <td>
+                                <xsl:choose>
+                                    <xsl:when test="javaee:body-content!=''">
+                                        <xsl:value-of select="javaee:body-content"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <i>None</i>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Display Name</td>
+                            <td>
+                                <xsl:choose>
+                                    <xsl:when test="javaee:display-name!=''">
+                                        <xsl:value-of select="javaee:display-name"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <i>None</i>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </td>
+                        </tr>
+                    </table>
+                    <br/>
+                    <p/>
+            
+                    <!-- Attribute Information -->
+                    <table border="1" cellpadding="3" cellspacing="0" width="100%">
+                        <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                            <td colspan="5">
+                                <font size="+2">
+                                    <b>Attributes</b>
+                                </font>
+                            </td>
+                        </tr>
+                        <xsl:choose>
+                            <xsl:when test="count(javaee:attribute)>0">
+                                <xsl:apply-templates select="javaee:attribute"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <td colspan="5"><i>No Attributes Defined.</i></td>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </table>
+                    <br/>
+                    <p/>
+
+                    <!-- Variable Information -->
+                    <table border="1" cellpadding="3" cellspacing="0" width="100%">
+                        <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                            <td colspan="5">
+                                <font size="+2">
+                                    <b>Variables</b>
+                                </font>
+                            </td>
+                        </tr>
+                        <xsl:choose>
+                            <xsl:when test="count(javaee:variable)>0">
+                                <tr>
+                                    <td><b>Name</b></td>
+                                    <td><b>Type</b></td>
+                                    <td><b>Declare</b></td>
+                                    <td><b>Scope</b></td>
+                                    <td><b>Description</b></td>
+                                </tr>
+                                <xsl:apply-templates select="javaee:variable"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <td colspan="2"><i>No Variables Defined.</i></td>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </table>
+                    <xsl:element name="a">
+                        <xsl:attribute name="href">#tag-end-<xsl:value-of select="javaee:name"/></xsl:attribute>
+                    </xsl:element>
+                    <br/>
+                    <p/>
+    
+                    <!-- =========== START OF NAVBAR =========== -->
+                    <a name="navbar_bottom"><!-- --></a>
+                    <table border="0" width="100%" cellpadding="1" cellspacing="0">
+                        <tr>
+                            <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                                <a NAME="navbar_bottom_firstrow"><!-- --></a>
+                                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                                    <tr ALIGN="center" VALIGN="top">
+                                        <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                                        <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a>&#160;</td>
+                                        <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &#160;<font CLASS="NavBarFont1Rev">&#160;Tag&#160;</font>&#160;</td>
+                                        <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                                    </tr>
+                                </table>
+                            </td>
+                            <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                            </em>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                                <!--&#160;PREV TAGLIB&#160;-->
+                                <!--&#160;NEXT TAGLIB&#160;-->
+                            </font></td>
+                            <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                                &#160;<a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                                &#160;<xsl:element name="a">
+                                    <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute>
+                                    <xsl:attribute name="target">_top</xsl:attribute>
+                                    <b>NO FRAMES</b>
+                                </xsl:element>&#160;
+                                <script>
+                                    <!--
+                                    if(window==top) {
+                                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                                    }
+                                    //-->
+                                </script>
+                                <noscript>
+                                    <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                                </noscript>
+                            </font></td>
+                        </tr>
+                    </table>
+                    <!-- =========== END OF NAVBAR =========== -->
+                    <hr/>            
+                    <small><i>
+                        Output Generated by 
+                        <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>.
+                        Java, JSP, and JavaServer Pages are trademarks or 
+                        registered trademarks of Sun Microsystems, Inc. in the US and other
+                        countries.  Copyright 2002-4 Sun Microsystems, Inc.
+                        4150 Network Circle
+                        Santa Clara, CA 95054, U.S.A.
+                        All Rights Reserved. 
+                    </i></small>
+                </body>
+            </html>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="javaee:attribute">
+        <xsl:element name="a">
+            <xsl:attribute name="href">#attribute-start-<xsl:value-of select="javaee:name"/></xsl:attribute>
+        </xsl:element>
+        <tr valign="top">
+            <td><b><xsl:apply-templates select="javaee:name"/></b></td>
+            <td>
+                <table border="0" cellpading="3" cellspacing="0" width="100%">
+                    <tr>
+                        <td>
+                            <xsl:choose>
+                                <xsl:when test="javaee:description!=''">
+                                    <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+                                </xsl:when>
+                                <xsl:otherwise><i>No Description</i></xsl:otherwise>
+                            </xsl:choose>
+                        </td>
+                    </tr>
+                    <tr><td>&#160;</td></tr>
+                    <tr>
+                        <td>Required:
+                            <xsl:choose>
+                                <xsl:when test="javaee:required!=''">
+                                    <xsl:value-of select="javaee:required"/>
+                                </xsl:when>
+                                <xsl:otherwise>false</xsl:otherwise>
+                            </xsl:choose>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Request-time:
+                            <xsl:choose>
+                                <xsl:when test="rtexprvalue!=''">
+                                    <xsl:value-of select="rtexprvalue"/>
+                                </xsl:when>
+                                <xsl:otherwise>false</xsl:otherwise>
+                            </xsl:choose>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Type:
+                            <xsl:choose>
+                                <xsl:when test="type!=''">
+                                    <code><xsl:value-of select="type"/></code>
+                                </xsl:when>
+                                <xsl:otherwise><code>java.lang.String</code></xsl:otherwise>
+                            </xsl:choose>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <!--      <tr valign="top">
+        <td><xsl:apply-templates select="javaee:name"/></td>
+        <td>
+        <xsl:choose>
+        <xsl:when test="javaee:required!=''">
+        <xsl:value-of select="javaee:required"/>
+        </xsl:when>
+        <xsl:otherwise>false</xsl:otherwise>
+        </xsl:choose>
+        </td>
+        <td>
+        <xsl:choose>
+        <xsl:when test="javaee:rtexprvalue!=''">
+        <xsl:value-of select="javaee:rtexprvalue"/>
+        </xsl:when>
+        <xsl:otherwise>false</xsl:otherwise>
+        </xsl:choose>
+        </td>        
+        <td>
+        <xsl:choose>
+        <xsl:when test="javaee:deferred-value">
+        <xsl:choose>
+        <xsl:when test="javaee:deferred-value/javaee:type">
+        <code>javax.el.ValueExpression</code>
+        <br/>(<i>must evaluate to </i><code><xsl:value-of
+        select="javaee:deferred-value/javaee:type"/></code>)
+        </xsl:when>
+        <xsl:otherwise>
+        <code>javax.el.ValueExpression</code>
+        <br/>(<i>must evaluate to </i><code>java.lang.Object</code>)
+        </xsl:otherwise>
+        </xsl:choose>                                
+        </xsl:when>
+        <xsl:when test="javaee:deferred-method">
+        <xsl:choose>
+        <xsl:when test="javaee:deferred-method/javaee:method-signature">
+        <code>javax.el.MethodExpression</code>
+        <br/>(<i>signature must match </i><code><xsl:value-of
+        select="javaee:deferred-method/javaee:method-signature"/></code>)
+        </xsl:when>
+        <xsl:otherwise>
+        <code>javax.el.MethodExpression</code>
+        <br/>(<i>signature must match </i><code>void methodname()</code>)
+        </xsl:otherwise>
+        </xsl:choose>
+        </xsl:when>
+        <xsl:when test="javaee:type!=''">
+        <code><xsl:value-of select="javaee:type"/></code>
+        </xsl:when>
+        <xsl:otherwise>
+        <code>java.lang.String</code>                
+        </xsl:otherwise>
+        </xsl:choose>
+        </td>
+        <td>
+        <xsl:choose>
+        <xsl:when test="javaee:description!=''">
+        <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+        </xsl:when>
+        <xsl:otherwise><i>No Description</i></xsl:otherwise>
+        </xsl:choose>
+        </td>
+        </tr>-->
+        <xsl:element name="a">
+            <xsl:attribute name="href">#attribute-end-<xsl:value-of select="javaee:name"/></xsl:attribute>
+        </xsl:element> 
+    </xsl:template>
+    
+    <xsl:template match="javaee:variable">
+        <tr>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="javaee:name-given!=''">
+                        <xsl:value-of select="javaee:name-given"/>
+                    </xsl:when>
+                    <xsl:when test="javaee:name-from-attribute!=''">
+                        <i>From attribute '<xsl:value-of select="javaee:name-from-attribute"/>'</i>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <i>Unknown</i>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="javaee:variable-class!=''">
+                        <code><xsl:value-of select="javaee:variable-class"/></code>
+                    </xsl:when>
+                    <xsl:otherwise><code>java.lang.String</code></xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="javaee:declare!=''">
+                        <xsl:value-of select="javaee:declare"/>
+                    </xsl:when>
+                    <xsl:otherwise>true</xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="javaee:scope!=''">
+                        <xsl:value-of select="javaee:scope"/>
+                    </xsl:when>
+                    <xsl:otherwise>NESTED</xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="javaee:description!=''">
+                        <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+                    </xsl:when>
+                    <xsl:otherwise><i>No Description</i></xsl:otherwise>
+                </xsl:choose>
+            </td>
+        </tr>
+    </xsl:template>
+    
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/tld-frame.html.xsl b/web.core.syntax/tlddoc/xslt/tld-frame.html.xsl
new file mode 100644
index 0000000000..2cb3c51a27
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/tld-frame.html.xsl
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : tld-frame.html.xsl
+    Created on : December 18, 2002, 11:40 AM
+    Author     : mroth
+    Description:
+        Creates the TLD frame (lower-left hand corner), listing the tags
+        and functions that are in this particular tag library.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+    
+    <xsl:param name="tlddoc-shortName">default</xsl:param>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <xsl:apply-templates select="javaee:tlds/javaee:taglib"/>
+    </xsl:template>
+    
+    <xsl:template match="javaee:taglib">
+      <xsl:if test="javaee:short-name=$tlddoc-shortName">
+        <xsl:variable name="tldname">
+          <xsl:choose>
+            <xsl:when test="javaee:display-name!=''">
+              <xsl:value-of select="javaee:display-name"/>
+            </xsl:when>
+            <xsl:when test="javaee:short-name!=''">
+              <xsl:value-of select="javaee:short-name"/>
+            </xsl:when>
+            <xsl:otherwise>
+              Unnamed TLD
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="tldfull">
+          <xsl:value-of select="$tldname"/>
+          <xsl:choose>
+            <xsl:when test="javaee:description!=''">
+              (<xsl:value-of select="javaee:description" disable-output-escaping="yes"/>)
+            </xsl:when>
+            <xsl:otherwise>
+              No Description
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <html>
+          <head>
+            <title>
+              <xsl:value-of select="$tldfull"/>
+            </title>
+            <meta name="keywords" content="$tldfull"/>
+            <link rel="stylesheet" type="text/css" href="../stylesheet.css" 
+                  title="Style"/>
+            <script>
+              function asd()
+              {
+              parent.document.title="<xsl:value-of select="normalize-space($tldfull)"/>";
+              }
+            </script>
+          </head>
+          <body bgcolor="white" onload="asd();">
+            <font size="+1" class="FrameTitleFont">
+              <a href="tld-summary.html" target="tagFrame">
+                <xsl:value-of select="$tldname"/>
+              </a>
+            </font>
+            <table border="0" width="100%">
+              <xsl:if test="(count(javaee:tag)+count(javaee:tag-file))>0">
+                <tr>
+                  <td nowrap="true">
+                    <font size="+1" class="FrameHeadingFont">
+                      Tags
+                    </font>&#160;
+                    <font class="FrameItemFont">
+                      <xsl:apply-templates select="javaee:tag|javaee:tag-file"/>
+                    </font>
+                  </td>
+                </tr>
+              </xsl:if>
+              <xsl:if test="count(javaee:function)>0">
+                <tr>
+                  <td nowrap="true">
+                    <font size="+1" class="FrameHeadingFont">
+                      Functions
+                    </font>&#160;
+                    <font class="FrameItemFont">
+                      <xsl:apply-templates select="javaee:function"/>
+                    </font>
+                  </td>
+                </tr>
+              </xsl:if>
+              <xsl:if test="count(javaee:validator)>0">
+                <tr>
+                  <td nowrap="true">
+                    <font size="+1" class="FrameHeadingFont">
+                      Validator
+                    </font>&#160;
+                    <font class="FrameItemFont">
+                      <xsl:apply-templates select="javaee:validator"/>
+                    </font>
+                  </td>
+                </tr>
+              </xsl:if>
+              <xsl:if test="count(javaee:listener)>0">
+                <tr>
+                  <td nowrap="true">
+                    <font size="+1" class="FrameHeadingFont">
+                      Listeners
+                    </font>&#160;
+                    <font class="FrameItemFont">
+                      <xsl:apply-templates select="javaee:listener"/>
+                    </font>
+                  </td>
+                </tr>
+              </xsl:if>
+            </table>
+            <!-- <table ... -->
+          </body>
+        </html>
+      </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="javaee:tag|javaee:tag-file">
+      <br/>
+      <xsl:element name="a">
+        <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute>
+        <xsl:attribute name="target">tagFrame</xsl:attribute>
+        <xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>
+      </xsl:element>
+    </xsl:template>
+    
+    <xsl:template match="javaee:function">
+      <br/>
+      <xsl:element name="a">
+        <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute>
+        <xsl:attribute name="target">tagFrame</xsl:attribute>
+        <i><xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>()</i>
+      </xsl:element>
+    </xsl:template>
+    
+    <xsl:template match="javaee:validator">
+      <br/>
+      <xsl:value-of select="javaee:validator-class"/>
+    </xsl:template>
+    
+    <xsl:template match="javaee:listener">
+      <br/>
+      <xsl:value-of select="javaee:listener-class"/>
+    </xsl:template>
+    
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/tld-summary.html.xsl b/web.core.syntax/tlddoc/xslt/tld-summary.html.xsl
new file mode 100644
index 0000000000..eb1e144f54
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/tld-summary.html.xsl
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+    Document   : tld-summary.html.xsl
+    Created on : December 18, 2002, 3:46 PM
+    Author     : mroth
+    Description:
+        Creates the TLD summary (right frame), listing the tags
+        and functions that are in this particular tag library and 
+        their descriptions.
+-->
+
+<xsl:stylesheet version="1.0"
+    xmlns:javaee="http://java.sun.com/xml/ns/javaee" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    
+    <xsl:output method="html" indent="yes"/>
+    
+    <xsl:param name="tlddoc-shortName">default</xsl:param>
+
+    <!-- template rule matching source root element -->
+    <xsl:template match="/">
+      <xsl:apply-templates select="javaee:tlds/javaee:taglib"/>
+    </xsl:template>
+    
+    <xsl:template match="javaee:taglib">
+      <xsl:if test="javaee:short-name=$tlddoc-shortName">
+        <xsl:variable name="tldname">
+          <xsl:choose>
+            <xsl:when test="javaee:display-name!=''">
+              <xsl:value-of select="javaee:display-name"/>
+            </xsl:when>
+            <xsl:when test="javaee:short-name!=''">
+              <xsl:value-of select="javaee:short-name"/>
+            </xsl:when>
+            <xsl:otherwise>
+              Unnamed TLD
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="title">
+          <xsl:value-of select="$tldname"/>
+          (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>)
+        </xsl:variable>
+        <html>
+          <head>
+            <title><xsl:value-of select="$title"/></title>
+            <link rel="stylesheet" type="text/css" href="../stylesheet.css" 
+                 title="styie"/>
+          </head>
+          <script>
+            function asd()
+            {
+            parent.document.title="<xsl:value-of select="normalize-space($title)"/>";
+            }
+          </script>
+          <body bgcolor="white" onload="asd();">
+            <!-- =========== START OF NAVBAR =========== -->
+            <a name="navbar_top"><!-- --></a>
+            <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_top_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">    &#160;<font CLASS="NavBarFont1Rev">&#160;Library&#160;</font>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Tag&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                <!--&#160;PREV TAGLIB&#160;-->
+                <!--&#160;NEXT TAGLIB&#160;-->
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<a HREF="tld-summary.html" TARGET="_top"><b>NO FRAMES</b></a>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+            </table>
+            <!-- =========== END OF NAVBAR =========== -->
+            
+            <hr/>
+            <h2><xsl:value-of select="$tldname"/></h2>
+            <hr/>
+            <xsl:if test="(javaee:uri!='') and (javaee:short-name!='')">
+              <b>Standard Syntax:</b><br/>
+              <code>
+                &#160;&#160;&#160;&#160;
+                <xsl:choose>
+                  <xsl:when test='starts-with(javaee:uri,"/WEB-INF/tags")'>
+                    &lt;%@ taglib prefix="<xsl:value-of select="javaee:short-name"/>" tagdir="<xsl:value-of select="javaee:uri"/>" %&gt;<br/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    &lt;%@ taglib prefix="<xsl:value-of select="javaee:short-name"/>" uri="<xsl:value-of select="javaee:uri"/>" %&gt;<br/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </code>
+              <br/>
+              <b>XML Syntax:</b><br/>
+              <code>
+                &#160;&#160;&#160;&#160;
+                <xsl:choose>
+                  <xsl:when test='starts-with(javaee:uri,"/WEB-INF/tags")'>
+                    &lt;anyxmlelement xmlns:<xsl:value-of select="javaee:short-name"/>="urn:jsptagdir:<xsl:value-of select="javaee:uri"/>" /&gt;<br/>
+                  </xsl:when>
+                  <xsl:when test='starts-with(javaee:uri,"/")'>
+                    &lt;anyxmlelement xmlns:<xsl:value-of select="javaee:short-name"/>="urn:jsptld:<xsl:value-of select="javaee:uri"/>" /&gt;<br/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    &lt;anyxmlelement xmlns:<xsl:value-of select="javaee:short-name"/>="<xsl:value-of select="javaee:uri"/>" /&gt;<br/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </code>
+              <hr/>
+            </xsl:if>
+            <xsl:choose>
+              <xsl:when test="javaee:description!=''">
+                <pre>
+                  <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+                </pre>
+              </xsl:when>
+              <xsl:otherwise>
+                No Description
+              </xsl:otherwise>
+            </xsl:choose>
+            <p/>
+            <table border="1" cellpadding="3" cellspacing="0" width="100%">
+              <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                <td colspan="2">
+                  <font size="+2"><b>Tag Library Information</b></font>
+                </td>
+              </tr>
+              <tr>
+                <td>Display Name</td>
+                <xsl:choose>
+                  <xsl:when test="javaee:display-name!=''">
+                    <td><xsl:value-of select="javaee:display-name"/></td>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <td><i>None</i></td>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </tr>
+              <tr>
+                <td>Version</td>
+                <xsl:choose>
+                  <xsl:when test="javaee:tlib-version!=''">
+                    <td><xsl:value-of select="javaee:tlib-version"/></td>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <td><i>None</i></td>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </tr>
+              <tr>
+                <td>Short Name</td>
+                <xsl:choose>
+                  <xsl:when test="javaee:short-name!=''">
+                    <td><xsl:value-of select="javaee:short-name"/></td>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <td><i>None</i></td>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </tr>
+              <tr>
+                <td>URI</td>
+                <xsl:choose>
+                  <xsl:when test="javaee:uri!=''">
+                    <td><xsl:value-of select="javaee:uri"/></td>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <td><i>None</i></td>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </tr>
+            </table>
+            &#160;
+            <p/>
+            <!-- tags and tag files -->
+            <xsl:if test="(count(javaee:tag)+count(javaee:tag-file)) > 0">
+              <table border="1" cellpadding="3" cellspacing="0" width="100%">
+                <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                  <td colspan="2">
+                    <font size="+2"><b>Tag Summary</b></font>
+                  </td>
+                </tr>
+                <xsl:apply-templates select="javaee:tag|javaee:tag-file"/>
+              </table>
+              &#160;
+              <p/>
+            </xsl:if>
+            <!-- functions -->
+            <xsl:if test="count(javaee:function) > 0">
+              <table border="1" cellpadding="3" cellspacing="0" width="100%">
+                <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                  <td colspan="3">
+                    <font size="+2"><b>Function Summary</b></font>
+                  </td>
+                </tr>
+                <xsl:apply-templates select="javaee:function"/>
+              </table>
+              &#160;
+              <p/>
+            </xsl:if>
+            <!-- validators -->
+            <xsl:if test="count(javaee:validator) > 0">
+              <table border="1" cellpadding="3" cellspacing="0" width="100%">
+                <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                  <td colspan="2">
+                    <font size="+2"><b>Tag Library Validator</b></font>
+                  </td>
+                </tr>
+                <xsl:apply-templates select="javaee:validator"/>
+              </table>
+              &#160;
+              <p/>
+            </xsl:if>
+            <!-- listeners -->
+            <xsl:if test="count(javaee:listener) > 0">
+              <table border="1" cellpadding="3" cellspacing="0" width="100%">
+                <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+                  <td>
+                    <font size="+2"><b>Listeners</b></font>
+                  </td>
+                </tr>
+                <xsl:apply-templates select="javaee:listener"/>
+              </table>
+              &#160;
+              <p/>
+            </xsl:if>
+            <!-- taglib-extensions -->
+
+            <!-- =========== START OF NAVBAR =========== -->
+            <a name="navbar_bottom"><!-- --></a>
+            <table border="0" width="100%" cellpadding="1" cellspacing="0">
+            <tr>
+              <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+                <a NAME="navbar_bottom_firstrow"><!-- --></a>
+                <table BORDER="0" CELLPADDING="0" CELLSPACING="3">
+                  <tr ALIGN="center" VALIGN="top">
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a>&#160;</td>
+                    <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">    &#160;<font CLASS="NavBarFont1Rev">&#160;Library&#160;</font>&#160;</td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <font CLASS="NavBarFont1">&#160;Tag&#160;</font></td>
+                    <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    &#160;<a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a>&#160;</td>
+                  </tr>
+                </table>
+              </td>
+              <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em>
+                </em>
+              </td>
+            </tr>
+            <tr>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                <!--&#160;PREV TAGLIB&#160;-->
+                <!--&#160;NEXT TAGLIB&#160;-->
+              </font></td>
+              <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2">
+                &#160;<a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>&#160;
+                &#160;<a HREF="tld-summary.html" TARGET="_top"><b>NO FRAMES</b></a>&#160;
+                <script>
+                  <!--
+                  if(window==top) {
+                    document.writeln('<A HREF="alltags-noframe.html" TARGET=""><B>All Tags</B></A>');
+                  }
+                  //-->
+                </script>
+                <noscript>
+                  <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a>
+                </noscript>
+              </font></td>
+            </tr>
+            </table>
+            <!-- =========== END OF NAVBAR =========== -->
+            <hr/>
+            <small><i>
+            Java, JSP, and JavaServer Pages are trademarks or registered 
+            trademarks of Sun Microsystems, Inc. in the US and other countries.
+            Copyright 2002-3 Sun Microsystems, Inc.
+            4150 Network Circle
+            Santa Clara, CA 95054, U.S.A.
+            All Rights Reserved. 
+            </i></small>
+          </body>
+        </html>
+      </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="javaee:tag|javaee:tag-file">
+      <tr bgcolor="white" class="TableRowColor">
+        <td width="15%">
+          <b>
+            <xsl:element name="a">
+              <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute>
+              <xsl:value-of select="javaee:name"/>
+            </xsl:element>
+          </b>
+        </td>
+        <td>
+          <xsl:choose>
+            <xsl:when test="javaee:description!=''">
+              <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <i>No Description</i>
+            </xsl:otherwise>
+          </xsl:choose>
+        </td>
+      </tr>
+    </xsl:template>
+
+    <xsl:template match="javaee:function">
+      <tr bgcolor="white" class="TableRowColor">
+        <td width="15%" nowrap="" align="right">
+          <code><xsl:value-of select='substring-before(normalize-space(javaee:function-signature)," ")'/></code>
+        </td>
+        <td width="15%" nowrap="">
+          <code><b>
+            <xsl:element name="a">
+              <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute>
+              <xsl:value-of select="javaee:name"/>
+            </xsl:element>
+            </b>( <xsl:value-of select='substring-after(normalize-space(javaee:function-signature),"(")'/>            
+          </code>
+        </td>
+        <td>
+          <xsl:choose>
+            <xsl:when test="javaee:description!=''">
+              <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <i>No Description</i>
+            </xsl:otherwise>
+          </xsl:choose>
+        </td>
+      </tr>
+    </xsl:template>
+        
+    <xsl:template match="javaee:validator">
+      <tr valign="top" bgcolor="white" class="TableRowColor">
+        <td width="15%">
+          <b><xsl:value-of select="javaee:validator-class"/></b>
+        </td>
+        <td>
+          <xsl:choose>
+            <xsl:when test="javaee:description!=''">
+              <xsl:value-of select="javaee:description" disable-output-escaping="yes"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <i>No Description</i>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:if test="count(javaee:init-param)>0">
+            <blockquote>
+              <b>Initialization Parameters:</b><br/>
+              <table border="1">
+                <tr>
+                  <td><b>Name</b></td>
+                  <td><b>Value</b></td>
+                  <td><b>Description</b></td>
+                </tr>
+                <xsl:apply-templates select="javaee:init-param"/>
+              </table>
+            </blockquote>
+          </xsl:if>
+        </td>
+      </tr>
+    </xsl:template>
+    
+    <xsl:template match="javaee:init-param">
+      <tr valign="top">
+        <td><xsl:value-of select="javaee:param-name"/></td>
+        <td><xsl:value-of select="javaee:param-value"/></td>
+        <td>
+          <xsl:choose>
+            <xsl:when test="javaee:param-description!=''">
+              <xsl:value-of select="javaee:param-description"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <i>No Description</i>
+            </xsl:otherwise>
+          </xsl:choose>
+        </td>
+      </tr>
+    </xsl:template>
+    
+    <xsl:template match="javaee:listener">
+      <tr valign="top" bgcolor="white" class="TableRowColor">
+        <td>
+          <b><xsl:value-of select="javaee:listener-class"/></b>
+        </td>
+      </tr>
+    </xsl:template>
+    
+</xsl:stylesheet> 
diff --git a/web.core.syntax/tlddoc/xslt/tld1_1-tld1_2.xsl b/web.core.syntax/tlddoc/xslt/tld1_1-tld1_2.xsl
new file mode 100644
index 0000000000..d82ff0d400
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/tld1_1-tld1_2.xsl
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+
+  Translates a JSP 1.1 TLD into a JSP 1.2 TLD, using the following 
+  conversion rules:
+
+  1. Change the document type definition for the TLD to:
+     <!DOCTYPE taglib
+         PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+	 "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+  2. Change the <tlibversion> element to <tlib-version>
+  3. Change the optional <jspversion> element to <jsp-version>.  If no
+     element exists, supply one that's set to 1.2
+  4. Change the <shortname> element to <short-name>
+  5. Preserve the original optional <uri> tag
+  6. Change the optional <info> tag to <description>
+  7. Preserve each tag/name
+  8. Change each tag/tagclass to tag/tag-class
+  9. Change each optional tag/teiclass to tag/tei-class
+  10. Change each optional tag/bodycontent to tag/body-content
+  11. Change each optional tag/info to tag/description
+  12. Preserve each tag/attribute element and its contents.
+
+  Side-effect: Strips the id attributes
+
+  Author: Mark Roth
+
+-->
+
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" indent="yes"
+      doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
+      doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"/>
+
+  <xsl:template match="/taglib">
+    <taglib>
+      <xsl:apply-templates select="tlibversion"/>
+      <jsp-version>1.2</jsp-version>
+      <xsl:apply-templates select="shortname"/>
+      <xsl:apply-templates select="uri"/>
+      <xsl:apply-templates select="info"/>
+      <xsl:apply-templates select="tag"/>
+    </taglib>
+  </xsl:template>
+
+  <!-- Rename to tlib-version -->
+  <xsl:template match="tlibversion">
+    <tlib-version><xsl:apply-templates/></tlib-version>
+  </xsl:template>
+
+  <!-- Rename to jsp-version -->
+  <xsl:template match="jspversion">
+    <jsp-version><xsl:apply-templates/></jsp-version>
+  </xsl:template>
+
+  <!-- Rename to short-name -->
+  <xsl:template match="shortname">
+    <short-name><xsl:apply-templates/></short-name>
+  </xsl:template>
+
+  <!-- Preserve uri -->
+  <xsl:template match="uri">
+    <uri><xsl:apply-templates/></uri>
+  </xsl:template>
+
+  <!-- Rename to description -->
+  <xsl:template match="info">
+    <description><xsl:apply-templates/></description>
+  </xsl:template>
+
+  <xsl:template match="tag">
+    <tag>
+      <xsl:apply-templates select="name"/>
+      <xsl:apply-templates select="tagclass"/>
+      <xsl:apply-templates select="teiclass"/>
+      <xsl:apply-templates select="bodycontent"/>
+      <xsl:apply-templates select="info"/>
+      <xsl:apply-templates select="attribute"/>
+    </tag>
+  </xsl:template>
+
+  <!-- Preserve name -->
+  <xsl:template match="name">
+    <name><xsl:apply-templates/></name>
+  </xsl:template>
+
+  <!-- Rename to tag-class -->
+  <xsl:template match="tagclass">
+    <tag-class><xsl:apply-templates/></tag-class>
+  </xsl:template>
+
+  <!-- Rename to tei-class -->
+  <xsl:template match="teiclass">
+    <tei-class><xsl:apply-templates/></tei-class>
+  </xsl:template>
+
+  <!-- Rename to body-content -->
+  <xsl:template match="bodycontent">
+    <body-content><xsl:apply-templates/></body-content>
+  </xsl:template>
+
+  <!-- Rename to description -->
+  <xsl:template match="info">
+    <description><xsl:apply-templates/></description>
+  </xsl:template>
+
+  <!-- Preserve attribute -->
+  <xsl:template match="attribute">
+    <attribute> 
+      <xsl:apply-templates/>
+    </attribute>
+  </xsl:template>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/web.core.syntax/tlddoc/xslt/tld1_2-tld2_0.xsl b/web.core.syntax/tlddoc/xslt/tld1_2-tld2_0.xsl
new file mode 100644
index 0000000000..42feb7f06d
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/tld1_2-tld2_0.xsl
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+
+  Translates a JSP 1.2 TLD into a JSP 2.0 TLD, using the following 
+  conversion rules:
+
+  1. Change the <taglib> element to read as follows:
+     <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+         http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
+  2. Remove all id attributes from all elements.
+  3. Remove <jsp-version> element and add an attribute to <taglib>
+     called 'version' with the value "2.0".
+  4. Under <taglib>, if a <description> element exists, move it to
+     the top.
+  5. Under <taglib>, if a <display-name> element exists, move it
+     to the top, after the <description> element.
+  6. Under <taglib>, if a <small-icon> and/or <large-icon> element
+     exists, wrap them in an <icon> element and move it to the
+     top, after the <display-name> element.
+  7. For each taglib/validator element, if a <description> element
+     exists, move it to the top, under <validator>.
+  8. For each taglib/validator/init-param element, if a
+     <description> element exists, move it to the top, under
+     <init-param>.
+  9. For each taglib/tag element, if a <description> element
+     exists, move it to the top, under <tag>.
+ 10. For each taglib/tag element, if a <display-name> element
+     exists, move it to the top, after the <description> element,
+     under <tag>.
+ 11. For each taglib/tag element, if a <small-icon> and/or
+     <large-icon> element exists, wrap them in an <icon> element
+     and move it to the top, after the <display-name> element,
+     under <tag>.
+ 12. For each taglib/tag element, if no <body-content> element 
+     exists, supply a default value of "JSP"
+ 13. For each taglib/tag/variable element, if a <description>
+     element exists, move it to the top, under <variable>.
+ 14. For each taglib/tag/attribute element, if a <description>
+     element exists, move it to the top, under <attribute>.
+
+  Author: Mark Roth
+
+-->
+
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" indent="yes"/>
+
+  <xsl:template match="/taglib">
+    <xsl:element name="taglib" namespace="http://java.sun.com/xml/ns/j2ee">
+      <xsl:attribute name="xsi:schemaLocation" namespace="http://www.w3.org/2001/XMLSchema-instance">http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</xsl:attribute>
+      <xsl:attribute name="version">2.0</xsl:attribute>
+      <xsl:apply-templates select="description"/>
+      <xsl:apply-templates select="display-name"/>
+      <xsl:if test="small-icon|large-icon">
+        <icon xmlns="http://java.sun.com/xml/ns/j2ee">
+	  <xsl:apply-templates select="small-icon"/>
+	  <xsl:apply-templates select="large-icon"/>
+        </icon>
+      </xsl:if>
+      <xsl:apply-templates select="tlib-version"/>
+      <xsl:apply-templates select="short-name"/>
+      <xsl:apply-templates select="uri"/>
+      <xsl:apply-templates select="validator"/>
+      <xsl:apply-templates select="listener"/>
+      <xsl:apply-templates select="tag"/>
+    </xsl:element>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="description">
+    <description xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </description>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="display-name">
+    <display-name xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </display-name>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="tlib-version">
+    <tlib-version xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </tlib-version>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="short-name">
+    <short-name xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </short-name>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="uri">
+    <uri xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </uri>
+  </xsl:template>
+
+  <xsl:template match="validator">
+    <validator xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates select="description"/>
+      <xsl:apply-templates select="validator-class"/>
+      <xsl:apply-templates select="init-param"/>
+    </validator>
+  </xsl:template>
+
+  <xsl:template match="init-param">
+    <init-param xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates select="description"/>
+      <xsl:apply-templates select="param-name"/>
+      <xsl:apply-templates select="param-value"/>
+    </init-param>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="param-name">
+    <param-name xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </param-name>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="param-value">
+    <param-value xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </param-value>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="listener">
+    <listener xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates select="listener-class"/>
+    </listener>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="listener-class">
+    <listener-class xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </listener-class>
+  </xsl:template>
+
+  <xsl:template match="tag">
+    <tag xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates select="description"/>
+      <xsl:apply-templates select="display-name"/>
+      <xsl:if test="small-icon|large-icon">
+        <icon xmlns="http://java.sun.com/xml/ns/j2ee">
+	  <xsl:apply-templates select="small-icon"/>
+	  <xsl:apply-templates select="large-icon"/>
+        </icon>
+      </xsl:if>
+      <xsl:apply-templates select="name"/>
+      <xsl:apply-templates select="tag-class"/>
+      <xsl:apply-templates select="tei-class"/>
+      <xsl:choose>
+	<xsl:when test="body-content">
+          <xsl:apply-templates select="body-content"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <!-- 
+	    - Explicitly Insert the default body-content since this is 
+	    - now a required element
+	    -->
+	  <body-content xmlns="http://java.sun.com/xml/ns/j2ee">JSP</body-content>
+	</xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="variable"/>
+      <xsl:apply-templates select="attribute"/>
+      <xsl:apply-templates select="example"/>
+    </tag>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="name">
+    <name xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </name>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="tag-class">
+    <tag-class xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </tag-class>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="tei-class">
+    <tei-class xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </tei-class>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="body-content">
+    <body-content xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </body-content>
+  </xsl:template>
+
+  <xsl:template match="variable">
+    <variable xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates select="description"/>
+      <xsl:apply-templates select="name-given"/>
+      <xsl:apply-templates select="name-from-attribute"/>
+      <xsl:apply-templates select="variable-class"/>
+      <xsl:apply-templates select="declare"/>
+      <xsl:apply-templates select="scope"/>
+    </variable>
+  </xsl:template>
+
+  <xsl:template match="attribute">
+    <attribute xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates select="description"/>
+      <xsl:apply-templates select="name"/>
+      <xsl:apply-templates select="required"/>
+      <xsl:apply-templates select="rtexprvalue"/>
+      <xsl:apply-templates select="type"/>
+    </attribute>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="required">
+    <required xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </required>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="rtexprvalue">
+    <rtexprvalue xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </rtexprvalue>
+  </xsl:template>
+
+  <!-- Strip the id attribute: -->
+  <xsl:template match="example">
+    <example xmlns="http://java.sun.com/xml/ns/j2ee">
+      <xsl:apply-templates/>
+    </example>
+  </xsl:template>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/web.core.syntax/tlddoc/xslt/tld2_0-tld2_1.xsl b/web.core.syntax/tlddoc/xslt/tld2_0-tld2_1.xsl
new file mode 100644
index 0000000000..dc9eef08e8
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/tld2_0-tld2_1.xsl
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+
+  Identity transformation (changing from the J2EE namespace
+  to the Java EE namespace), added for flexibility.  
+
+  1. Change the <taglib> element to read as follows:
+     <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+         http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">                    
+         
+  Author: Mark Roth
+
+-->
+
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+                xmlns:j2ee="http://java.sun.com/xml/ns/j2ee">
+  <xsl:output method="xml" indent="yes"/>
+
+  <xsl:template match="/j2ee:taglib">
+    <xsl:element name="taglib" namespace="http://java.sun.com/xml/ns/javaee">
+      <xsl:attribute name="xsi:schemaLocation" namespace="http://www.w3.org/2001/XMLSchema-instance">http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd</xsl:attribute>
+      <xsl:attribute name="version">2.1</xsl:attribute>
+      <xsl:apply-templates select="*"/>
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template match="j2ee:*">
+    <xsl:element name="{local-name()}" namespace="http://java.sun.com/xml/ns/javaee">
+        <xsl:copy-of select="@*"/>
+        <xsl:apply-templates/>
+    </xsl:element>
+  </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/web.core.syntax/tlddoc/xslt/tld2_1-tld2_1.xsl b/web.core.syntax/tlddoc/xslt/tld2_1-tld2_1.xsl
new file mode 100644
index 0000000000..ff10fa0bd4
--- /dev/null
+++ b/web.core.syntax/tlddoc/xslt/tld2_1-tld2_1.xsl
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+<!--
+  - <license>
+  - Copyright (c) 2010, Oracle.
+  - All rights reserved.
+  -
+  - Redistribution and use in source and binary forms, with or without
+  - modification, are permitted provided that the following conditions are met:
+  -
+  -     * Redistributions of source code must retain the above copyright
+  -       notice, this list of conditions and the following disclaimer.
+  -     * Redistributions in binary form must reproduce the above copyright
+  -       notice, this list of conditions and the following disclaimer in the
+  -       documentation and/or other materials provided with the distribution.
+  -     * Neither the name of Oracle nor the names of its
+  -       contributors may be used to endorse or promote products derived from
+  -       this software without specific prior written permission.
+  -
+  - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+  - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+  - ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  - </license>
+  -->
+
+<!--
+
+  Identity transformation, added for flexibility.  
+         
+  1. Remove any tag-extension, function-extension and taglib-extension
+     elements.
+         
+  Author: Mark Roth
+
+-->
+
+<xsl:stylesheet version="1.0"
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:javaee="http://java.sun.com/xml/ns/javaee">               
+  <xsl:output method="xml" indent="yes"/>  
+
+  <xsl:template match="/javaee:taglib">
+      <xsl:element name="taglib" namespace="http://java.sun.com/xml/ns/javaee">
+          <xsl:attribute name="xsi:schemaLocation"
+                         namespace="http://www.w3.org/2001/XMLSchema-instance">http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd</xsl:attribute>
+          <xsl:attribute name="version">2.1</xsl:attribute>
+          <xsl:apply-templates select="*"/>
+      </xsl:element>      
+  </xsl:template>
+  
+  <xsl:template match="javaee:tag-extension">
+  </xsl:template>
+  
+  <xsl:template match="javaee:function-extension">
+  </xsl:template>
+  
+  <xsl:template match="javaee:taglib-extension">
+  </xsl:template>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="text()">
+    <xsl:value-of select="normalize-space(.)" />
+  </xsl:template>
+  
+</xsl:stylesheet>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists