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-13887 Add http-connections element to jboss-ejb-client_1_4.xsd s… #13598

Merged
merged 1 commit into from Oct 6, 2020
Merged

WFLY-13887 Add http-connections element to jboss-ejb-client_1_4.xsd s… #13598

merged 1 commit into from Oct 6, 2020

Conversation

sudeshnas93
Copy link
Contributor

@wildfly-ci
Copy link

Hello, sudeshnas93. I'm waiting for one of the admins to verify this patch with /ok-to-test in a comment.

chengfang
chengfang reviewed Sep 23, 2020
View reviewed changes
docs/src/main/asciidoc/_client-guide/jboss-ejb-client.adoc Outdated
[[http-connections]]
=== <http-connections>

* `http-connection` HTTP Connection for EJB invocation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http-connection should be documented as a sub-element in its subsection under http-connections, just like remoting-ejb-receiver is a subelement of ejb-receivers.

chengfang
chengfang reviewed Sep 23, 2020
View reviewed changes
ejb3/src/main/resources/schema/jboss-ejb-client_1_4.xsd
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the indentation is a bit off. Need to reformat the addition.

chengfang
chengfang reviewed Sep 23, 2020
View reviewed changes
ejb3/src/main/resources/schema/jboss-ejb-client_1_4.xsd Outdated
@@ -162,6 +162,37 @@
</xsd:attribute>
</xsd:complexType>

<xsd:complexType name="http-connectionsType">
<xsd:choice>
<xsd:element name="http-connections" type="http-connectionsType" >
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be http-connection

chengfang
chengfang reviewed Sep 23, 2020
View reviewed changes
ejb3/src/main/resources/schema/jboss-ejb-client_1_4.xsd Outdated
<xsd:element name="http-connections" type="http-connectionsType" >
<xsd:annotation>
<xsd:documentation>
Configures remote http-connections for EJB invocation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be http-connection

chengfang
chengfang reviewed Sep 23, 2020
View reviewed changes
ejb3/src/main/resources/schema/jboss-ejb-client_1_4.xsd Outdated
@@ -162,6 +162,37 @@
</xsd:attribute>
</xsd:complexType>

<xsd:complexType name="http-connectionsType">
<xsd:choice>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need min and max bound for choice:
<xsd:choice minOccurs="0" maxOccurs="unbounded">

chengfang
chengfang reviewed Sep 23, 2020
View reviewed changes
ejb3/src/main/resources/schema/jboss-ejb-client_1_4.xsd Outdated
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to remove the above choice element.

@chengfang
Copy link
Contributor

In the xsd file, we need to:

  • add the new http-connections element to client-contextType
  • add a new element type http-connectionsType
  • add a new element type http-connectionType

It should follow the same pattern as the element ejb-receivers, which is also a sub-element of client-context.

@bstansberry bstansberry added 21.x Blocker Needs to be merged before the next release from the branch it targets. labels Oct 4, 2020
@bstansberry
Copy link
Contributor

@sudeshnas93 @chengfang We should get this xsd correct for WF 21 as it's a new version.

@sudeshnas93
Copy link
Contributor Author

@chengfang Fixed accordingly.

@chengfang
Copy link
Contributor

/retest

@bstansberry bstansberry merged commit 2f531cb into wildfly:master Oct 6, 2020
@bstansberry
Copy link
Contributor

Thanks @sudeshnas93 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chengfang chengfang chengfang approved these changes

Assignees
No one assigned
Labels
Blocker Needs to be merged before the next release from the branch it targets.
Projects
None yet
Milestone
No milestone
4 participants
@sudeshnas93 @wildfly-ci @chengfang @bstansberry