Skip to content

Commit

Permalink
Fix tests errors
Browse files Browse the repository at this point in the history
Signed-off-by: hussainnm <hussain.nm@cognizant.com>
  • Loading branch information
hussainnm committed Apr 17, 2020
1 parent b4a268a commit 3f83473
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion jakartaee9/src/jakartaee_9.xsds
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="http://www.w3.org/2001/xml.xsd"/>

<xsd:include schemaLocation="jakartaee_web_services_client_1_4.xsd"/>
<xsd:include schemaLocation="jakartaee_web_services_client_2_0.xsd"/>

<!-- **************************************************** -->

Expand Down
6 changes: 3 additions & 3 deletions jakartaee9/test/connector-complete.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
connector_1_7.xsd"
version="1.7" metadata-complete="true">
connectors_2_0.xsd"
version="2.0" metadata-complete="true">
<module-name>SimpleResourceAdapter</module-name>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
Expand Down Expand Up @@ -127,5 +127,5 @@
<required-work-context>com.wombat.MyOtherCustomWorkContext</required-work-context>

</connector>
<?validateAgainst connector_1_7.xsd?>
<?validateAgainst connectors_2_0.xsd?>

6 changes: 3 additions & 3 deletions jakartaee9/test/connector-sparse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
connector_1_7.xsd"
version="1.7" metadata-complete="false">
connectors_2_0.xsd"
version="2.0" metadata-complete="false">
<!-- Assuming everything else is specified via annotations (the resourceadapter-class through @Connector
Connection Definitions through @ConnectionDefinition, message adapter configuration through @Activation
and Administered Objects through @AdministeredObject. A minimal connector deployment descriptor to
Expand Down Expand Up @@ -58,4 +58,4 @@ This should validate against the 1.6 DD -->
<required-work-context>com.wombat.MyOtherCustomWorkContext</required-work-context>
</connector>

<?validateAgainst connector_1_7.xsd?>
<?validateAgainst connectors_2_0.xsd?>
6 changes: 3 additions & 3 deletions jakartaee9/test/connector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
connector_1_7.xsd"
version="1.7" metadata-complete="true">
connectors_2_0.xsd"
version="2.0" metadata-complete="true">

<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
Expand Down Expand Up @@ -178,7 +178,7 @@
<required-work-context>com.wombat.MyOtherCustomWorkContext</required-work-context>
</connector>

<?validateAgainst connector_1_7.xsd?>
<?validateAgainst connectors_2_0.xsd?>
<?expectError 43:cvc-enumeration-valid?>
<?expectError 43:cvc-complex-type.2.2?>
<?expectError 67:cvc-enumeration-valid?>
Expand Down
6 changes: 3 additions & 3 deletions jakartaee9/test/permissions-empty.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xml="http://www.w3.org/XML/1998/namespace"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
permissions_7.xsd"
version="7">
permissions_9.xsd"
version="9">



</permissions>

<?validateAgainst permissions_7.xsd?>
<?validateAgainst permissions_9.xsd?>
6 changes: 3 additions & 3 deletions jakartaee9/test/permissions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xml="http://www.w3.org/XML/1998/namespace"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
permissions_7.xsd"
version="7">
permissions_9.xsd"
version="9">

<permission>
<class-name>java.io.FilePermission</class-name>
Expand Down Expand Up @@ -93,5 +93,5 @@

</permissions>

<?validateAgainst permissions_7.xsd?>
<?validateAgainst permissions_9.xsd?>
<?expectError 85:cvc-complex-type.2.4.a?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-app-complete.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://foobar.com"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
metadata-complete="true"
version="4.0">
version="5.0">
<default-context-path>/myappcomplete</default-context-path>
<request-character-encoding>UTF-8</request-character-encoding>
<response-character-encoding>UTF-8</response-character-encoding>
Expand Down Expand Up @@ -173,4 +173,4 @@
<name>B</name>
</absolute-ordering>
</web-app>
<?validateAgainst web-app_4_0.xsd ?>
<?validateAgainst web-app_5_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-app-data-source.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://foobar.com"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
version="4.0">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
version="5.0">
<servlet>
<servlet-name>MyInventoryServlet</servlet-name>
<servlet-class>com.acme.Inventory</servlet-class>
Expand Down Expand Up @@ -208,4 +208,4 @@
<max-statements>50</max-statements>
</data-source>
</web-app>
<?validateAgainst web-app_4_0.xsd ?>
<?validateAgainst web-app_5_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-app-resources.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://foobar.com"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
version="4.0">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
version="5.0">
<servlet>
<servlet-name>MyInventoryServlet</servlet-name>
<servlet-class>com.acme.Inventory</servlet-class>
Expand Down Expand Up @@ -269,4 +269,4 @@
</property>
</connection-factory>
</web-app>
<?validateAgainst web-app_4_0.xsd ?>
<?validateAgainst web-app_5_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-app.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://foobar.com"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
version="4.0">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
version="5.0">
<default-context-path>/myapp</default-context-path>
<request-character-encoding>UTF-8</request-character-encoding>
<response-character-encoding>UTF-8</response-character-encoding>
Expand Down Expand Up @@ -165,4 +165,4 @@
</handler>
</service-ref>
</web-app>
<?validateAgainst web-app_4_0.xsd ?>
<?validateAgainst web-app_5_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-facelettaglibrary-composite.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="2.3"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="3.0"
>
<namespace>http://domain.com/path</namespace>
<composite-library-name>compositeTest</composite-library-name>
</facelet-taglib>


<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-facelettaglibrary-library-class.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="2.3"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="3.0"
>
<library-class>com.foo.MyLibrary</library-class>
</facelet-taglib>
<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-facelettaglibrary-pathological-0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="2.3"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="3.0"
>
<library-class>com.foo.MyLibrary</library-class>
<namespace>http://mojarra.dev.java.net/mojarra_ext</namespace>
Expand All @@ -34,5 +34,5 @@
<composite-library-name>compositeTest</composite-library-name>

</facelet-taglib>
<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
<?expectError 27:cvc-complex-type.2.4.a ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-facelettaglibrary-pathological-1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="2.3"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="3.0"
>
<namespace>http://mojarra.dev.java.net/mojarra_ext</namespace>
<tag>
<tag-name>regexValidator</tag-name>
</tag>

</facelet-taglib>
<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
<?expectError 29:cvc-complex-type.2.4.b ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-facelettaglibrary-standard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="2.3"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
version="3.0"
>
<namespace>http://mojarra.dev.java.net/mojarra_ext</namespace>
<tag>
Expand Down Expand Up @@ -54,4 +54,4 @@
-->

</facelet-taglib>
<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-facesconfig-pathological-0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@

<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_2_3.xsd"
version="2.3">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_3_0.xsd"
version="3.0">


<name>[]][</name>
<referenced-bean />

</faces-config>

<?validateAgainst web-facesconfig_2_3.xsd ?>
<?validateAgainst web-facesconfig_3_0.xsd ?>
<?expectError 26:cvc-pattern-valid ?>
<?expectError 26:cvc-complex-type.2.2 ?>
<?expectError 27:cvc-complex-type.2.4.b ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-facesconfig-standard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_2_3.xsd"
version="2.3">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_3_0.xsd"
version="3.0">

<application>
<message-bundle>com.sun.faces.CustomMessages</message-bundle>
Expand Down Expand Up @@ -774,4 +774,4 @@

</faces-config>

<?validateAgainst web-facesconfig_2_3.xsd ?>
<?validateAgainst web-facesconfig_3_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-fragment-complete.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foobar="http://foobar.com"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-fragment_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-fragment_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
metadata-complete="true"
version="4.0">
version="5.0">
<name>A</name>
<servlet>
<servlet-name>MyInventoryServlet</servlet-name>
Expand Down Expand Up @@ -170,4 +170,4 @@
</before>
</ordering>
</web-fragment>
<?validateAgainst web-fragment_4_0.xsd ?>
<?validateAgainst web-fragment_5_0.xsd ?>
4 changes: 2 additions & 2 deletions jakartaee9/test/web-partialresponse-standard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<partial-response xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-partialresponse_2_3.xsd" id="partial">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-partialresponse_3_0.xsd" id="partial">

<changes>
<update id="1">
Expand Down Expand Up @@ -50,4 +50,4 @@
</partial-response>


<?validateAgainst web-partialresponse_2_3.xsd ?>
<?validateAgainst web-partialresponse_3_0.xsd ?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-service-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<webservices xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
jakartaee_web_services_1_4.xsd"
version="1.4">
jakartaee_web_services_2_0.xsd"
version="2.0">
<webservice-description>
<webservice-description-name>JoesServices</webservice-description-name>
<wsdl-file>META-INF/joe.wsdl</wsdl-file>
Expand All @@ -44,4 +44,4 @@
</port-component>
</webservice-description>
</webservices>
<?validateAgainst jakartaee_web_services_1_4.xsd?>
<?validateAgainst jakartaee_web_services_2_0.xsd?>
6 changes: 3 additions & 3 deletions jakartaee9/test/web-service-handler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
xmlns:soap2="http://HandlerInfo.org/Server2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
jakartaee_web_services_1_4.xsd"
version="1.4">
jakartaee_web_services_2_0.xsd"
version="2.0">
<webservice-description>
<webservice-description-name>HandlerInfoTest</webservice-description-name>
<wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
Expand Down Expand Up @@ -53,4 +53,4 @@
</port-component>
</webservice-description>
</webservices>
<?validateAgainst jakartaee_web_services_1_4.xsd?>
<?validateAgainst jakartaee_web_services_2_0.xsd?>

0 comments on commit 3f83473

Please sign in to comment.