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.

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

[3.12.x] Add client full example configuration files #15057

Merged

Conversation

@blazember
Copy link
Contributor

commented May 17, 2019

There were hazelcast-client-full.[xml|yaml] configuration files shipped with the hazelcast-client.jar. These files however had no comments, and the files were used by tests too. To make test files and full example configs separated, these files are moved to the test scope, but also used as a basis for the full example config files that are extended with explanatory comments. Client failover full example configs are added too.

Besides this, the client failover config XSDs got fixed. These fixes include:

  • Defining target namespace
  • Change the <try-count> element's type from xs:int to non-space-string otherwise schema validation error is thrown if the variable replacer is used to configure the try count value.

The client failover XSD is changed retrospectively, but without the fix, schema validation fails if used. This needs further coordination to update the XSD.

Implements #14948

4.0 PR: #15056

3.12.x EE PR: hazelcast/hazelcast-enterprise#2992

@blazember blazember added this to the 3.12.1 milestone May 17, 2019

@blazember blazember requested a review from sancar May 17, 2019

@blazember blazember self-assigned this May 17, 2019

@blazember blazember referenced this pull request May 17, 2019

Merged

[4.0] Add client full example configuration files #15056

1 of 1 task complete

@blazember blazember changed the title Add client full example configuration files [3.12.x] Add client full example configuration files May 17, 2019

@blazember blazember force-pushed the blazember:3.x/client-full-example-configs branch from d000bff to 33a104e May 23, 2019

attributeFormDefault="unqualified">

<xs:element name="hazelcast-client-failover">
<xs:complexType>
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="try-count" type="xs:int" minOccurs="1" maxOccurs="1"/>
<xs:element name="try-count" type="non-space-string" minOccurs="1" maxOccurs="1"/>

This comment has been minimized.

Copy link
@sancar

sancar May 24, 2019

Member

So, we should not use xs:int anywhere to support replacers, is that the case?
I have just checked we have usages of it in hazelcast-client-config-3.12.xsd. Should all be removed?

This comment has been minimized.

Copy link
@blazember

blazember May 24, 2019

Author Contributor

I revert this part of the schema change. As you said, this is a general problem with replacers. We have a solution for this in the spring schema:

<xs:simpleType name="parameterized-backup-count">
<xs:union memberTypes="backup-count parameterizedValueType"/>
</xs:simpleType>

I believe this approach should be used by the other XSDs as well, but this needs no retrospective change.

However, I still think adding xmlns and targetNamespace needs retrospective change.

@blazember blazember requested a review from asimarslan May 24, 2019

@sancar

sancar approved these changes May 24, 2019

@sancar

sancar approved these changes May 24, 2019

@sancar

sancar approved these changes May 24, 2019

<!--
===== HAZELCAST LICENSE CONFIGURATION =====
If you have an Enterprise or Enterprise HD license, you can enter it here.

This comment has been minimized.

Copy link
@asimarslan

asimarslan May 27, 2019

Member

On the client, licence is not required. This config is for backward compatibility. We may update the comment to imply that it's not required.

@asimarslan
Copy link
Member

left a comment

minor comment on license part

blazember added some commits May 17, 2019

Add client full example configuration files
There were `hazelcast-client-full.[xml|yaml]` configuration files
shipped with the `hazelcast-client.jar`. These files however had no
comments, and the files were used by tests too. To make test files and
full example configs separated, these files are moved to the test scope,
but also used as a basis for the full example config files that are
extended with explanatory comments. Client failover full example configs
are added too.

Besides this, the client failover config XSDs got fixed. These fixes
include:
- Defining target namespace
- Change the <try-count> element's type from "xs:int" to
"non-space-string" otherwise schema validation error is thrown if the
variable replacer is used to configure the try count value.

The 3.12 XSD is changed retrospectively, but without the fix, schema
validation fails if used. This needs further coordination to update
the XSD.

Implements #14948

(cherry picked from commit a6f7b45)

@blazember blazember force-pushed the blazember:3.x/client-full-example-configs branch from d2a6aaf to 2652499 May 27, 2019

@blazember blazember merged commit b7ae0bc into hazelcast:maintenance-3.x May 28, 2019

1 check passed

default Test PASSed.
Details
@blazember

This comment has been minimized.

Copy link
Contributor Author

commented May 28, 2019

Thanks for the review @asimarslan @sancar 👍

@blazember blazember deleted the blazember:3.x/client-full-example-configs branch May 28, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.