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

[WFLY-5401] Add version 4.0 of the Undertow Subsystem Model / Schema #8586

Merged
merged 15 commits into from Aug 17, 2016
Merged

[WFLY-5401] Add version 4.0 of the Undertow Subsystem Model / Schema #8586

merged 15 commits into from Aug 17, 2016

Conversation

darranl
Copy link
Contributor

@darranl darranl commented Jan 19, 2016

❗ Commits from this branch are used in numerous other topic branches so please do not cherry-pick or rebase. ❗

@stuartwdouglas stuartwdouglas mentioned this pull request Jul 4, 2016
Closed
@darranl
Merge branch 'WFLY-6802' into WFLY-5401
942f367
@darranl
Merge remote-tracking branch 'upstream' into WFLY-5401
8623ce7
@darranl
[WFLY-5401] Port subsequent change from version 3.1 of the schema to …
af6d3ab 
…version 4.0 of the schema.

The 3.1 changes were made under the following commits: -

    commit 0ca2340
    Author: Brian Stansberry <brian.stansberry@redhat.com>
    Date:   Mon Jul 11 14:07:16 2016 -0500

        [WFLY-6350] Remove unsupported type from xsd

        Missing from wildfly#7727 for WFLY-4760

    commit 88ce7e3
    Author: Brian Stansberry <brian.stansberry@redhat.com>
    Date:   Mon Jul 11 13:51:22 2016 -0500

        [WFLY-6350] Persist undertow web-sockets attributes in xsd order

        Here I change the xsd to match persistence, as in the listerner elements we put worker before buffer-pool. So be consistent.
@bstansberry
Copy link
Contributor

retest this please

@bstansberry
Copy link
Contributor

I think this one is likely a bit out of date. I know I did quite a bit of reorganization of persistence order recently, and I didn't look closely but my impression is this doesn't have the cert generation stuff.

@darranl
Copy link
Contributor Author

darranl commented Jul 29, 2016

I have already updated the schema to match the changes you made. For each version bump PR after merging the latest from upstream I have also compared the new schema with the last scheme to ensure that apart from the namespaces for the version at the top of the file they are identical.

Regarding certificate generation that is within the security realms not the Undertow subsystem.

@darranl
Copy link
Contributor Author

darranl commented Jul 29, 2016

Actually I see what you mean, this one still needs the actual parser porting over - will correct.

@jamezp jamezp added hold PR should not be merged for some reason. ready-for-merge Only for use by those with merge permissions! labels Aug 2, 2016
@jamezp
Copy link
Member

jamezp commented Aug 2, 2016

This is ready to merge. I've added a hold tag waiting for the EAP PR and waiting for @kabir to give the okay to merge.

@kabir kabir merged commit 7b988ee into wildfly:master Aug 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kabir kabir

Labels
hold PR should not be merged for some reason. ready-for-merge Only for use by those with merge permissions!
Projects
None yet
Milestone
No milestone
5 participants
@darranl @bstansberry @jamezp @kabir @stuartwdouglas