You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/07/15 13:40:20 UTC
[26/27] git commit: CAMEL-6827 Clean up the code
CAMEL-6827 Clean up the code
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/732411b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/732411b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/732411b9
Branch: refs/heads/master
Commit: 732411b9b51a4a2bac6dec20408b4b9bb8a2ba87
Parents: 7569500
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Jul 15 19:28:43 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Jul 15 19:28:43 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/solr/JettySolrFactory.java | 8 ++------
.../apache/camel/component/solr/SolrCloudFixture.java | 14 +++-----------
2 files changed, 5 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/732411b9/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
index 466ebbf..7badb49 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/JettySolrFactory.java
@@ -27,12 +27,10 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.embedded.SSLConfig;
-import org.apache.solr.client.solrj.impl.HttpClientConfigurer;
import org.eclipse.jetty.servlet.ServletHolder;
// Create embedded's Solrs for testing,
@@ -42,7 +40,6 @@ public final class JettySolrFactory {
public static final File TEST_KEYSTORE = new File("./target/test-classes/solrtest.keystore");
private static final String TEST_KEYSTORE_PATH = TEST_KEYSTORE.getAbsolutePath();
private static final String TEST_KEYSTORE_PASSWORD = "secret";
- private static final HttpClientConfigurer DEFAULT_CONFIGURER = new HttpClientConfigurer();
private static boolean mockedSslClient;
private static int dataDirNo;
@@ -60,8 +57,7 @@ public final class JettySolrFactory {
NoSuchAlgorithmException, KeyStoreException {
SSLContextBuilder builder = new SSLContextBuilder();
builder.loadTrustMaterial(null, new TrustSelfSignedStrategy());
- SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(builder.build());
-
+
// // Create a trust manager that does not validate certificate chains
final TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() {
@Override
@@ -114,7 +110,7 @@ public final class JettySolrFactory {
stopAtShutdown, extraServlets, sslConfig);
jetty.start();
- int port = jetty.getLocalPort();
+
return jetty;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/732411b9/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
index 64aa4f0..c14659b 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCloudFixture.java
@@ -64,11 +64,7 @@ public class SolrCloudFixture {
CloudSolrServer solrClient;
public SolrCloudFixture(String solrHome) throws Exception {
-
- // String testHome = SolrTestCaseJ4.TEST_HOME();
- // miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, null, new
- // File(testHome, "solr-no-core.xml"),
- // null, null);
+
miniCluster = new MiniSolrCloudCluster(1, "/solr", new File(solrHome, "solr-no-core.xml"), null, null);
String zkAddr = miniCluster.getZkServer().getZkAddress();
String zkHost = miniCluster.getZkServer().getZkHost();
@@ -77,13 +73,9 @@ public class SolrCloudFixture {
List<JettySolrRunner> jettys = miniCluster.getJettySolrRunners();
for (JettySolrRunner jetty : jettys) {
if (!jetty.isRunning()) {
- System.out.println("JETTY NOT RUNNING!");
+ log.warn("JETTY NOT RUNNING!");
} else {
- // jetty.stop();
- // jetty.start();
- System.out.println("JETTY RUNNING");
- System.out.println("AT: " + jetty.getBaseUrl());
- System.out.println("PORTT" + jetty.getLocalPort());
+ log.info("JETTY RUNNING AT " + jetty.getBaseUrl() + " PORT " + jetty.getLocalPort());
}
}