Attachment 228033 Details for Bug 399524 – SourceEditing Tools Patch r2 v1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] SourceEditing Tools Patch r2 v1

Bug.399524.SourceEditing.Patch.r2.v1.txt (text/plain), 34.14 KB, created by Konstantin Komissarchik

on 2013-03-06 18:01:14 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Komissarchik

Created: 2013-03-06 18:01:14 EST

Size: 34.14 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.jst.standard.schemas/about.html b/bundles/org.eclipse.jst.standard.schemas/about.html
>index b5013e3..5d90c0f 100644
>--- a/bundles/org.eclipse.jst.standard.schemas/about.html
>+++ b/bundles/org.eclipse.jst.standard.schemas/about.html
>@@ -6,7 +6,7 @@
> </head>
> 
> <body>
>-<p>January, 2010</p>
>+<p>March, 2013</p>
> <h3>License</h3>
> <p>The Eclipse Foundation makes available all content in this
> plug-in (&quot;Content&quot;). Unless otherwise indicated below, the
>@@ -29,75 +29,151 @@
> from the Eclipse Foundation, the following is provided for informational
> purposes only, and you should look to the Redistributor's license for
> terms and conditions of use.</p>
>-<h4>Appserv Commons schemas and DTDs v2_b33 (Subset)</h4>
>-<p>Your use of the Appserv Commons schemas and DTDs is subject to
>-the terms and conditions of the Common Development and Distribution
>-License v1.0. A copy of the license is contained in the file <a
>-	href="about_files/CDDLv1.0.txt">LICENSE.txt</a> and is also available
>-at <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>.
>-</p>
>-<p>The source for the schemas and DTDs is available on the Glassfish
>-community website at <a
>-	href="https://glassfish.dev.java.net/public/downloadsindex.html">https://glassfish.dev.java.net/</a>.
>-</p>
> 
>-<h4>Java Server Faces 1.2 Schema and DTDs (Subset)</h4>
>-<p>Your use of the Java Server Faces schemas and DTDs is subject to
>-the terms and conditions of the Common Development and Distribution
>-License v1.0. A copy of the license is contained in the file <a
>-	href="about_files/CDDLv1.0.txt">LICENSE.txt</a> and is also available
>-at <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>.
>-</p>
>-<p>The source for the schemas and DTDs is available on the Java
>-Server Faces project page on the Glassfish community website at <a
>-	href="https://javaserverfaces.dev.java.net">https://javaserverfaces.dev.java.net/</a>.
>-</p>
>+<p>Your use of the following DTDs and XML Schemas is subject to the terms and
>+conditions of the <a href="about_files/CDDLv1.0.txt">Common Development and Distribution License 1.0</a>,
>+which is also available at <a href="https://glassfish.java.net/public/CDDLv1.0.html">https://glassfish.java.net/public/CDDLv1.0.html</a>.</p>
> 
>-<h4>Java Persistence API XML Schemas</h4>
>-<p>Your use of the Java Persistence API XML Schemas (orm_1_0.xsd,
>-persistence_1_0.xsd) is subject to the terms and conditions of the
>-Common Development and Distribution License v1.0. A copy of the license
>-is contained in the file <a href="about_files/CDDLv1.0.txt">LICENSE.txt</a>
>-and is also available at <a
>-	href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>.
>-</p>
>-<p>The original source for the schemas is available on <a
>-	href="http://java.sun.com/xml/ns/persistence/">http://java.sun.com/xml/ns/persistence/</a>.
>-</p>
>+<p>Each listing is linked to its source.</p>
> 
>-<h4>Java EE 6 XML Schemas</h4>
>-<p>Your use of the Java EE 6 XML Schemas (application_6.xsd,
>-application-client-6.xsd, connector_1_6.xsd, ejb-jar_3_1.xsd,
>-javaee_6.xsd, javaee_web_services_1_3.xsd,
>-javaee_web_services_client_1_3.xsd, jsp_2_2.xsd, web-app_3_0.xsd,
>-web-common_3_0.xsd, web-fragment_3_0.xsd) is subject to the terms and
>-conditions of the Common Development and Distribution License v1.0. A
>-copy of the license is contained in the file <a
>-	href="about_files/CDDLv1.0.txt">LICENSE.txt</a> and is also available
>-at <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>.
>-</p>
>-<p>The original source for the schemas is available on <a
>-	href="http://java.sun.com/xml/ns/javaee/">http://java.sun.com/xml/ns/javaee/</a>.
>-</p>
>+<ul>
>+  <li><a href="http://java.sun.com/j2ee/dtds/application_1_2.dtd">application_1_2.dtd</a></li>
>+  <li><a href="http://java.sun.com/dtd/application_1_3.dtd">application_1_3.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/application_1_4.xsd">application_1_4.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/application_5.xsd">application_5.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/application_6.xsd">application_6.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd">application_7.xsd</a></li>
>+</ul>
> 
>-<h4>Java Server Faces 2.0 Schema</h4>
>-<p>Your use of the Java Server Faces 2.0 schemas is subject to the
>-terms and conditions of the Common Development and Distribution License
>-v1.0. A copy of the license is contained in the file <a
>-	href="about_files/CDDLv1.0.txt">LICENSE.txt</a> and is also available
>-at <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>.
>-</p>
>-<p>The source for the schema is available on the Java Server Faces
>-project page on the Glassfish community website at <a
>-	href="https://javaserverfaces.dev.java.net">https://javaserverfaces.dev.java.net/</a>.
>-</p>
>+<ul>
>+  <li><a href="http://java.sun.com/j2ee/dtds/application-client_1_2.dtd">application-client-1_2.dtd</a></li>
>+  <li><a href="http://java.sun.com/dtd/application-client_1_3.dtd">application-client-1_3.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/application-client_1_4.xsd">application-client_1_4.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/application-client_5.xsd">application-client_5.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/application-client_6.xsd">application-client_6.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd">application-client_7.xsd</a></li>
>+</ul>
> 
>-<h4>Contexts and Dependency Injection Beans Schema</h4>
>-<p>Your use of the Java Server Faces 2.0 schemas is subject to the
>-terms and conditions of the Apache License, Version 2.0.  A copy of the license is contained in the file <a
>-	href="about_files/LICENSE-2.0.txt">LICENSE-2.0.txt</a> and is also available 
>-at <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
>-</p>
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/jaxb/bindingschema_2_0.xsd">bindingschema_2_0.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://java.sun.com/dtd/connector_1_0.dtd">connector_1_0.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/connector_1_5.xsd">connector_1_5.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/connector_1_6.xsd">connector_1_6.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd">connector_1_7.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd">ejb-jar_1_1.dtd</a></li>
>+  <li><a href="http://java.sun.com/dtd/ejb-jar_2_0.dtd">ejb-jar_2_0.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/ejb-jar_2_1.xsd">ejb-jar_2_1.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_0.xsd">ejb-jar_3_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_1.xsd">ejb-jar_3_1.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">ejb-jar_3_2.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_1_4.xsd">j2ee_1_4.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_5.xsd">javaee_5.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_6.xsd">javaee_6.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_7.xsd">javaee_7.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd">j2ee_jaxrpc_mapping_1_1.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_web_services_1_1.xsd">j2ee_web_services_1_1.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_2.xsd">javaee_web_services_1_2.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_3.xsd">javaee_web_services_1_3.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd">javaee_web_services_1_4.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd">j2ee_web_services_client_1_1.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_2.xsd">javaee_web_services_client_1_2.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_3.xsd">javaee_web_services_client_1_3.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_4.xsd">javaee_web_services_client_1_4.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/jsp_2_0.xsd">jsp_2_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/jsp_2_1.xsd">jsp_2_1.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/jsp_2_2.xsd">jsp_2_2.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/jsp_2_3.xsd">jsp_2_3.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/persistence/orm_1_0.xsd">orm_1_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/persistence/orm_2_0.xsd">orm_2_0.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/persistence/persistence_1_0.xsd">persistence_1_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/persistence/persistence_2_0.xsd">persistence_2_0.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">web-app_2_2.dtd</a></li>    
>+  <li><a href="http://java.sun.com/dtd/web-app_2_3.dtd">web-app_2_3.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/web-app_2_4.xsd">web-app_2_4.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-app_2_5.xsd">web-app_2_5.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_0.xsd">web-app_3_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">web-app_3_1.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-common_3_0.xsd">web-common_3_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-common_3_1.xsd">web-common_3_1.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://java.sun.com/dtd/facelet-taglib_1_0.dtd">facelet-taglib_1_0.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_0.xsd">web-facelettaglibrary_2_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">web-facelettaglibrary_2_2.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://java.sun.com/dtd/web-facesconfig_1_0.dtd">web-facesconfig_1_0.dtd</a></li>
>+  <li><a href="http://java.sun.com/dtd/web-facesconfig_1_1.dtd">web-facesconfig_1_1.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_1_2.xsd">web-facesconfig_1_2.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_0.xsd">web-facesconfig_2_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">web-facesconfig_2_2.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-facesuicomponent_2_0.xsd">web-facesuicomponent_2_0.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_0.xsd">web-fragment_3_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd">web-fragment_3_1.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">web-jsptaglibrary_1_1.dtd</a></li>
>+  <li><a href="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">web-jsptaglibrary_1_2.dtd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">web-jsptaglibrary_2_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">web-jsptaglibrary_2_1.xsd</a></li>
>+</ul>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/web-partialresponse_2_0.xsd">web-partialresponse_2_0.xsd</a></li>
>+</ul>
>+
>+<p>Your use of the following XML Schemas is subject to the terms and
>+conditions of the <a href="about_files/LICENSE-2.0.txt">Apache License 2.0</a>,
>+which is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.</p>
>+
>+<p>Each listing is linked to its source.</p>
>+
>+<ul>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/beans_1_0.xsd">beans_1_0.xsd</a></li>
>+  <li><a href="http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd">beans_1_1.xsd</a></li>
>+</ul>
> 
> </body>
> </html>
>diff --git a/bundles/org.eclipse.jst.standard.schemas/plugin.xml b/bundles/org.eclipse.jst.standard.schemas/plugin.xml
>index bce15fc..4731409 100644
>--- a/bundles/org.eclipse.jst.standard.schemas/plugin.xml
>+++ b/bundles/org.eclipse.jst.standard.schemas/plugin.xml
>@@ -24,10 +24,19 @@
>                 name="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
>                 uri="dtdsAndSchemas/application_1_4.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/application_1_4.xsd"
>+                uri="dtdsAndSchemas/application_1_4.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/application_5.xsd"
>                 uri="dtdsAndSchemas/application_5.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/application_5.xsd"
>+                uri="dtdsAndSchemas/application_5.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/application_6.xsd"
>+                uri="dtdsAndSchemas/application_6.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/application_6.xsd"
>                 uri="dtdsAndSchemas/application_6.xsd" />
>             <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"
>@@ -46,14 +55,42 @@
>                 name="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
>                 uri="dtdsAndSchemas/application-client_1_4.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/application-client_1_4.xsd"
>+                uri="dtdsAndSchemas/application-client_1_4.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
>+                uri="dtdsAndSchemas/application-client_5.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/application-client_5.xsd"
>                 uri="dtdsAndSchemas/application-client_5.xsd" />
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/application-client_6.xsd"
>                 uri="dtdsAndSchemas/application-client_6.xsd" />
>             <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/application-client_6.xsd"
>+                uri="dtdsAndSchemas/application-client_6.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"
>                 uri="dtdsAndSchemas/application-client_7.xsd" />
>+
>+
>+           <uri
>+               name="http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"
>+               uri="dtdsAndSchemas/beans_1_0.xsd"/>
>+           <uri
>+               name="http://xmlns.jcp.org/xml/ns/javaee/beans_1_0.xsd"
>+               uri="dtdsAndSchemas/beans_1_0.xsd"/>
>+           <uri
>+               name="http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
>+               uri="dtdsAndSchemas/beans_1_1.xsd"/>
>+
>+
>+           <uri
>+               name="http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
>+               uri="dtdsAndSchemas/bindingschema_2_0.xsd"/>
>+           <uri
>+               name="http://xmlns.jcp.org/xml/ns/jaxb/bindingschema_2_0.xsd"
>+               uri="dtdsAndSchemas/bindingschema_2_0.xsd"/>
> 
> 
>             <public
>@@ -64,7 +101,13 @@
>                 name="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
>                 uri="dtdsAndSchemas/connector_1_5.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/connector_1_5.xsd"
>+                uri="dtdsAndSchemas/connector_1_5.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
>+                uri="dtdsAndSchemas/connector_1_6.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/connector_1_6.xsd"
>                 uri="dtdsAndSchemas/connector_1_6.xsd" />
>             <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd"
>@@ -83,10 +126,19 @@
>                 name="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
>                 uri="dtdsAndSchemas/ejb-jar_2_1.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/ejb-jar_2_1.xsd"
>+                uri="dtdsAndSchemas/ejb-jar_2_1.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
>                 uri="dtdsAndSchemas/ejb-jar_3_0.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_0.xsd"
>+                uri="dtdsAndSchemas/ejb-jar_3_0.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
>+                uri="dtdsAndSchemas/ejb-jar_3_1.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_1.xsd"
>                 uri="dtdsAndSchemas/ejb-jar_3_1.xsd" />
>             <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"
>@@ -99,36 +151,20 @@
>             <uri
>                 name="http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd"
>                 uri="dtdsAndSchemas/j2ee_1_4.xsd" />
>-
>             <uri
>-                name="http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd"
>-                uri="dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd" />
>-            <uri
>-                name="http://java.sun.com/xml/ns/j2ee/j2ee_web_services_1_1.xsd"
>-                uri="dtdsAndSchemas/j2ee_web_services_1_1.xsd" />
>-            <uri
>-                name="http://java.sun.com/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd"
>-                uri="dtdsAndSchemas/j2ee_web_services_client_1_1.xsd" />
>-
>-            <uri
>-                name="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
>-                uri="dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd" />
>-            <uri
>-                name="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
>-                uri="dtdsAndSchemas/j2ee_web_services_1_1.xsd" />
>-            <uri
>-                name="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
>-                uri="dtdsAndSchemas/j2ee_web_services_client_1_1.xsd" />
>-
>-
>-            <uri
>-                name="http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd"
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_1_4.xsd"
>                 uri="dtdsAndSchemas/j2ee_1_4.xsd" />
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/javaee_5.xsd"
>                 uri="dtdsAndSchemas/javaee_5.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/javaee_5.xsd"
>+                uri="dtdsAndSchemas/javaee_5.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/javaee_6.xsd"
>+                uri="dtdsAndSchemas/javaee_6.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/javaee_6.xsd"
>                 uri="dtdsAndSchemas/javaee_6.xsd" />
>             <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/javaee_7.xsd"
>@@ -136,72 +172,213 @@
> 
> 
>             <uri
>+                name="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd" />
>+            <uri
>+                name="http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd" />
>+                
>+                
>+            <uri
>+                name="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_web_services_1_1.xsd" />
>+            <uri
>+                name="http://java.sun.com/xml/ns/j2ee/j2ee_web_services_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_web_services_1_1.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_web_services_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_web_services_1_1.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
>+                uri="dtdsAndSchemas/javaee_web_services_1_2.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_2.xsd"
>                 uri="dtdsAndSchemas/javaee_web_services_1_2.xsd" />
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd"
>                 uri="dtdsAndSchemas/javaee_web_services_1_3.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_3.xsd"
>+                uri="dtdsAndSchemas/javaee_web_services_1_3.xsd" />
>+            <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd"
>                 uri="dtdsAndSchemas/javaee_web_services_1_4.xsd" />
>                 
>+
>+            <uri
>+                name="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_web_services_client_1_1.xsd" />
>+            <uri
>+                name="http://java.sun.com/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_web_services_client_1_1.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd"
>+                uri="dtdsAndSchemas/j2ee_web_services_client_1_1.xsd" />
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd"
>+                uri="dtdsAndSchemas/javaee_web_services_client_1_2.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_2.xsd"
>                 uri="dtdsAndSchemas/javaee_web_services_client_1_2.xsd" />
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_3.xsd"
>                 uri="dtdsAndSchemas/javaee_web_services_client_1_3.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_3.xsd"
>+                uri="dtdsAndSchemas/javaee_web_services_client_1_3.xsd" />
>+            <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_4.xsd"
>                 uri="dtdsAndSchemas/javaee_web_services_client_1_4.xsd" />
>+                
> 
>             <uri
>                 name="http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"
>                 uri="dtdsAndSchemas/jsp_2_0.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/jsp_2_0.xsd"
>+                uri="dtdsAndSchemas/jsp_2_0.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd"
>                 uri="dtdsAndSchemas/jsp_2_1.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/jsp_2_1.xsd"
>+                uri="dtdsAndSchemas/jsp_2_1.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/jsp_2_2.xsd"
>+                uri="dtdsAndSchemas/jsp_2_2.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/jsp_2_2.xsd"
>                 uri="dtdsAndSchemas/jsp_2_2.xsd" />
>             <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/jsp_2_3.xsd"
>                 uri="dtdsAndSchemas/jsp_2_3.xsd" />
> 
> 
>+            <uri
>+                name="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
>+                uri="dtdsAndSchemas/orm_1_0.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/persistence/orm_1_0.xsd"
>+                uri="dtdsAndSchemas/orm_1_0.xsd" />
>+            <uri
>+                name="http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
>+                uri="dtdsAndSchemas/orm_2_0.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/persistence/orm_2_0.xsd"
>+                uri="dtdsAndSchemas/orm_2_0.xsd" />
>+
>+
>+            <uri
>+                name="http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
>+                uri="dtdsAndSchemas/persistence_1_0.xsd" />   
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/persistence/persistence_1_0.xsd"
>+                uri="dtdsAndSchemas/persistence_1_0.xsd" />   
>+            <uri
>+                name="http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
>+                uri="dtdsAndSchemas/persistence_2_0.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/persistence/persistence_2_0.xsd"
>+                uri="dtdsAndSchemas/persistence_2_0.xsd" />
>+
>+
>             <public
>                 publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
>                 uri="dtdsAndSchemas/web-app_2_2.dtd"
>-                webURL="http://java.sun.com/j2ee/dtds/web-app_2.2.dtd" />
>+                webURL="http://java.sun.com/j2ee/dtds/web-app_2.2.dtd" />      
>             <public
>                 publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
>                 uri="dtdsAndSchemas/web-app_2_3.dtd"
>                 webURL="http://java.sun.com/dtd/web-app_2_3.dtd" />
>-
>-
>             <uri
>                 name="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
>                 uri="dtdsAndSchemas/web-app_2_4.xsd" />
>-
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/web-app_2_4.xsd"
>+                uri="dtdsAndSchemas/web-app_2_4.xsd" />
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
>+                uri="dtdsAndSchemas/web-app_2_5.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-app_2_5.xsd"
>                 uri="dtdsAndSchemas/web-app_2_5.xsd" />
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
>                 uri="dtdsAndSchemas/web-app_3_0.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_0.xsd"
>+                uri="dtdsAndSchemas/web-app_3_0.xsd" />
>+            <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
>                 uri="dtdsAndSchemas/web-app_3_1.xsd" />
>+
>                 
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd"
>                 uri="dtdsAndSchemas/web-common_3_0.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-common_3_0.xsd"
>+                uri="dtdsAndSchemas/web-common_3_0.xsd" />
>+            <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/web-common_3_1.xsd"
>                 uri="dtdsAndSchemas/web-common_3_1.xsd" />
>+
>+
>+            <public
>+                publicId="-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
>+                uri="dtdsAndSchemas/facelet-taglib_1_0.dtd"/>
>+            <uri
>+                name="http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
>+                uri="dtdsAndSchemas/web-facelettaglibrary_2_0.xsd"/>
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
>+                uri="dtdsAndSchemas/web-facelettaglibrary_2_0.xsd"/>
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
>+                uri="dtdsAndSchemas/web-facelettaglibrary_2_2.xsd"/>
>+                
>+                
>+            <public
>+                publicId="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
>+                uri="dtdsAndSchemas/web-facesconfig_1_0.dtd"
>+                webURL="http://java.sun.com/dtd/web-facesconfig_1_0.dtd" />
>+            <public
>+                publicId="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
>+                uri="dtdsAndSchemas/web-facesconfig_1_1.dtd"
>+                webURL="http://java.sun.com/dtd/web-facesconfig_1_1.dtd" />
>+            <uri
>+                name="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
>+                uri="dtdsAndSchemas/web-facesconfig_1_2.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_1_2.xsd"
>+                uri="dtdsAndSchemas/web-facesconfig_1_2.xsd" />
>+            <uri
>+                name="http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
>+                uri="dtdsAndSchemas/web-facesconfig_2_0.xsd"/>
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_0.xsd"
>+                uri="dtdsAndSchemas/web-facesconfig_2_0.xsd"/>
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
>+                uri="dtdsAndSchemas/web-facesconfig_2_2.xsd"/>
>+
>+
>+            <uri
>+                name="http://java.sun.com/xml/ns/javaee/web-facesuicomponent_2_0.xsd"
>+                uri="dtdsAndSchemas/web-facesuicomponent_2_0.xsd"/>
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-facesuicomponent_2_0.xsd"
>+                uri="dtdsAndSchemas/web-facesuicomponent_2_0.xsd"/>
>+
>                 
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
>+                uri="dtdsAndSchemas/web-fragment_3_0.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_0.xsd"
>                 uri="dtdsAndSchemas/web-fragment_3_0.xsd" />
>             <uri
>                 name="http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
>@@ -211,8 +388,7 @@
>             <public
>                 publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
>                 uri="dtdsAndSchemas/web-jsptaglibrary_1_1.dtd"
>-                webURL="http://java.sun.com/dtd/web-jsptaglibrary_1_1.dtd" />
>-
>+                webURL="http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd" />
>             <public
>                 publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
>                 uri="dtdsAndSchemas/web-jsptaglibrary_1_2.dtd"
>@@ -221,76 +397,24 @@
>                 name="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
>                 uri="dtdsAndSchemas/web-jsptaglibrary_2_0.xsd" />
>             <uri
>+                name="http://xmlns.jcp.org/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
>+                uri="dtdsAndSchemas/web-jsptaglibrary_2_0.xsd" />
>+            <uri
>                 name="http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
>                 uri="dtdsAndSchemas/web-jsptaglibrary_2_1.xsd" />
>+            <uri
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
>+                uri="dtdsAndSchemas/web-jsptaglibrary_2_1.xsd" />
> 
>-            <public
>-                publicId="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
>-                uri="dtdsAndSchemas/web-facesconfig_1_0.dtd"
>-                webURL="http://java.sun.com/dtd/web-facesconfig_1_0.dtd" />
> 
>-            <public
>-                publicId="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
>-                uri="dtdsAndSchemas/web-facesconfig_1_1.dtd"
>-                webURL="http://java.sun.com/dtd/web-facesconfig_1_1.dtd" />
>-
>-                
>-            <uri
>-                name="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
>-                uri="dtdsAndSchemas/web-facesconfig_1_2.xsd" />
>-                
>-            <uri
>-                name="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
>-                uri="dtdsAndSchemas/orm_1_0.xsd" />
>-   
>-            <uri
>-                name="http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
>-                uri="dtdsAndSchemas/persistence_1_0.xsd" />   
>-               
>-           <uri
>-               name="http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
>-               uri="dtdsAndSchemas/orm_2_0.xsd" />
>-       
>-           <uri
>-               name="http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
>-               uri="dtdsAndSchemas/persistence_2_0.xsd" />
>-       
>-           <uri
>-               name="http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
>-               uri="dtdsAndSchemas/bindingschema_2_0.xsd"/>
>-               
>-            <public
>-                publicId="-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
>-                uri="dtdsAndSchemas/facelet-taglib_1_0.dtd"/>
>-
>-            <uri
>-                name="http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
>-                uri="dtdsAndSchemas/web-facelettaglibrary_2_0.xsd"/>
>-            <uri
>-                name="http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
>-                uri="dtdsAndSchemas/web-facelettaglibrary_2_2.xsd"/>
>-                
>-            <uri
>-                name="http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
>-                uri="dtdsAndSchemas/web-facesconfig_2_0.xsd"/>
>-            <uri
>-                name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
>-                uri="dtdsAndSchemas/web-facesconfig_2_2.xsd"/>
>-                
>-            <uri
>-                name="http://java.sun.com/xml/ns/javaee/web-facesuicomponent_2_0.xsd"
>-                uri="dtdsAndSchemas/web-facesuicomponent_2_0.xsd"/>
>             <uri
>                 name="http://java.sun.com/xml/ns/javaee/web-partialresponse_2_0.xsd"
>                 uri="dtdsAndSchemas/web-partialresponse_2_0.xsd"/>
>-            
>             <uri
>-                  name="http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"
>-                  uri="dtdsAndSchemas/beans_1_0.xsd"/>
>-            <uri
>-                  name="http://xmlns.jcp.org/xml/ns/javaee/beans_1_0.xsd"
>-                  uri="dtdsAndSchemas/beans_1_1.xsd"/>
>-                          
>+                name="http://xmlns.jcp.org/xml/ns/javaee/web-partialresponse_2_0.xsd"
>+                uri="dtdsAndSchemas/web-partialresponse_2_0.xsd"/>
>+
>+
>         </catalogContribution>
> 
>     </extension>

Actions: View | Diff

Attachments on bug 399524: 226470 | 226472 | 226473 | 226474 | 226543 | 226544 | 227758 | 227759 | 227761 | 227762 | 227763 | 227764 | 227770 | 227772 | 228033 | 228379 | 228382 | 228456