Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update all cached data to 24.0.0.6 #279

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Update all cached data to 24.0.0.6 #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyXSDURIResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public class LibertyXSDURIResolver implements URIResolverExtension, IExternalGra

// Changing this to contain the version in the file name since the file is copied to the local .lemminx cache.
// This is how we ensure the latest default server schema gets used in each developer environment.
private static final String XSD_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/schema/xsd/liberty/server-cached-24.0.0.1.xsd";
private static final String XSD_CLASSPATH_LOCATION = "/schema/xsd/liberty/server-cached-24.0.0.1.xsd";
private static final String XSD_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/schema/xsd/liberty/server-cached-24.0.0.6.xsd";
private static final String XSD_CLASSPATH_LOCATION = "/schema/xsd/liberty/server-cached-24.0.0.6.xsd";

/**
* SERVER_XSD_RESOURCE is the server schema that is located at XSD_CLASSPATH_LOCATION
Expand Down
6 changes: 3 additions & 3 deletions ...iberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public class FeatureService {

// This file is copied to the local .lemminx cache.
// This is how we ensure the latest default featurelist xml gets used in each developer environment.
private static final String FEATURELIST_XML_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/featurelist-cached-24.0.0.1.xml";
private static final String FEATURELIST_XML_CLASSPATH_LOCATION = "/featurelist-cached-24.0.0.1.xml";
private static final String FEATURELIST_XML_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/featurelist-cached-24.0.0.6.xml";
private static final String FEATURELIST_XML_CLASSPATH_LOCATION = "/featurelist-cached-24.0.0.6.xml";

/**
* FEATURELIST_XML_RESOURCE is the featurelist xml that is located at FEATURELIST_XML_CLASSPATH_LOCATION
Expand Down Expand Up @@ -134,7 +134,7 @@ private List<Feature> getDefaultFeatures() {
if (defaultFeatures == null) {
// Changing this to contain the version in the file name since the file is copied to the local .lemminx cache.
// This is how we ensure the latest default features json gets used in each developer environment.
InputStream is = getClass().getClassLoader().getResourceAsStream("features-cached-24.0.0.1.json");
InputStream is = getClass().getClassLoader().getResourceAsStream("features-cached-24.0.0.6.json");
InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8);

// Only need the public features
Expand Down
6,013 changes: 3,069 additions & 2,944 deletions ...resources/featurelist-cached-24.0.0.1.xml → ...resources/featurelist-cached-24.0.0.6.xml
View file
Open in desktop

Large diffs are not rendered by default.

29,757 changes: 15,308 additions & 14,449 deletions ...n/resources/features-cached-24.0.0.1.json → ...n/resources/features-cached-24.0.0.6.json
View file
Open in desktop

Large diffs are not rendered by default.

119 changes: 96 additions & 23 deletions ...ma/xsd/liberty/server-cached-24.0.0.1.xsd → ...ma/xsd/liberty/server-cached-24.0.0.6.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
<xsd:element name="managed-bean-bnd" type="com.ibm.ws.javaee.dd.managedbean.ManagedBeanBnd"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
<xsd:element name="web-ext" type="com.ibm.ws.javaee.dd.webext.WebExt"/>
<xsd:element name="application-ext" type="com.ibm.ws.javaee.dd.appext.ApplicationExt"/>
<xsd:element name="ejb-jar-ext" type="com.ibm.ws.javaee.dd.ejbext.EJBJarExt"/>
<xsd:element name="web-bnd" type="com.ibm.ws.javaee.dd.webbnd.WebBnd"/>
<xsd:element name="webservices-bnd" type="com.ibm.ws.javaee.ddmodel.wsbnd.WebservicesBnd"/>
<xsd:element name="application-ext" type="com.ibm.ws.javaee.dd.appext.ApplicationExt"/>
<xsd:element name="ejb-jar-ext" type="com.ibm.ws.javaee.dd.ejbext.EJBJarExt"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
<xsd:element name="application-client-bnd" type="com.ibm.ws.javaee.dd.clientbnd.ApplicationClientBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
</xsd:choice>
<xsd:attribute name="location" type="location" use="required">
<xsd:annotation>
Expand Down Expand Up @@ -137,17 +137,17 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
<xsd:element name="managed-bean-bnd" type="com.ibm.ws.javaee.dd.managedbean.ManagedBeanBnd"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
<xsd:element name="web-ext" type="com.ibm.ws.javaee.dd.webext.WebExt"/>
<xsd:element name="web-bnd" type="com.ibm.ws.javaee.dd.webbnd.WebBnd"/>
<xsd:element name="webservices-bnd" type="com.ibm.ws.javaee.ddmodel.wsbnd.WebservicesBnd"/>
<xsd:element name="application-ext" type="com.ibm.ws.javaee.dd.appext.ApplicationExt"/>
<xsd:element name="resourceAdapter" type="com.ibm.ws.jca.embeddedResourceAdapter"/>
<xsd:element name="ejb-jar-ext" type="com.ibm.ws.javaee.dd.ejbext.EJBJarExt"/>
<xsd:element name="web-bnd" type="com.ibm.ws.javaee.dd.webbnd.WebBnd"/>
<xsd:element name="webservices-bnd" type="com.ibm.ws.javaee.ddmodel.wsbnd.WebservicesBnd"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
<xsd:element name="application-client-bnd" type="com.ibm.ws.javaee.dd.clientbnd.ApplicationClientBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
</xsd:choice>
<xsd:attribute name="location" type="location" use="required">
<xsd:annotation>
Expand Down Expand Up @@ -874,17 +874,17 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
<xsd:element name="managed-bean-bnd" type="com.ibm.ws.javaee.dd.managedbean.ManagedBeanBnd"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
<xsd:element name="web-ext" type="com.ibm.ws.javaee.dd.webext.WebExt"/>
<xsd:element name="web-bnd" type="com.ibm.ws.javaee.dd.webbnd.WebBnd"/>
<xsd:element name="webservices-bnd" type="com.ibm.ws.javaee.ddmodel.wsbnd.WebservicesBnd"/>
<xsd:element name="application-ext" type="com.ibm.ws.javaee.dd.appext.ApplicationExt"/>
<xsd:element name="resourceAdapter" type="com.ibm.ws.jca.embeddedResourceAdapter"/>
<xsd:element name="ejb-jar-ext" type="com.ibm.ws.javaee.dd.ejbext.EJBJarExt"/>
<xsd:element name="web-bnd" type="com.ibm.ws.javaee.dd.webbnd.WebBnd"/>
<xsd:element name="webservices-bnd" type="com.ibm.ws.javaee.ddmodel.wsbnd.WebservicesBnd"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
<xsd:element name="application-client-bnd" type="com.ibm.ws.javaee.dd.clientbnd.ApplicationClientBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
</xsd:choice>
<xsd:attribute name="location" type="location" use="required">
<xsd:annotation>
Expand Down Expand Up @@ -4820,12 +4820,12 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
<xsd:element name="managed-bean-bnd" type="com.ibm.ws.javaee.dd.managedbean.ManagedBeanBnd"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
<xsd:element name="application-ext" type="com.ibm.ws.javaee.dd.appext.ApplicationExt"/>
<xsd:element name="ejb-jar-ext" type="com.ibm.ws.javaee.dd.ejbext.EJBJarExt"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
<xsd:element name="ejb-jar-bnd" type="com.ibm.ws.javaee.dd.ejbbnd.EJBJarBnd"/>
<xsd:element name="application-bnd" type="com.ibm.ws.javaee.dd.appbnd.ApplicationBnd"/>
</xsd:choice>
<xsd:attribute name="location" type="location" use="required">
<xsd:annotation>
Expand Down Expand Up @@ -6516,7 +6516,7 @@
<xsd:simpleType>
<xsd:restriction base="xsd:int">
<xsd:minInclusive value="50"/>
<xsd:maxInclusive value="32768"/>
<xsd:maxInclusive value="2147483647"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:union>
Expand Down Expand Up @@ -6718,6 +6718,23 @@
</xsd:union>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute default="512000" name="maxHeaderBlockSize" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies the maximum size in bytes for the header block of individual HTTP2 streams. If this value is exceeded, the connection is closed with an error. Set this parameter to 0 to disable the check.</xsd:documentation>
<xsd:appinfo>
<ext:label>Maximum header block size</ext:label>
</xsd:appinfo>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="variableType">
<xsd:simpleType>
<xsd:restriction base="xsd:long">
<xsd:minInclusive value="0"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:union>
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>
<xsd:complexType name="com.ibm.ws.http.options-factory">
<xsd:complexContent>
Expand Down Expand Up @@ -7165,10 +7182,10 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
<xsd:element name="web-ext" type="com.ibm.ws.javaee.dd.webext.WebExt"/>
<xsd:element name="customize" type="com.ibm.ws.jca.resourceAdapter.customize"/>
<xsd:element name="webservices-bnd" type="com.ibm.ws.javaee.ddmodel.wsbnd.WebservicesBnd"/>
<xsd:element name="appProperties" type="com.ibm.ws.appconfig.appProperties"/>
<xsd:element name="customize" type="com.ibm.ws.jca.resourceAdapter.customize"/>
<xsd:any maxOccurs="1" minOccurs="0" processContents="skip"/>
</xsd:choice>
<xsd:attribute name="location" type="location" use="required">
Expand Down Expand Up @@ -13178,6 +13195,21 @@
<xsd:documentation>oracle.jdbc.xa.client.OracleXADataSource</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="oracle.jdbc.replay.OracleDataSourceImpl">
<xsd:annotation>
<xsd:documentation>oracle.jdbc.replay.OracleDataSourceImpl</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="oracle.jdbc.replay.OracleConnectionPoolDataSourceImpl">
<xsd:annotation>
<xsd:documentation>oracle.jdbc.replay.OracleConnectionPoolDataSourceImpl</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="oracle.jdbc.replay.OracleXADataSourceImpl">
<xsd:annotation>
<xsd:documentation>oracle.jdbc.replay.OracleXADataSourceImpl</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
</xsd:union>
Expand Down Expand Up @@ -26149,8 +26181,8 @@
</xsd:appinfo>
</xsd:annotation>
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="servletTiming" type="com.ibm.ws.request.timing.servlet.metatype"/>
<xsd:element name="jdbcTiming" type="com.ibm.ws.request.timing.jdbc.metatype"/>
<xsd:element name="servletTiming" type="com.ibm.ws.request.timing.servlet.metatype"/>
</xsd:choice>
<xsd:attribute default="10s" name="slowRequestThreshold" type="duration" use="optional">
<xsd:annotation>
Expand Down Expand Up @@ -26531,6 +26563,7 @@
<xsd:documentation>Specifies a SameSite attribute value to use for session cookies.</xsd:documentation>
<xsd:appinfo>
<ext:label>Include a SameSite attribute in session cookies</ext:label>
<ext:group id="cookies"/>
</xsd:appinfo>
</xsd:annotation>
<xsd:simpleType>
Expand Down Expand Up @@ -28893,6 +28926,14 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute default="false" name="propagateXAResourceTransactionTimeout" type="booleanType" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies whether the remaining time left in a global transaction is propagated to XAResources on enlistment.</xsd:documentation>
<xsd:appinfo>
<ext:label>Propagate transaction timeout</ext:label>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute default="true" name="OnePCOptimization" type="booleanType" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies whether the transaction manager optimizes when all resources but one vote read only.</xsd:documentation>
Expand Down Expand Up @@ -31411,6 +31452,14 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute default="134217728" name="postParamMaxRequestBodySize" type="longType" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies the maximum size of the request body of an HTTP POST request to save request parameters. If the content length of the request is larger than the maximum allowed size, any POST parameters in the request are not saved. If the content length of the request is unknown, request parameters are not saved regardless of the value of this attribute. Setting this attribute to -1 means that POST parameters are always saved if the content length of the request is known.</xsd:documentation>
<xsd:appinfo>
<ext:label>Maximum request body size to save POST parameters</ext:label>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute default="Cookie" name="postParamSaveMethod" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies where POST parameters are stored upon redirect. Valid values are cookie (POST parameters are stored in a cookie), session (POST parameters are stored in the HTTP Session) and none (POST parameters are not preserved). The equivalent custom property in the full application server profile is com.ibm.websphere.security.util.postParamSaveMethod.</xsd:documentation>
Expand Down Expand Up @@ -33480,8 +33529,8 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="diskCache" type="com.ibm.ws.cache.disk"/>
<xsd:element name="cacheGroup" type="com.ibm.ws.cache.cacheGroup"/>
<xsd:element name="diskCache" type="com.ibm.ws.cache.disk"/>
</xsd:choice>
<xsd:attribute name="id" type="xsd:string" use="required">
<xsd:annotation>
Expand Down Expand Up @@ -35136,6 +35185,14 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="backchannelLogoutUri" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies the back-channel logout URI for an OpenID Connect client.</xsd:documentation>
<xsd:appinfo>
<ext:label>Back-channel logout URI</ext:label>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
<xsd:complexType name="com.ibm.ws.security.oauth20.client-factory">
<xsd:complexContent>
Expand Down Expand Up @@ -37040,6 +37097,14 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute default="180s" name="backchannelLogoutRequestTimeout" type="secondDuration" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies the amount of time before a back-channel logout request to an OpenID Connect client times out. Specify a positive integer followed by a unit of time, which can be hours (h), minutes (m), or seconds (s). For example, specify 30 seconds as 30s. You can include multiple values in a single entry. For example, 1m30s is equivalent to 90 seconds.</xsd:documentation>
<xsd:appinfo>
<ext:label>Back-channel logout request timeout</ext:label>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
<xsd:complexType name="com.ibm.ws.security.openidconnect.server.oidcServerConfig-factory">
<xsd:complexContent>
Expand Down Expand Up @@ -40681,6 +40746,14 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute default="30s" name="asyncResponseTimeout" type="duration" use="optional">
<xsd:annotation>
<xsd:documentation>Specifies the amount of time the server waits for an inbound WS-AT protocol response before it resends the previous WS-AT protocol message. Specify a positive integer followed by a unit of time, which can be hours (h), minutes (m), seconds (s), or milliseconds (ms). For example, specify 500 milliseconds as 500ms. You can include multiple values in a single entry. For example, 1s500ms is equivalent to 1.5 seconds.</xsd:documentation>
<xsd:appinfo>
<ext:label>Async response timeout</ext:label>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
<xsd:complexType name="com.ibm.ws.wssecurity.config">
<xsd:annotation>
Expand Down
4 changes: 2 additions & 2 deletions lemminx-liberty/src/test/java/io/openliberty/LibertyCompletionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public void testFeatureCompletionItem() throws BadLocationException {
CompletionItem websocket = c("websocket-1.1", "websocket-1.1");
CompletionItem microProfileCompletion = c("microProfile-2.2", "microProfile-2.2");

// would be 262 if mpConfig-1.4 was not already specified
final int TOTAL_ITEMS = 265; // total number of available completion items
// would be 269 if mpConfig-1.4 was not already specified
final int TOTAL_ITEMS = 268; // total number of available completion items

XMLAssert.testCompletionFor(serverXML, null, serverXMLURI, TOTAL_ITEMS, jaxrsCompletion, websocket,
microProfileCompletion);
Expand Down
Loading
Loading