You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2018/01/30 12:59:02 UTC
[1/3] lucene-solr:master: SOLR-11926: correct/extend
TermsComponentTest.testUnlimitedRows logic
Repository: lucene-solr
Updated Branches:
refs/heads/master e2a5d46b9 -> d940a0ef7
SOLR-11926: correct/extend TermsComponentTest.testUnlimitedRows logic
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a2960923
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a2960923
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a2960923
Branch: refs/heads/master
Commit: a296092341ac7c1fb968d993870b9ed6f67cd27b
Parents: e2a5d46
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Jan 30 12:33:04 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Jan 30 12:33:04 2018 +0000
----------------------------------------------------------------------
.../apache/solr/handler/component/TermsComponentTest.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2960923/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
index 4b1248e..adaf26d 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
@@ -104,11 +104,17 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
public void testUnlimitedRows() throws Exception {
assertQ(req("indent","true", "qt","/terms", "terms","true",
"terms.fl","lowerfilt",
- "terms.fl","standardfilt",
- "terms.rows","-1")
+ "terms.fl","standardfilt")
,"count(//lst[@name='lowerfilt']/*)=9"
,"count(//lst[@name='standardfilt']/*)=10"
);
+ assertQ(req("indent","true", "qt","/terms", "terms","true",
+ "terms.fl","lowerfilt",
+ "terms.fl","standardfilt",
+ "terms.limit","-1")
+ ,"count(//lst[@name='lowerfilt']/*)=9"
+ ,"count(//lst[@name='standardfilt']/*)=16"
+ );
}
[3/3] lucene-solr:master: Update copyright year(s) in
lucene/NOTICE.txt and solr/NOTICE.txt files.
Posted by cp...@apache.org.
Update copyright year(s) in lucene/NOTICE.txt and solr/NOTICE.txt files.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d940a0ef
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d940a0ef
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d940a0ef
Branch: refs/heads/master
Commit: d940a0ef776e3a5f0104001c86f31003515d0251
Parents: abf3d11
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Jan 30 12:58:12 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Jan 30 12:58:12 2018 +0000
----------------------------------------------------------------------
lucene/NOTICE.txt | 2 +-
solr/NOTICE.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d940a0ef/lucene/NOTICE.txt
----------------------------------------------------------------------
diff --git a/lucene/NOTICE.txt b/lucene/NOTICE.txt
index 7e0c54e..e25c211 100644
--- a/lucene/NOTICE.txt
+++ b/lucene/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Lucene
-Copyright 2001-2017 The Apache Software Foundation
+Copyright 2001-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d940a0ef/solr/NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt
index 0dee359..fd954f4 100644
--- a/solr/NOTICE.txt
+++ b/solr/NOTICE.txt
@@ -1,6 +1,6 @@
==============================================================
Apache Solr
- Copyright 2006-2017 The Apache Software Foundation
+ Copyright 2006-2018 The Apache Software Foundation
==============================================================
This product includes software developed at
@@ -119,7 +119,7 @@ parrt@antlr.org
=========================================================================
Apache Lucene
-Copyright 2001-2017 The Apache Software Foundation
+Copyright 2001-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[2/3] lucene-solr:master: SOLR-11480: Remove unused "Admin Extra"
files and mentions. (Eric Pugh, Christine Poerschke)
Posted by cp...@apache.org.
SOLR-11480: Remove unused "Admin Extra" files and mentions. (Eric Pugh, Christine Poerschke)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/abf3d113
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/abf3d113
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/abf3d113
Branch: refs/heads/master
Commit: abf3d113329b1e61861c272d9fb598beb3d1cded
Parents: a296092
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Jan 30 12:39:44 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Jan 30 12:39:44 2018 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../conf/solrconfig-analytics-query.xml | 2 +-
.../conf/solrconfig-collapseqparser.xml | 2 +-
.../conf/solrconfig-components-name.xml | 2 +-
.../collection1/conf/solrconfig-elevate.xml | 2 +-
.../conf/solrconfig-plugcollector.xml | 2 +-
.../collection1/conf/solrconfig-test-misc.xml | 2 +-
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/db/conf/admin-extra.html | 24 -------------------
.../solr/db/conf/admin-extra.menu-bottom.html | 25 --------------------
.../solr/db/conf/admin-extra.menu-top.html | 25 --------------------
.../example-DIH/solr/mail/conf/admin-extra.html | 24 -------------------
.../solr/mail/conf/admin-extra.menu-bottom.html | 25 --------------------
.../solr/mail/conf/admin-extra.menu-top.html | 25 --------------------
.../example-DIH/solr/solr/conf/admin-extra.html | 24 -------------------
.../solr/solr/conf/admin-extra.menu-bottom.html | 25 --------------------
.../solr/solr/conf/admin-extra.menu-top.html | 25 --------------------
.../conf/admin-extra.html | 24 -------------------
.../conf/admin-extra.menu-bottom.html | 25 --------------------
.../conf/admin-extra.menu-top.html | 25 --------------------
.../solr-ref-guide/src/core-specific-tools.adoc | 2 --
.../web/js/angular/controllers/core-overview.js | 4 ----
23 files changed, 10 insertions(+), 310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 27ccc4c..1ce9e88 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -240,6 +240,8 @@ Other Changes
* SOLR-11658: Upgrade ZooKeeper dependency to 3.4.11 (Jason Gerlowski, Steve Rowe, Erick Erickson)
+* SOLR-11480: Remove unused "Admin Extra" files and mentions. (Eric Pugh, Christine Poerschke)
+
================== 7.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
index faffeb8..4b2ee8e 100644
--- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
@@ -185,7 +185,7 @@
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<!-- test getting system property -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
index b967c0d..bf2f86d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
@@ -232,7 +232,7 @@ based HashBitset. -->
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<!-- test getting system property -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
index 1edaa86..840a182 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
@@ -234,7 +234,7 @@ based HashBitset. -->
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<!-- test getting system property -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
index 8d311dd..4c54a6e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
@@ -61,7 +61,7 @@
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<searchComponent name="component1" class="org.apache.solr.search.MockSearchComponent">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
index 1c8e10f..2a2a982 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
@@ -142,7 +142,7 @@
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<!-- test getting system property -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
index 25071a5..56f8a01 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
@@ -450,7 +450,7 @@ based HashBitset. -->
</requestDispatcher>
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<!-- test getting system property -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
index dc7bb66..afd5954 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
@@ -31,7 +31,7 @@
<!-- see TestConfig.testAutomaticDeprecationSupport -->
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<!-- see TestConfig.testLib() -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index 3393f9f..413e669 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -463,7 +463,7 @@
<admin>
<defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
+ <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
<!-- test getting system property -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/db/conf/admin-extra.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/admin-extra.html b/solr/example/example-DIH/solr/db/conf/admin-extra.html
deleted file mode 100644
index fecab20..0000000
--- a/solr/example/example-DIH/solr/db/conf/admin-extra.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to
-see there the content will show up.
-
-<img src="img/ico/construction.png"> This line will appear at the top-
-right box on collection1's Overview
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html
deleted file mode 100644
index 3359a46..0000000
--- a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-bottom.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- LAST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html
deleted file mode 100644
index 0886cee..0000000
--- a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-top.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- FIRST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/mail/conf/admin-extra.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/admin-extra.html b/solr/example/example-DIH/solr/mail/conf/admin-extra.html
deleted file mode 100644
index fecab20..0000000
--- a/solr/example/example-DIH/solr/mail/conf/admin-extra.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to
-see there the content will show up.
-
-<img src="img/ico/construction.png"> This line will appear at the top-
-right box on collection1's Overview
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html
deleted file mode 100644
index 3359a46..0000000
--- a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-bottom.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- LAST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html
deleted file mode 100644
index 0886cee..0000000
--- a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-top.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- FIRST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/solr/conf/admin-extra.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/admin-extra.html b/solr/example/example-DIH/solr/solr/conf/admin-extra.html
deleted file mode 100644
index fecab20..0000000
--- a/solr/example/example-DIH/solr/solr/conf/admin-extra.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to
-see there the content will show up.
-
-<img src="img/ico/construction.png"> This line will appear at the top-
-right box on collection1's Overview
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html
deleted file mode 100644
index 3359a46..0000000
--- a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-bottom.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- LAST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html
deleted file mode 100644
index 0886cee..0000000
--- a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-top.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- FIRST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
deleted file mode 100644
index fecab20..0000000
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to
-see there the content will show up.
-
-<img src="img/ico/construction.png"> This line will appear at the top-
-right box on collection1's Overview
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
deleted file mode 100644
index 3359a46..0000000
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-bottom.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- LAST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
deleted file mode 100644
index 0886cee..0000000
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-top.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- FIRST ITEM
- </a>
-</li>
--->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/solr-ref-guide/src/core-specific-tools.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/core-specific-tools.adoc b/solr/solr-ref-guide/src/core-specific-tools.adoc
index 42b15f7..16c31c4 100644
--- a/solr/solr-ref-guide/src/core-specific-tools.adoc
+++ b/solr/solr-ref-guide/src/core-specific-tools.adoc
@@ -23,8 +23,6 @@ In the left-hand navigation bar, you will see a pull-down menu titled "Core Sele
When you select a core from the pull-down, the main display of the page will show some basic metadata about the core, and a secondary menu will appear in the left nav with links to additional core specific administration screens.
-You can also define a configuration file called `admin-extra.html` that includes links or other information you would like to display in the "Admin Extra" part of this main screen.
-
.Core overview screen
image::images/core-specific-tools/core_dashboard.png[image,width=515,height=250]
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abf3d113/solr/webapp/web/js/angular/controllers/core-overview.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/core-overview.js b/solr/webapp/web/js/angular/controllers/core-overview.js
index b11329c..0e2b3d2 100644
--- a/solr/webapp/web/js/angular/controllers/core-overview.js
+++ b/solr/webapp/web/js/angular/controllers/core-overview.js
@@ -42,9 +42,6 @@ function($scope, $rootScope, $routeParams, Luke, CoreSystem, Update, Replication
});
};
- $scope.refreshAdminExtra = function() {
- };
-
$scope.refreshSystem = function() {
CoreSystem.get({core: $routeParams.core},
function(data) {
@@ -87,7 +84,6 @@ function($scope, $rootScope, $routeParams, Luke, CoreSystem, Update, Replication
$scope.refresh = function() {
$scope.refreshIndex();
$scope.refreshReplication();
- $scope.refreshAdminExtra();
$scope.refreshSystem();
$scope.refreshPing();
};