Adding both WebSocket tests to /test-integration/ to verify behavior that is causing problems from within OSGi. #3172
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There's no changes to anything outside of <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Set up the list of default configuration classes -->
<!-- =========================================================== -->
<Call class="org.eclipse.jetty.webapp.Configurations" name="setKnown">
<Arg>
<Array type="String">
<Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
<Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
<Item>org.eclipse.jetty.webapp.WebAppConfiguration</Item>
<Item>org.eclipse.jetty.webapp.ServletsConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JspConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JaasConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JndiConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>
</Array>
</Arg>
</Call>
</Configure>When this |
|
@joakime do you want to freshen this up before I review? |
|
@joakime is there an issue still with websocket and osgi for jetty-10? I thought it was all fixed. |
|
@janbartel this PR isn't directly for OSGi, just adding some The tests that this PR introduce into |
janbartel
approved these changes
Feb 5, 2019
that is causing problems from within OSGi. + Renamed TestableJettyServer to XmlBasedJettyServer to avoid it being picked up as a Test class (due it starting with the name "Test") + Renamed .addConfiguration() to .addXmlConfiguration() to reflect true nature, and also to avoid naming confusion with new Configuration infrastructure in Jetty. Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
joakime
force-pushed
the
jetty-10.0.x-integration-testing-websockets
branch
from
f42fa06
to
b351631
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
it being picked up as a Test class (due it starting with the
name "Test")
reflect true nature, and also to avoid naming confusion
with new Configuration infrastructure in Jetty.
Signed-off-by: Joakim Erdfelt joakim.erdfelt@gmail.com