You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/07/17 21:36:46 UTC
svn commit: r1611447 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/idea/.idea/libraries/ dev-tools/idea/solr/contrib/clustering/
dev-tools/idea/solr/contrib/dataimporthandler-extras/
dev-tools/idea/solr/contrib/dataimporthandler/ solr/ s...
Author: sarowe
Date: Thu Jul 17 19:36:45 2014
New Revision: 1611447
URL: http://svn.apache.org/r1611447
Log:
reverting r1611446 - included extra stuff that shouldn't have been committed
Added:
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_DIH_library.xml
- copied unchanged from r1611445, lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_DIH_library.xml
Removed:
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_DIH_extras_library.xml
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1611447&r1=1611446&r2=1611447&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/clustering/clustering.iml Thu Jul 17 19:36:45 2014
@@ -23,6 +23,7 @@
</orderEntry>
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
+ <orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml?rev=1611447&r1=1611446&r2=1611447&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml Thu Jul 17 19:36:45 2014
@@ -26,7 +26,7 @@
</orderEntry>
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
- <orderEntry type="library" name="Solr DIH extras library" level="project" />
+ <orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
<orderEntry type="module" module-name="solr-core" />
<orderEntry type="module" module-name="solrj" />
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1611447&r1=1611446&r2=1611447&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Thu Jul 17 19:36:45 2014
@@ -19,6 +19,7 @@
<orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
+ <orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
<orderEntry type="module" module-name="solr-core" />
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java?rev=1611447&r1=1611446&r2=1611447&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java Thu Jul 17 19:36:45 2014
@@ -16,7 +16,6 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
@@ -43,7 +42,6 @@ import java.util.TreeMap;
/**
* Tests a schemaless collection configuration with SolrCloud
*/
-@SuppressSSL
public class TestCloudSchemaless extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(TestCloudManagedSchemaConcurrent.class);
private static final String SUCCESS_XPATH = "/response/lst[@name='responseHeader']/int[@name='status'][.='0']";