Skip to content

Commit

Permalink
Running as deployed WAR two conflicting endpoints are registered #117
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcGiffing committed Jul 30, 2017
1 parent 602a70d commit 6a4ee09
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,21 @@ public WicketWebInitializerConfig wicketWebInitializerConfig() {
@ConditionalOnProperty(prefix = "wicket.external.websocket", value = "enabled", matchIfMissing = true)
public static class WebSocketWicketWebInitializerAutoConfiguration {

public static final String REGISTER_SERVER_ENDPOINT = "wicket.external.websocket.registerServerEndpoint";
public static final String REGISTER_SERVER_ENDPOINT_ENABLED = REGISTER_SERVER_ENDPOINT + ".enabled";

@Bean
public WicketWebInitializerConfig wicketWebInitializerConfig() {
return new WebSocketWicketWebInitializer();
}



/**
* @return the wicket server endpoint config register which registers the {@link WicketServerEndpointConfig}
*/
@Bean
@ConditionalOnProperty(prefix = "wicket.external.websocket.registerServerEndpoint", value = "enabled", matchIfMissing = true)
@ConditionalOnProperty(prefix = REGISTER_SERVER_ENDPOINT, value = "enabled", matchIfMissing = true)
public WicketServerEndpointConfigRegister wicketServerEndpointConfigRegister() {
return new WicketServerEndpointConfigRegister();
}
Expand Down

0 comments on commit 6a4ee09

Please sign in to comment.