"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java" between
solr-8.4.0-src.tgz and solr-8.4.1-src.tgz

About: Solr is the search platform from the Apache Lucene project. Its major features include full-text search, hit highlighting, faceted search, caching, replication, and a web admin interface.

JettySolrRunner.java  (solr-8.4.0-src.tgz):JettySolrRunner.java  (solr-8.4.1-src.tgz)
skipping to change at line 279 skipping to change at line 279
if (System.getProperty("jetty.testMode") != null) { if (System.getProperty("jetty.testMode") != null) {
// if this property is true, then jetty will be configured to use SSL // if this property is true, then jetty will be configured to use SSL
// leveraging the same system properties as java to specify // leveraging the same system properties as java to specify
// the keystore/truststore if they are set unless specific config // the keystore/truststore if they are set unless specific config
// is passed via the constructor. // is passed via the constructor.
// //
// This means we will use the same truststore, keystore (and keys) for // This means we will use the same truststore, keystore (and keys) for
// the server as well as any client actions taken by this JVM in // the server as well as any client actions taken by this JVM in
// talking to that server, but for the purposes of testing that should // talking to that server, but for the purposes of testing that should
// be good enough // be good enough
final SslContextFactory sslcontext = SSLConfig.createContextFactory(config .sslConfig); final SslContextFactory.Server sslcontext = SSLConfig.createContextFactory (config.sslConfig);
HttpConfiguration configuration = new HttpConfiguration(); HttpConfiguration configuration = new HttpConfiguration();
ServerConnector connector; ServerConnector connector;
if (sslcontext != null) { if (sslcontext != null) {
configuration.setSecureScheme("https"); configuration.setSecureScheme("https");
configuration.addCustomizer(new SecureRequestCustomizer()); configuration.addCustomizer(new SecureRequestCustomizer());
HttpConnectionFactory http1ConnectionFactory = new HttpConnectionFactory (configuration); HttpConnectionFactory http1ConnectionFactory = new HttpConnectionFactory (configuration);
if (config.onlyHttp1 || !Constants.JRE_IS_MINIMUM_JAVA9) { if (config.onlyHttp1 || !Constants.JRE_IS_MINIMUM_JAVA9) {
connector = new ServerConnector(server, new SslConnectionFactory(sslco ntext, connector = new ServerConnector(server, new SslConnectionFactory(sslco ntext,
skipping to change at line 755 skipping to change at line 755
* Returns a base URL consisting of the protocol, host, and port for a * Returns a base URL consisting of the protocol, host, and port for a
* Connector in use by the Jetty Server contained in this runner. * Connector in use by the Jetty Server contained in this runner.
*/ */
public URL getBaseUrl() { public URL getBaseUrl() {
try { try {
return new URL(protocol, host, jettyPort, config.context); return new URL(protocol, host, jettyPort, config.context);
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
public URL getBaseURLV2(){
try {
return new URL(protocol, host, jettyPort, "/api");
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}
}
/** /**
* Returns a base URL consisting of the protocol, host, and port for a * Returns a base URL consisting of the protocol, host, and port for a
* Connector in use by the Jetty Server contained in this runner. * Connector in use by the Jetty Server contained in this runner.
*/ */
public URL getProxyBaseUrl() { public URL getProxyBaseUrl() {
try { try {
return new URL(protocol, host, getLocalPort(), config.context); return new URL(protocol, host, getLocalPort(), config.context);
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)