From 81ddd8cbe2276a52ecdf904a02bf1c39ef055a0a Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Fri, 6 Apr 2012 08:13:15 +0000 Subject: [PATCH] SOLR-3329: Dropping getSourceID() from SolrInfoMBean and most of the svn:keywords git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1310219 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 +++ .../handler/clustering/ClusteringComponent.java | 11 ----------- .../handler/dataimport/DataImportHandler.java | 10 ---------- .../dataimport/DataImportHandlerException.java | 1 - .../extraction/ExtractingRequestHandler.java | 12 +----------- .../analysis/NorwegianLightStemFilterFactory.java | 1 - .../NorwegianMinimalStemFilterFactory.java | 1 - .../org/apache/solr/core/RequestHandlers.java | 15 +++------------ .../src/java/org/apache/solr/core/SolrCore.java | 4 ---- .../java/org/apache/solr/core/SolrInfoMBean.java | 2 -- .../solr/handler/BinaryUpdateRequestHandler.java | 10 ---------- .../apache/solr/handler/CSVRequestHandler.java | 10 ---------- .../handler/DocumentAnalysisRequestHandler.java | 10 ---------- .../apache/solr/handler/DumpRequestHandler.java | 10 ---------- .../solr/handler/FieldAnalysisRequestHandler.java | 10 ---------- .../solr/handler/JsonUpdateRequestHandler.java | 10 ---------- .../apache/solr/handler/MoreLikeThisHandler.java | 10 ---------- .../apache/solr/handler/PingRequestHandler.java | 10 ---------- .../apache/solr/handler/RealTimeGetHandler.java | 10 ---------- .../apache/solr/handler/ReplicationHandler.java | 10 ---------- .../apache/solr/handler/RequestHandlerBase.java | 6 ++++-- .../solr/handler/StandardRequestHandler.java | 10 ---------- .../solr/handler/XmlUpdateRequestHandler.java | 10 ---------- .../solr/handler/XsltUpdateRequestHandler.java | 12 ------------ .../apache/solr/handler/admin/AdminHandlers.java | 8 ++------ .../solr/handler/admin/CoreAdminHandler.java | 10 ---------- .../solr/handler/admin/LogLevelHandler.java | 10 ---------- .../solr/handler/admin/LukeRequestHandler.java | 10 ---------- .../solr/handler/admin/PluginInfoHandler.java | 12 ------------ .../handler/admin/PropertiesRequestHandler.java | 10 ---------- .../handler/admin/ShowFileRequestHandler.java | 10 ---------- .../solr/handler/admin/SolrInfoMBeanHandler.java | 11 ----------- .../solr/handler/admin/SystemInfoHandler.java | 10 ---------- .../solr/handler/admin/ThreadDumpHandler.java | 10 ---------- .../solr/handler/component/DebugComponent.java | 10 ---------- .../solr/handler/component/FacetComponent.java | 10 ---------- .../handler/component/HighlightComponent.java | 10 ---------- .../handler/component/MoreLikeThisComponent.java | 10 ---------- .../solr/handler/component/PivotFacetHelper.java | 8 -------- .../solr/handler/component/QueryComponent.java | 10 ---------- .../component/QueryElevationComponent.java | 10 ---------- .../handler/component/RealTimeGetComponent.java | 11 ----------- .../solr/handler/component/SearchComponent.java | 6 ++++-- .../solr/handler/component/SearchHandler.java | 10 ---------- .../handler/component/SpellCheckComponent.java | 10 ---------- .../solr/handler/component/StatsComponent.java | 10 ---------- .../handler/component/TermVectorComponent.java | 10 ---------- .../solr/handler/component/TermsComponent.java | 10 ---------- .../highlight/BreakIteratorBoundaryScanner.java | 11 ----------- .../org/apache/solr/highlight/DefaultEncoder.java | 10 ---------- .../org/apache/solr/highlight/GapFragmenter.java | 10 ---------- .../solr/highlight/HighlightingPluginBase.java | 6 ++++-- .../org/apache/solr/highlight/HtmlEncoder.java | 10 ---------- .../org/apache/solr/highlight/HtmlFormatter.java | 10 ---------- .../apache/solr/highlight/RegexFragmenter.java | 10 ---------- .../highlight/ScoreOrderFragmentsBuilder.java | 10 ---------- .../solr/highlight/SimpleBoundaryScanner.java | 11 ----------- .../solr/highlight/SimpleFragListBuilder.java | 10 ---------- .../solr/highlight/SimpleFragmentsBuilder.java | 10 ---------- .../solr/highlight/SingleFragListBuilder.java | 10 ---------- .../solr/internal/csv/writer/CSVConfig.java | 1 - .../internal/csv/writer/CSVConfigGuesser.java | 1 - .../apache/solr/internal/csv/writer/CSVField.java | 1 - .../solr/internal/csv/writer/CSVWriter.java | 1 - .../java/org/apache/solr/search/FastLRUCache.java | 4 ---- .../src/java/org/apache/solr/search/LFUCache.java | 5 ----- .../src/java/org/apache/solr/search/LRUCache.java | 4 ---- .../apache/solr/search/SolrFieldCacheMBean.java | 3 --- .../org/apache/solr/search/SolrIndexSearcher.java | 4 ---- .../solr/search/function/FileFloatSource.java | 10 ---------- .../apache/solr/update/DirectUpdateHandler2.java | 4 ---- .../org/apache/solr/update/SolrIndexConfig.java | 1 - .../org/apache/solr/util/ConcurrentLFUCache.java | 1 - .../org/apache/solr/BasicFunctionalityTest.java | 4 ---- .../test/org/apache/solr/SolrInfoMBeanTest.java | 5 +++-- .../core/MockQuerySenderListenerReqHandler.java | 12 ------------ .../test/org/apache/solr/core/SolrCoreTest.java | 2 -- .../org/apache/solr/core/TestJmxMonitoredMap.java | 4 ---- .../test/org/apache/solr/search/TestLFUCache.java | 1 - .../solrj/src/java/org/apache/noggit/CharArr.java | 1 - .../src/java/org/apache/noggit/CharUtil.java | 1 - .../src/java/org/apache/noggit/JSONParser.java | 1 - .../src/java/org/apache/noggit/JSONUtil.java | 1 - .../src/java/org/apache/noggit/JSONWriter.java | 1 - .../src/java/org/apache/noggit/ObjectBuilder.java | 1 - .../apache/solr/common/util/TestXMLEscaping.java | 1 - 86 files changed, 24 insertions(+), 603 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index aa5de5e1b0e..93e1f6becc1 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -477,6 +477,9 @@ Other Changes * SOLR-3159: Upgrade example and tests to run with Jetty 8 (ryan) +* SOLR-3329: Dropped getSourceID() from SolrInfoMBean and using + getClass().getPackage().getSpecificationVersion() for Version. (ryan) + Documentation ---------------------- diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java index 0259bb80b62..6f19d52e872 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java @@ -254,19 +254,8 @@ public class ClusteringComponent extends SearchComponent implements SolrCoreAwar return "A Clustering component"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; } - } diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java index 4cdfb422222..32e9b1be477 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java @@ -335,16 +335,6 @@ public class DataImportHandler extends RequestHandlerBase implements return DataImporter.MSG.JMX_DESC; } - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "1.0"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java index 0ffeb2c25c6..49d47cdd30a 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java @@ -22,7 +22,6 @@ package org.apache.solr.handler.dataimport; *

* This API is experimental and subject to change *

- * $Id$ * * @since solr 1.3 */ diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java index d77a81491fd..feeb46b63d5 100644 --- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java +++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java @@ -122,19 +122,9 @@ public class ExtractingRequestHandler extends ContentStreamHandlerBase implement return "Add/Update Rich document"; } - @Override - public String getVersion() { - return "$Revision:$"; - } - - @Override - public String getSourceId() { - return "$Id:$"; - } - @Override public String getSource() { - return "$URL:$"; + return "$URL$"; } } diff --git a/solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java index 26f6dc170ef..b7004000afb 100644 --- a/solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java @@ -30,7 +30,6 @@ import org.apache.lucene.analysis.no.NorwegianLightStemFilter; * <filter class="solr.NorwegianLightStemFilterFactory"/> * </analyzer> * </fieldType> - * @version $Id$ */ public class NorwegianLightStemFilterFactory extends BaseTokenFilterFactory { public TokenStream create(TokenStream input) { diff --git a/solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java index 96ec37609ef..1a1965cb6c7 100644 --- a/solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java @@ -30,7 +30,6 @@ import org.apache.lucene.analysis.no.NorwegianMinimalStemFilter; * <filter class="solr.NorwegianMinimalStemFilterFactory"/> * </analyzer> * </fieldType> - * @version $Id$ */ public class NorwegianMinimalStemFilterFactory extends BaseTokenFilterFactory { public TokenStream create(TokenStream input) { diff --git a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java index 34d481e2970..2a47953e7af 100644 --- a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java +++ b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java @@ -207,7 +207,7 @@ public final class RequestHandlers { * * @since solr 1.2 */ - public static final class LazyRequestHandlerWrapper implements SolrRequestHandler, SolrInfoMBean + public static final class LazyRequestHandlerWrapper implements SolrRequestHandler { private final SolrCore core; private String _className; @@ -279,19 +279,10 @@ public final class RequestHandlers { } public String getVersion() { - String rev = "$Revision$"; - if( _handler != null ) { - rev += " :: " + _handler.getVersion(); - } - return rev; - } - - public String getSourceId() { - String rev = "$Id$"; if( _handler != null ) { - rev += " :: " + _handler.getSourceId(); + return _handler.getVersion(); } - return rev; + return null; } public String getSource() { diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index 88eaad05cf7..10becc42910 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java @@ -1916,10 +1916,6 @@ public final class SolrCore implements SolrInfoMBean { return Category.CORE; } - public String getSourceId() { - return "$Id$"; - } - public String getSource() { return "$URL$"; } diff --git a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java index 4858559b5c2..f5b1bd1b25d 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java +++ b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java @@ -43,8 +43,6 @@ public interface SolrInfoMBean { public String getDescription(); /** Purpose of this Class */ public Category getCategory(); - /** CVS Id, SVN Id, etc */ - public String getSourceId(); /** CVS Source, SVN Source, etc */ public String getSource(); /** diff --git a/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java index 65a05c178f7..0150b73d84c 100644 --- a/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java @@ -146,18 +146,8 @@ public class BinaryUpdateRequestHandler extends ContentStreamHandlerBase { return "Add/Update multiple documents with javabin format"; } - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java index b294e98997e..dc374897042 100755 --- a/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java @@ -59,16 +59,6 @@ public class CSVRequestHandler extends ContentStreamHandlerBase { return "Add/Update multiple documents with CSV formatted rows"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java index dd74fe9dc45..6ef0b9a34f6 100644 --- a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java @@ -120,16 +120,6 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase { return "Provides a breakdown of the analysis process of provided documents"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java index 1d74889afaf..2b974c23678 100644 --- a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java @@ -67,16 +67,6 @@ public class DumpRequestHandler extends RequestHandlerBase return "Dump handler (debug)"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java index d0848272bcf..0731f0be1c4 100644 --- a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java @@ -106,16 +106,6 @@ public class FieldAnalysisRequestHandler extends AnalysisRequestHandlerBase { return "Provide a breakdown of the analysis process of field/query text"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java index 213089d0943..57d2f7d3156 100644 --- a/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java @@ -47,16 +47,6 @@ public class JsonUpdateRequestHandler extends ContentStreamHandlerBase { return "Add documents with JSON"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java index 5c8d8894781..f8f459f7018 100644 --- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java @@ -422,21 +422,11 @@ public class MoreLikeThisHandler extends RequestHandlerBase //////////////////////// SolrInfoMBeans methods ////////////////////// - @Override - public String getVersion() { - return "$Revision$"; - } - @Override public String getDescription() { return "Solr MoreLikeThis"; } - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java index d46beeb7642..12f9776a9a1 100644 --- a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java @@ -82,21 +82,11 @@ public class PingRequestHandler extends RequestHandlerBase //////////////////////// SolrInfoMBeans methods ////////////////////// - @Override - public String getVersion() { - return "$Revision$"; - } - @Override public String getDescription() { return "Reports application health to a load-balancer"; } - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java index a36ef13abfe..2d9a466974a 100644 --- a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java @@ -35,21 +35,11 @@ public class RealTimeGetHandler extends SearchHandler { //////////////////////// SolrInfoMBeans methods ////////////////////// - @Override - public String getVersion() { - return "$Revision$"; - } - @Override public String getDescription() { return "The realtime get handler"; } - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java index 9c80ea6cf4e..11c226f1027 100644 --- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java @@ -494,21 +494,11 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw return "ReplicationHandler provides replication of index and configuration files from Master to Slaves"; } - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; } - @Override - public String getVersion() { - return "$Revision$"; - } - private long[] getIndexVersion() { long version[] = new long[2]; RefCounted searcher = core.getSearcher(); diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java index c5df537b872..0a1f0de07f5 100644 --- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java +++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java @@ -156,9 +156,11 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo } public abstract String getDescription(); - public abstract String getSourceId(); public abstract String getSource(); - public abstract String getVersion(); + + public String getVersion() { + return getClass().getPackage().getSpecificationVersion(); + } public Category getCategory() { return Category.QUERYHANDLER; diff --git a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java index 2489e5d71c6..f94fa091b28 100644 --- a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java @@ -45,21 +45,11 @@ public class StandardRequestHandler extends SearchHandler { //////////////////////// SolrInfoMBeans methods ////////////////////// - @Override - public String getVersion() { - return "$Revision$"; - } - @Override public String getDescription() { return "The standard Solr request handler"; } - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java index 5e0a382b0eb..ae1236818be 100644 --- a/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java @@ -87,16 +87,6 @@ public class XmlUpdateRequestHandler extends ContentStreamHandlerBase { return "Add documents with XML"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java index 1bd17803f18..b70a68b35ff 100644 --- a/solr/core/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java @@ -78,20 +78,8 @@ public class XsltUpdateRequestHandler extends ContentStreamHandlerBase { return "Add documents with XML, transforming with XSLT first"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; } - - } diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java index c863fc0ff36..802d2eb8b76 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java @@ -112,13 +112,9 @@ public class AdminHandlers implements SolrCoreAware, SolrRequestHandler public String getDescription() { return "Register Standard Admin Handlers"; } - + public String getVersion() { - return "$Revision$"; - } - - public String getSourceId() { - return "$Id$"; + return getClass().getPackage().getSpecificationVersion(); } public String getSource() { diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java index 79e19d20681..9664f96bb04 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java @@ -855,16 +855,6 @@ public class CoreAdminHandler extends RequestHandlerBase { return "Manage Multiple Solr Cores"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LogLevelHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LogLevelHandler.java index d72f63be098..944ccd9e65b 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/LogLevelHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/LogLevelHandler.java @@ -391,16 +391,6 @@ public class LogLevelHandler extends RequestHandlerBase { return "Lucene Log Level info"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java index 5598244b62e..9f254a81ced 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java @@ -620,16 +620,6 @@ public class LukeRequestHandler extends RequestHandlerBase return "Lucene Index Browser. Inspired and modeled after Luke: http://www.getopt.org/luke/"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java index c0707dfd49e..3bace1ee697 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java @@ -70,8 +70,6 @@ public class PluginInfoHandler extends RequestHandlerBase info.add( "name", (m.getName() !=null ? m.getName() : na) ); info.add( "version", (m.getVersion() !=null ? m.getVersion() : na) ); info.add( "description", (m.getDescription()!=null ? m.getDescription() : na) ); - - info.add( "sourceId", (m.getSourceId() !=null ? m.getSourceId() : na) ); info.add( "source", (m.getSource() !=null ? m.getSource() : na) ); URL[] urls = m.getDocs(); @@ -99,16 +97,6 @@ public class PluginInfoHandler extends RequestHandlerBase return "Registry"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java index f24ac8d5cb6..0b90530a23d 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java @@ -54,16 +54,6 @@ public class PropertiesRequestHandler extends RequestHandlerBase return "Get System Properties"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java index 96ff9dceece..e7756e1f31c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java @@ -312,16 +312,6 @@ public class ShowFileRequestHandler extends RequestHandlerBase return "Admin Get File -- view config files directly"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java index a0d102d983a..5b3b5fa52db 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java @@ -86,7 +86,6 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase { mBeanInfo.add("class", m.getName()); mBeanInfo.add("version", m.getVersion()); mBeanInfo.add("description", m.getDescription()); - mBeanInfo.add("srcId", m.getSourceId()); mBeanInfo.add("src", m.getSource()); // Use an external form @@ -112,18 +111,8 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase { return "Get Info (and statistics) about all registered SolrInfoMBeans"; } - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java index a06aee12e8e..621c87acefd 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java @@ -285,16 +285,6 @@ public class SystemInfoHandler extends RequestHandlerBase return "Get System Info"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java index 7313be09413..78604251202 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java @@ -136,16 +136,6 @@ public class ThreadDumpHandler extends RequestHandlerBase return "Thread Dump"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java index 6d133bb6990..03d9bd06487 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java @@ -248,16 +248,6 @@ public class DebugComponent extends SearchComponent return "Debug Information"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java index ebf57347842..786f95e1300 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java @@ -591,16 +591,6 @@ public class FacetComponent extends SearchComponent return "Handle Faceting"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java index 206ef300201..6a9489738b4 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java @@ -202,16 +202,6 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni return "Highlighting"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java index 33251f04361..395a6ae4928 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java @@ -116,16 +116,6 @@ public class MoreLikeThisComponent extends SearchComponent return "More Like This"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java index c00add58464..91434016a54 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java @@ -244,15 +244,7 @@ public class PivotFacetHelper // return "Handle Pivot (multi-level) Faceting"; // } // -// public String getSourceId() { -// return "$Id$"; -// } -// // public String getSource() { // return "$URL$"; // } -// -// public String getVersion() { -// return "$Revision$"; -// } } diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java index c42e953a348..7b6fc88f600 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java @@ -999,16 +999,6 @@ public class QueryComponent extends SearchComponent return "query"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java index d0da654e63b..e5a910b7933 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java @@ -460,16 +460,6 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore return "Query Boosting -- boost particular documents for a given query"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java index 014e408a8d9..f6e3beff321 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java @@ -397,16 +397,6 @@ public class RealTimeGetComponent extends SearchComponent return "query"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; @@ -418,7 +408,6 @@ public class RealTimeGetComponent extends SearchComponent } - /////////////////////////////////////////////////////////////////////////////////// // Returns last versions added to index /////////////////////////////////////////////////////////////////////////////////// diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java index 425b7d8c341..339c4a7c198 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java @@ -86,9 +86,11 @@ public abstract class SearchComponent implements SolrInfoMBean, NamedListInitial } public abstract String getDescription(); - public abstract String getSourceId(); public abstract String getSource(); - public abstract String getVersion(); + + public String getVersion() { + return getClass().getPackage().getSpecificationVersion(); + } public Category getCategory() { return Category.OTHER; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java index 6e8e22ec3db..57eb6219662 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java @@ -333,16 +333,6 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware , return sb.toString(); } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java index fee62d1db96..ee7b12d4fc0 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java @@ -654,16 +654,6 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar return "A Spell Checker component"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java index 1f070b1a596..e6ee7c9ccd6 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java @@ -153,16 +153,6 @@ public class StatsComponent extends SearchComponent { return "Calculate Statistics"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java index 5f3d13a5928..009910750f8 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java @@ -412,16 +412,6 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java index feca762bf84..2c1d66433f3 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java @@ -472,16 +472,6 @@ public class TermsComponent extends SearchComponent { } } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java index b28be0c4a2d..c7ffbad548e 100644 --- a/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java +++ b/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java @@ -77,15 +77,4 @@ public class BreakIteratorBoundaryScanner extends SolrBoundaryScanner { public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } - } diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java b/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java index 87ed11ba06a..33ad92f7a9d 100644 --- a/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java +++ b/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java @@ -44,14 +44,4 @@ public class DefaultEncoder extends HighlightingPluginBase implements public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java index eaca4c818ec..d2be75afaf0 100644 --- a/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java +++ b/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java @@ -46,16 +46,6 @@ public class GapFragmenter extends HighlightingPluginBase implements SolrFragmen return "GapFragmenter"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java index 7989bbe2f53..41d92f548c9 100644 --- a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java +++ b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java @@ -49,9 +49,11 @@ public abstract class HighlightingPluginBase implements SolrInfoMBean } public abstract String getDescription(); - public abstract String getSourceId(); public abstract String getSource(); - public abstract String getVersion(); + + public String getVersion() { + return getClass().getPackage().getSpecificationVersion(); + } public Category getCategory() { diff --git a/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java b/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java index 70571ca818e..1557527a704 100644 --- a/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java +++ b/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java @@ -44,14 +44,4 @@ public class HtmlEncoder extends HighlightingPluginBase implements SolrEncoder { public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java b/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java index c8eaa2287cd..f99fb008d38 100644 --- a/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java +++ b/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java @@ -45,16 +45,6 @@ public class HtmlFormatter extends HighlightingPluginBase implements SolrFormatt return "HtmlFormatter"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java index ff48f79fd63..bc272c3c05e 100644 --- a/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java +++ b/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java @@ -93,16 +93,6 @@ public class RegexFragmenter extends HighlightingPluginBase implements SolrFragm return "RegexFragmenter (" + defaultPatternRaw + ")"; } - @Override - public String getVersion() { - return "$Revision$"; - } - - @Override - public String getSourceId() { - return "$Id$"; - } - @Override public String getSource() { return "$URL$"; diff --git a/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java index 6f177bc809c..ada968e747f 100644 --- a/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java @@ -45,14 +45,4 @@ public class ScoreOrderFragmentsBuilder extends SolrFragmentsBuilder { public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java index c1171622f9b..61109b5eb90 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java +++ b/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java @@ -48,15 +48,4 @@ public class SimpleBoundaryScanner extends SolrBoundaryScanner { public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } - } diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java index 5de44128f21..98594877322 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java @@ -46,14 +46,4 @@ public class SimpleFragListBuilder extends HighlightingPluginBase implements public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java index 748e187a661..8c2210b14ab 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java @@ -45,14 +45,4 @@ public class SimpleFragmentsBuilder extends SolrFragmentsBuilder { public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java index b484398f3ec..273c8dc15c9 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java @@ -46,14 +46,4 @@ public class SingleFragListBuilder extends HighlightingPluginBase implements public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } } diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java index b21c770fbd2..85278d5a527 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java @@ -28,7 +28,6 @@ import java.util.List; * The CSVConfig is used to configure the CSV writer * * @author Martin van den Bemt - * @version $Id$ */ public class CSVConfig { diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java index 6b72ae63931..8064c0a1fdc 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java @@ -26,7 +26,6 @@ import java.io.InputStreamReader; * Tries to guess a config based on an InputStream. * * @author Martin van den Bemt - * @version $Id$ */ public class CSVConfigGuesser { diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java index 1cb37fccd89..312964802ab 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java @@ -22,7 +22,6 @@ package org.apache.solr.internal.csv.writer; /** * * @author Martin van den Bemt - * @version $Id$ */ public class CSVField { diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java index 557e00b724a..fd275ee0418 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java @@ -27,7 +27,6 @@ import java.util.Map; * CSVWriter * * @author Martin van den Bemt - * @version $Id$ */ public class CSVWriter { diff --git a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java index b74e2fda79c..70bc1735560 100644 --- a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java +++ b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java @@ -200,10 +200,6 @@ public class FastLRUCache extends SolrCacheBase implements SolrCache { return Category.CACHE; } - public String getSourceId() { - return "$Id$"; - } - public String getSource() { return "$URL$"; } diff --git a/solr/core/src/java/org/apache/solr/search/LFUCache.java b/solr/core/src/java/org/apache/solr/search/LFUCache.java index b314b464252..63754a6a7e2 100644 --- a/solr/core/src/java/org/apache/solr/search/LFUCache.java +++ b/solr/core/src/java/org/apache/solr/search/LFUCache.java @@ -40,7 +40,6 @@ import java.util.concurrent.CopyOnWriteArrayList; *

* This API is experimental and subject to change * - * @version $Id$ * @see org.apache.solr.util.ConcurrentLFUCache * @see org.apache.solr.search.SolrCache * @since solr 3.6 @@ -208,10 +207,6 @@ public class LFUCache implements SolrCache { return Category.CACHE; } - public String getSourceId() { - return "$Id$"; - } - public String getSource() { return "$URL$"; } diff --git a/solr/core/src/java/org/apache/solr/search/LRUCache.java b/solr/core/src/java/org/apache/solr/search/LRUCache.java index ca28444fe5d..cd831e2fbb6 100644 --- a/solr/core/src/java/org/apache/solr/search/LRUCache.java +++ b/solr/core/src/java/org/apache/solr/search/LRUCache.java @@ -226,10 +226,6 @@ public class LRUCache extends SolrCacheBase implements SolrCache { return Category.CACHE; } - public String getSourceId() { - return "$Id$"; - } - public String getSource() { return "$URL$"; } diff --git a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java index 82ef1f043c3..56ecee384bf 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java +++ b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java @@ -46,9 +46,6 @@ public class SolrFieldCacheMBean implements SolrInfoMBean { + "this is **NOT** a cache that is managed by Solr."; } public Category getCategory() { return Category.CACHE; } - public String getSourceId() { - return "$Id$"; - } public String getSource() { return "$URL$"; } diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java index 1048ba1f4a3..5a9312e3c39 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java +++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java @@ -1987,10 +1987,6 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn return Category.CORE; } - public String getSourceId() { - return "$Id$"; - } - public String getSource() { return "$URL$"; } diff --git a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java index d1d869b642c..fba2ca31dac 100755 --- a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java +++ b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java @@ -329,15 +329,5 @@ public class FileFloatSource extends ValueSource { public String getSource() { return "$URL$"; } - - @Override - public String getSourceId() { - return "$Id$"; - } - - @Override - public String getVersion() { - return "$Revision$"; - } } } diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java index 05f60e4a908..ab6e50e4fb3 100644 --- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java +++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java @@ -621,10 +621,6 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState return Category.UPDATEHANDLER; } - public String getSourceId() { - return "$Id$"; - } - public String getSource() { return "$URL$"; } diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java index 18bbf70e41f..8754f176e43 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java @@ -33,7 +33,6 @@ import java.util.List; /** * This config object encapsulates IndexWriter config params, * defined in the <indexConfig> section of solrconfig.xml - * @version $Id$ */ public class SolrIndexConfig { public static final Logger log = LoggerFactory.getLogger(SolrIndexConfig.class); diff --git a/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java b/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java index 680064cbc5f..bbb5964f65d 100644 --- a/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java +++ b/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java @@ -38,7 +38,6 @@ import java.util.concurrent.locks.ReentrantLock; *

* This API is experimental and subject to change * - * @version $Id$ * @since solr 1.6 */ public class ConcurrentLFUCache { diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java index b778000a3a5..8d75abc77cc 100644 --- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java +++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java @@ -283,12 +283,8 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 { @Override public String getDescription() { return tmp; } @Override - public String getSourceId() { return tmp; } - @Override public String getSource() { return tmp; } @Override - public String getVersion() { return tmp; } - @Override public void handleRequestBody ( SolrQueryRequest req, SolrQueryResponse rsp ) { throw new RuntimeException(tmp); diff --git a/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java index ed83863f926..70e7d720bf6 100644 --- a/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java +++ b/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java @@ -64,9 +64,10 @@ public class SolrInfoMBeanTest extends SolrTestCaseJ4 assertNotNull( info.getName() ); assertNotNull( info.getDescription() ); assertNotNull( info.getSource() ); - assertNotNull( info.getSourceId() ); - assertNotNull( info.getVersion() ); assertNotNull( info.getCategory() ); + + // Make sure the URL has the classname in it + //assertTrue(info.getSource(), info.getSource().indexOf(info.getClass().getSimpleName()+".java")>0 ); if( info instanceof LRUCache ) { continue; diff --git a/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java b/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java index 4b351684c23..5561831e614 100644 --- a/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java +++ b/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java @@ -52,24 +52,12 @@ public class MockQuerySenderListenerReqHandler extends RequestHandlerBase { return result; } - @Override - public String getSourceId() { - String result = null; - return result; - } - @Override public String getSource() { String result = null; return result; } - @Override - public String getVersion() { - String result = null; - return result; - } - @Override public NamedList getStatistics() { NamedList lst = super.getStatistics(); diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java index 3731dc65b02..9ac8394fe06 100755 --- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java +++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java @@ -230,6 +230,4 @@ class EmptyRequestHandler extends RequestHandlerBase @Override public String getDescription() { return null; } @Override public String getSource() { return null; } - @Override public String getSourceId() { return null; } - @Override public String getVersion() { return null; } } diff --git a/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java b/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java index 6e4d781cdd6..78ff14f37a6 100644 --- a/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java +++ b/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java @@ -156,10 +156,6 @@ public class TestJmxMonitoredMap extends LuceneTestCase { public NamedList getStatistics() { return null; } - - public String getSourceId() { - return "mock"; - } } } diff --git a/solr/core/src/test/org/apache/solr/search/TestLFUCache.java b/solr/core/src/test/org/apache/solr/search/TestLFUCache.java index 2c513d07f33..e63e10193a5 100644 --- a/solr/core/src/test/org/apache/solr/search/TestLFUCache.java +++ b/solr/core/src/test/org/apache/solr/search/TestLFUCache.java @@ -32,7 +32,6 @@ import java.util.Map; /** * Test for LFUCache * - * @version $Id: TestFastLFUCache.java 1170772 2011-09-14 19:09:56Z sarowe $ * @see org.apache.solr.search.LFUCache * @since solr 3.6 */ diff --git a/solr/solrj/src/java/org/apache/noggit/CharArr.java b/solr/solrj/src/java/org/apache/noggit/CharArr.java index b8115f4b568..c57b72fa11d 100755 --- a/solr/solrj/src/java/org/apache/noggit/CharArr.java +++ b/solr/solrj/src/java/org/apache/noggit/CharArr.java @@ -37,7 +37,6 @@ import java.nio.CharBuffer; /** * @author yonik - * @version $Id: CharArr.java 583538 2007-10-10 16:53:02Z yonik $ */ public class CharArr implements CharSequence, Appendable { protected char[] buf; diff --git a/solr/solrj/src/java/org/apache/noggit/CharUtil.java b/solr/solrj/src/java/org/apache/noggit/CharUtil.java index df122a30cc2..62c8f4edc1e 100755 --- a/solr/solrj/src/java/org/apache/noggit/CharUtil.java +++ b/solr/solrj/src/java/org/apache/noggit/CharUtil.java @@ -20,7 +20,6 @@ package org.apache.noggit; /** * @author yonik - * @version $Id: CharUtil.java 479919 2006-11-28 05:53:55Z yonik $ */ public class CharUtil { diff --git a/solr/solrj/src/java/org/apache/noggit/JSONParser.java b/solr/solrj/src/java/org/apache/noggit/JSONParser.java index f8a4684ea4a..2220dae09da 100755 --- a/solr/solrj/src/java/org/apache/noggit/JSONParser.java +++ b/solr/solrj/src/java/org/apache/noggit/JSONParser.java @@ -22,7 +22,6 @@ import java.io.Reader; /** * @author yonik - * @version $Id: JSONParser.java 1099557 2011-05-04 18:54:26Z yonik $ */ public class JSONParser { diff --git a/solr/solrj/src/java/org/apache/noggit/JSONUtil.java b/solr/solrj/src/java/org/apache/noggit/JSONUtil.java index 9003f8b830a..f24a2765986 100755 --- a/solr/solrj/src/java/org/apache/noggit/JSONUtil.java +++ b/solr/solrj/src/java/org/apache/noggit/JSONUtil.java @@ -19,7 +19,6 @@ package org.apache.noggit; /** * @author yonik - * @version $Id: JSONUtil.java 1209632 2011-12-02 18:48:42Z yonik $ */ public class JSONUtil { diff --git a/solr/solrj/src/java/org/apache/noggit/JSONWriter.java b/solr/solrj/src/java/org/apache/noggit/JSONWriter.java index 18376947536..6c07c0902ef 100755 --- a/solr/solrj/src/java/org/apache/noggit/JSONWriter.java +++ b/solr/solrj/src/java/org/apache/noggit/JSONWriter.java @@ -21,7 +21,6 @@ import java.util.*; /** * @author yonik - * @version $Id: JSONWriter.java 1211150 2011-12-06 21:10:01Z yonik $ */ public class JSONWriter { diff --git a/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java b/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java index 15a5a11b9a8..7b2bc3facca 100644 --- a/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java +++ b/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java @@ -24,7 +24,6 @@ import java.math.BigInteger; /** * @author yonik - * @version $Id$ */ public class ObjectBuilder { diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java b/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java index 0f0901bca9d..eb691b14f87 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java @@ -23,7 +23,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.common.util.XML; /** Test (some of the) character escaping functions of the XML class - * $Id$ */ public class TestXMLEscaping extends LuceneTestCase {