You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/01/31 04:37:34 UTC
svn commit: r1440839 [3/3] - in /lucene/dev/branches/lucene4547: ./
dev-tools/ dev-tools/idea/lucene/demo/ dev-tools/maven/lucene/demo/ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/codecs/compressing/
lucene/core/src/java/org/apache/luce...
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id: solrconfig-slave.xml 741684 2009-02-06 19:21:44Z shalin $
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id: solrconfig-master2.xml 1144761 2011-07-09 23:01:53Z sarowe $
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id: solrconfig.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,7 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
-
-
+<!--
This is a "kitchen sink" config file that tests can use.
When writting a new test, feel free to add *new* items (plugins,
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject.xml Thu Jan 31 03:37:31 2013
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<!-- $Id: solrconfig.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source$
- $Name$
-
+<!--
This is a "kitchen sink" config file that tests can use.
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id: solrconfig-querysender.xml 1048886 2010-12-14 01:10:52Z hossman $
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml Thu Jan 31 03:37:31 2013
@@ -17,13 +17,6 @@
limitations under the License.
-->
-<!-- $Id: $
- $Source: $
- $Name: $
-
-Config for testing responselog component
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard"
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id: solrconfig-slave.xml 741684 2009-02-06 19:21:44Z shalin $
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml Thu Jan 31 03:37:31 2013
@@ -17,13 +17,6 @@
limitations under the License.
-->
-<!-- $Id: solrconfig.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source$
- $Name$
-
-Config for testing spellcheck component
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard"
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-termindex.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-termindex.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-termindex.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-termindex.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id: solrconfig.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- see TestConfig.testLib() -->
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-config.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-config.xml Thu Jan 31 03:37:31 2013
@@ -19,8 +19,6 @@
Striped down solrconfig used by SampleTest to demonstrate picking any
config filename you want.
- $Id: solrconfig.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source$
-->
<config>
Modified: lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-schema.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-schema.xml (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/crazy-path-to-schema.xml Thu Jan 31 03:37:31 2013
@@ -19,8 +19,6 @@
Striped down schema used by SampleTest to demonstrate picking any
schema filename you want.
- $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $
-->
<schema name="test" version="1.0">
Modified: lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Thu Jan 31 03:37:31 2013
@@ -258,6 +258,7 @@ public class TestReplicationHandler exte
doTestStopPoll();
doTestSnapPullWithMasterUrl();
doTestReplicateAfterStartup();
+ doTestReplicateAfterStartupWithNoActivity();
doTestIndexAndConfigAliasReplication();
doTestBackup();
}
@@ -657,6 +658,81 @@ public class TestReplicationHandler exte
slaveJetty = createJetty(slave);
slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
}
+
+ private void doTestReplicateAfterStartupWithNoActivity() throws Exception {
+ String factory = System.getProperty("solr.directoryFactory");
+ System.out.println("factory:" + factory);
+ useFactory(null);
+ try {
+
+ //stop slave
+ slaveJetty.stop();
+
+ nDocs--;
+ masterClient.deleteByQuery("*:*");
+
+ masterClient.commit();
+
+ //change solrconfig having 'replicateAfter startup' option on master
+ master.copyConfigFile(CONF_DIR + "solrconfig-master2.xml",
+ "solrconfig.xml");
+
+ masterJetty.stop();
+
+ masterJetty = createJetty(master);
+ masterClient = createNewSolrServer(masterJetty.getLocalPort());
+
+ for (int i = 0; i < nDocs; i++)
+ index(masterClient, "id", i, "name", "name = " + i);
+
+ masterClient.commit();
+
+ // now we restart to test what happens with no activity before the slave tries to
+ // replicate
+ masterJetty.stop();
+ masterJetty.start(true);
+
+ //masterClient = createNewSolrServer(masterJetty.getLocalPort());
+
+ NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient);
+ SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response");
+ assertEquals(nDocs, masterQueryResult.getNumFound());
+
+
+ slave.setTestPort(masterJetty.getLocalPort());
+ slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
+
+ //start slave
+ slaveJetty = createJetty(slave);
+ slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
+
+ //get docs from slave and check if number is equal to master
+ NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient);
+ SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
+ assertEquals(nDocs, slaveQueryResult.getNumFound());
+
+ //compare results
+ String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult, slaveQueryResult, 0, null);
+ assertEquals(null, cmp);
+
+ // NOTE: the master only replicates after startup now!
+ // revert that change.
+ master.copyConfigFile(CONF_DIR + "solrconfig-master.xml", "solrconfig.xml");
+ masterJetty.stop();
+ masterJetty = createJetty(master);
+ masterClient = createNewSolrServer(masterJetty.getLocalPort());
+
+ slave.setTestPort(masterJetty.getLocalPort());
+ slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml");
+
+ //start slave
+ slaveJetty.stop();
+ slaveJetty = createJetty(slave);
+ slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
+ } finally {
+ resetFactory();
+ }
+ }
private void doTestReplicateAfterCoreReload() throws Exception {
int docs = TEST_NIGHTLY ? 200000 : 0;
Modified: lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml (original)
+++ lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml Thu Jan 31 03:37:31 2013
@@ -23,9 +23,6 @@
kitchen sink thrown in. See example/solr/conf/schema.xml for a
more concise example.
- $Id$
- $Source$
- $Name$
-->
<schema name="test" version="1.2">
Modified: lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml Thu Jan 31 03:37:31 2013
@@ -23,9 +23,6 @@
kitchen sink thrown in. See example/solr/conf/schema.xml for a
more concise example.
- $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $
- $Name: $
-->
<schema name="test" version="1.5">
Modified: lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml Thu Jan 31 03:37:31 2013
@@ -17,11 +17,6 @@
limitations under the License.
-->
-<!-- $Id$
- $Source$
- $Name$
- -->
-
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml (original)
+++ lucene/dev/branches/lucene4547/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml Thu Jan 31 03:37:31 2013
@@ -19,8 +19,6 @@
Striped down schema used by SampleTest to demonstrate picking any
schema filename you want.
- $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $
- $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $
-->
<schema name="test" version="1.0">
Modified: lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Thu Jan 31 03:37:31 2013
@@ -116,7 +116,7 @@ public abstract class SolrTestCaseJ4 ext
changedFactory = true;
}
- private static void resetFactory() throws Exception {
+ public static void resetFactory() throws Exception {
if (!changedFactory) return;
changedFactory = false;
if (savedFactory != null) {
Modified: lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/analysis.js?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/analysis.js Thu Jan 31 03:37:31 2013
@@ -42,7 +42,7 @@ sammy.get
var type_or_name = $( '#type_or_name', analysis_form );
var schema_browser_element = $( '#tor_schema' );
- var schema_browser_path = $( 'p > a', active_core ).attr( 'href' ) + '/schema-browser'
+ var schema_browser_path = app.core_menu.find( '.schema-browser a' ).attr( 'href' );
var schema_browser_map = { 'fieldname' : 'field', 'fieldtype' : 'type' };
type_or_name
Modified: lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/app.js?rev=1440839&r1=1440838&r2=1440839&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/branches/lucene4547/solr/webapp/web/js/scripts/app.js Thu Jan 31 03:37:31 2013
@@ -175,6 +175,12 @@ var solr_admin = function( app_config )
this.core_regex_base = '^#\\/([\\w\\d-\\.]+)';
+ browser = {
+ locale : null,
+ language : null,
+ country : null
+ };
+
show_global_error = function( error )
{
var main = $( '#main' );
@@ -294,6 +300,24 @@ var solr_admin = function( app_config )
this.run = function()
{
+ var navigator_language = navigator.userLanguage || navigator.language;
+ var language_match = navigator_language.match( /^(\w{2})([-_](\w{2}))?$/ );
+ if( language_match )
+ {
+ if( language_match[1] )
+ {
+ browser.language = language_match[1].toLowerCase();
+ }
+ if( language_match[3] )
+ {
+ browser.country = language_match[3].toUpperCase();
+ }
+ if( language_match[1] && language_match[3] )
+ {
+ browser.locale = browser.language + '_' + browser.country
+ }
+ }
+
$.ajax
(
{
@@ -536,7 +560,23 @@ var solr_admin = function( app_config )
this.format_number = function format_number( number )
{
- return ( number || 0 ).toString().replace( /\B(?=(\d{3})+(?!\d))/g, ' ' );
+ var sep = {
+ 'de_CH' : '\'',
+ 'de' : '.',
+ 'en' : ',',
+ 'es' : '.',
+ 'it' : '.',
+ 'ja' : ',',
+ 'sv' : ' ',
+ 'tr' : '.',
+ '_' : '' // fallback
+ };
+
+ return ( number || 0 ).toString().replace
+ (
+ /\B(?=(\d{3})+(?!\d))/g,
+ sep[ browser.locale ] || sep[ browser.language ] || sep['_']
+ );
};
};