You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2008/02/26 09:19:28 UTC
svn commit: r631124 - in /lucene/solr/trunk/src:
java/org/apache/solr/common/ java/org/apache/solr/core/
java/org/apache/solr/handler/ java/org/apache/solr/request/
java/org/apache/solr/util/ webapp/src/org/apache/solr/servlet/
Author: hossman
Date: Tue Feb 26 00:19:26 2008
New Revision: 631124
URL: http://svn.apache.org/viewvc?rev=631124&view=rev
Log:
SOLR-489 - ading some @deprecation javadoc details
Modified:
lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java
lucene/solr/trunk/src/java/org/apache/solr/core/SolrException.java
lucene/solr/trunk/src/java/org/apache/solr/core/SolrInfoRegistry.java
lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java
lucene/solr/trunk/src/java/org/apache/solr/request/AppendedSolrParams.java
lucene/solr/trunk/src/java/org/apache/solr/request/DefaultSolrParams.java
lucene/solr/trunk/src/java/org/apache/solr/request/MapSolrParams.java
lucene/solr/trunk/src/java/org/apache/solr/request/MultiMapSolrParams.java
lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java
lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java
lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java
lucene/solr/trunk/src/java/org/apache/solr/util/ContentStream.java
lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java
lucene/solr/trunk/src/java/org/apache/solr/util/DOMUtil.java
lucene/solr/trunk/src/java/org/apache/solr/util/IteratorChain.java
lucene/solr/trunk/src/java/org/apache/solr/util/NamedList.java
lucene/solr/trunk/src/java/org/apache/solr/util/SimpleOrderedMap.java
lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/solr/trunk/src/java/org/apache/solr/util/StrUtils.java
lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java
lucene/solr/trunk/src/java/org/apache/solr/util/UpdateParams.java
lucene/solr/trunk/src/java/org/apache/solr/util/XML.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java Tue Feb 26 00:19:26 2008
@@ -74,12 +74,18 @@
logged=true;
}
+ /**
+ * @deprecated Use {@link #SolrException(ErrorCode,String)}.
+ */
@Deprecated
public SolrException(int code, String msg) {
super(msg);
this.code=code;
}
+ /**
+ * @deprecated Use {@link #SolrException(ErrorCode,String,boolean)}.
+ */
@Deprecated
public SolrException(int code, String msg, boolean alreadyLogged) {
super(msg);
@@ -87,6 +93,9 @@
this.logged=alreadyLogged;
}
+ /**
+ * @deprecated Use {@link #SolrException(ErrorCode,String,Throwable,boolean)}.
+ */
@Deprecated
public SolrException(int code, String msg, Throwable th, boolean alreadyLogged) {
super(msg,th);
@@ -94,11 +103,17 @@
logged=alreadyLogged;
}
+ /**
+ * @deprecated Use {@link #SolrException(ErrorCode,String,Throwable)}.
+ */
@Deprecated
public SolrException(int code, String msg, Throwable th) {
this(code,msg,th,true);
}
+ /**
+ * @deprecated Use {@link #SolrException(ErrorCode,Throwable)}.
+ */
@Deprecated
public SolrException(int code, Throwable th) {
super(th);
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrException.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrException.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrException.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrException.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.SolrException
*/
@Deprecated
public class SolrException extends org.apache.solr.common.SolrException {
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrInfoRegistry.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrInfoRegistry.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrInfoRegistry.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrInfoRegistry.java Tue Feb 26 00:19:26 2008
@@ -23,6 +23,8 @@
/**
* @version $Id$
+ *
+ * @deprecated Solr now supports multiple cores and no longer uses a static singleton for SolrCore.
*/
// A Registry to hold a collection of SolrInfo objects
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java Tue Feb 26 00:19:26 2008
@@ -48,8 +48,8 @@
* Check the request parameters and decide if it should commit or optimize.
* If it does, it will check parameters for "waitFlush" and "waitSearcher"
*
- * Use the update processor version
- *
+ * @deprecated Use {@link #handleCommit(UpdateRequestProcessor,SolrParams,boolean)}
+ *
* @since solr 1.2
*/
@Deprecated
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/AppendedSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/AppendedSolrParams.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/AppendedSolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/AppendedSolrParams.java Tue Feb 26 00:19:26 2008
@@ -21,6 +21,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.params.AppendedSolrParams
*/
@Deprecated
public class AppendedSolrParams extends org.apache.solr.common.params.AppendedSolrParams {
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/DefaultSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/DefaultSolrParams.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/DefaultSolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/DefaultSolrParams.java Tue Feb 26 00:19:26 2008
@@ -21,6 +21,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.params.DefaultSolrParams.
*/
@Deprecated
public class DefaultSolrParams extends org.apache.solr.common.params.DefaultSolrParams {
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/MapSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/MapSolrParams.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/MapSolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/MapSolrParams.java Tue Feb 26 00:19:26 2008
@@ -21,6 +21,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.params.MapSolrParams
*/
@Deprecated
public class MapSolrParams extends org.apache.solr.common.params.MapSolrParams {
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/MultiMapSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/MultiMapSolrParams.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/MultiMapSolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/MultiMapSolrParams.java Tue Feb 26 00:19:26 2008
@@ -21,6 +21,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.params.MultiMapSolrParams.
*/
@Deprecated
public class MultiMapSolrParams extends org.apache.solr.common.params.MultiMapSolrParams {
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/RequiredSolrParams.java Tue Feb 26 00:19:26 2008
@@ -21,6 +21,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.params.RequiredSolrParams.
*/
@Deprecated
public class RequiredSolrParams extends org.apache.solr.common.params.RequiredSolrParams {
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/SolrParams.java Tue Feb 26 00:19:26 2008
@@ -23,6 +23,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.params.SolrParams.
*/
@Deprecated
public abstract class SolrParams extends org.apache.solr.common.params.SolrParams
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryRequestBase.java Tue Feb 26 00:19:26 2008
@@ -43,14 +43,29 @@
* @version $Id$
*/
public abstract class SolrQueryRequestBase implements SolrQueryRequest {
+ /**
+ * @deprecated Use org.apache.solr.common.params.CommonParams
+ */
@Deprecated
public static final String QUERY_NAME="q";
+ /**
+ * @deprecated Use org.apache.solr.common.params.CommonParams
+ */
@Deprecated
public static final String START_NAME="start";
+ /**
+ * @deprecated Use org.apache.solr.common.params.CommonParams
+ */
@Deprecated
public static final String ROWS_NAME="rows";
+ /**
+ * @deprecated Use org.apache.solr.common.params.CommonParams
+ */
@Deprecated
public static final String XSL_NAME="xsl";
+ /**
+ * @deprecated Use org.apache.solr.common.params.CommonParams
+ */
@Deprecated
public static final String QUERYTYPE_NAME="qt";
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/ContentStream.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/ContentStream.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/ContentStream.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/ContentStream.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.ContentStream.
*/
@Deprecated
public interface ContentStream extends org.apache.solr.common.util.ContentStream {
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/ContentStreamBase.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.ContentStreamBase
*/
@Deprecated
public abstract class ContentStreamBase extends org.apache.solr.common.util.ContentStreamBase
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/DOMUtil.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/DOMUtil.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/DOMUtil.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/DOMUtil.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.DOMUtil.
*/
@Deprecated
public class DOMUtil extends org.apache.solr.common.util.DOMUtil {
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/IteratorChain.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/IteratorChain.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/IteratorChain.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/IteratorChain.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.IteratorChain<E>.
*/
@Deprecated
public class IteratorChain<E> extends org.apache.solr.common.util.IteratorChain<E> {
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/NamedList.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/NamedList.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/NamedList.java Tue Feb 26 00:19:26 2008
@@ -21,6 +21,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.NamedList<T>.
*/
@Deprecated
public class NamedList<T> extends org.apache.solr.common.util.NamedList<T> {
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/SimpleOrderedMap.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/SimpleOrderedMap.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/SimpleOrderedMap.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/SimpleOrderedMap.java Tue Feb 26 00:19:26 2008
@@ -20,6 +20,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.SimpleOrderedMap<T>.
*/
@Deprecated
public class SimpleOrderedMap<T> extends org.apache.solr.common.util.SimpleOrderedMap<T> {
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java Tue Feb 26 00:19:26 2008
@@ -95,7 +95,11 @@
}
- /** standard param for field list */
+ /**
+ * standard param for field list
+ *
+ * @deprecated Use org.apache.solr.common.params.CommonParams.FL.
+ */
@Deprecated
public static String FL = org.apache.solr.common.params.CommonParams.FL;
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/StrUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/StrUtils.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/StrUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/StrUtils.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.StrUtils.
*/
@Deprecated
public class StrUtils extends org.apache.solr.common.util.StrUtils
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java Tue Feb 26 00:19:26 2008
@@ -142,7 +142,7 @@
* Processes an "update" (add, commit or optimize) and
* returns the response as a String.
*
- * The better approach is to instanciate a Updatehandler directly
+ * @deprecated The better approach is to instantiate an Updatehandler directly
*
* @param xml The XML of the update
* @return The XML response to the update
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/UpdateParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/UpdateParams.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/UpdateParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/UpdateParams.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.params.UpdateParams.
*/
@Deprecated
public interface UpdateParams extends org.apache.solr.common.params.UpdateParams
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/XML.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/XML.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/XML.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/XML.java Tue Feb 26 00:19:26 2008
@@ -19,6 +19,8 @@
/**
* This class is scheduled for deletion. Please update your code to the moved package.
+ *
+ * @deprecated Use org.apache.solr.common.util.XML.
*/
@Deprecated
public class XML extends org.apache.solr.common.util.XML {
Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java?rev=631124&r1=631123&r2=631124&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java Tue Feb 26 00:19:26 2008
@@ -31,6 +31,8 @@
/**
* @version $Id$
+ *
+ * @deprecated Register a request handler to /update rather then use this servlet. Add: <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" > to your solrconfig.xml
*/
@Deprecated
public class SolrUpdateServlet extends HttpServlet {