diff --git a/src/java/org/apache/solr/core/Config.java b/src/java/org/apache/solr/core/Config.java index fd48d5f6721..72c5c9d9abb 100644 --- a/src/java/org/apache/solr/core/Config.java +++ b/src/java/org/apache/solr/core/Config.java @@ -193,7 +193,7 @@ public class Config { private static final String project = "solr"; private static final String base = "org.apache" + "." + project; - private static final String[] packages = {"","analysis.","schema.","search.","update.","core.","request.","handler.","util."}; + private static final String[] packages = {"","analysis.","schema.","handler.","search.","update.","core.","request.","util."}; public static Class findClass(String cname, String... subpackages) { ClassLoader loader = getClassLoader(); diff --git a/src/java/org/apache/solr/core/SolrException.java b/src/java/org/apache/solr/core/SolrException.java new file mode 100644 index 00000000000..623e6e2f604 --- /dev/null +++ b/src/java/org/apache/solr/core/SolrException.java @@ -0,0 +1,45 @@ +/** + * 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. + */ + +package org.apache.solr.core; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class SolrException extends org.apache.solr.common.SolrException { + + public SolrException(ErrorCode code, String msg, boolean alreadyLogged) { + super(code, msg, alreadyLogged); + } + + public SolrException(ErrorCode code, String msg, Throwable th, boolean alreadyLogged) { + super(code, msg, th, alreadyLogged); + } + + public SolrException(ErrorCode code, String msg, Throwable th) { + super(code, msg, th); + } + + public SolrException(ErrorCode code, Throwable th) { + super(code, th); + } + + public SolrException(ErrorCode code, String msg) { + super(code, msg); + } +} diff --git a/src/java/org/apache/solr/request/AppendedSolrParams.java b/src/java/org/apache/solr/request/AppendedSolrParams.java new file mode 100644 index 00000000000..d6a36c87895 --- /dev/null +++ b/src/java/org/apache/solr/request/AppendedSolrParams.java @@ -0,0 +1,31 @@ +/** + * 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. + */ + +package org.apache.solr.request; + +import org.apache.solr.common.params.SolrParams; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class AppendedSolrParams extends org.apache.solr.common.params.AppendedSolrParams { + // Don't use this class + public AppendedSolrParams(SolrParams main, SolrParams extra) { + super(main, extra); + } +} diff --git a/src/java/org/apache/solr/request/DefaultSolrParams.java b/src/java/org/apache/solr/request/DefaultSolrParams.java new file mode 100644 index 00000000000..d815e2d91b8 --- /dev/null +++ b/src/java/org/apache/solr/request/DefaultSolrParams.java @@ -0,0 +1,31 @@ +/** + * 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. + */ + +package org.apache.solr.request; + +import org.apache.solr.common.params.SolrParams; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class DefaultSolrParams extends org.apache.solr.common.params.DefaultSolrParams { + // Don't use this class + public DefaultSolrParams(SolrParams main, SolrParams extra) { + super(main, extra); + } +} diff --git a/src/java/org/apache/solr/request/DisMaxRequestHandler.java b/src/java/org/apache/solr/request/DisMaxRequestHandler.java new file mode 100644 index 00000000000..4cea38f4d92 --- /dev/null +++ b/src/java/org/apache/solr/request/DisMaxRequestHandler.java @@ -0,0 +1,26 @@ +/** + * 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. + */ + +package org.apache.solr.request; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class DisMaxRequestHandler extends org.apache.solr.handler.DisMaxRequestHandler { + // Don't use this class +} diff --git a/src/java/org/apache/solr/request/MapSolrParams.java b/src/java/org/apache/solr/request/MapSolrParams.java new file mode 100644 index 00000000000..b03d06ea392 --- /dev/null +++ b/src/java/org/apache/solr/request/MapSolrParams.java @@ -0,0 +1,31 @@ +/** + * 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. + */ + +package org.apache.solr.request; + +import java.util.Map; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class MapSolrParams extends org.apache.solr.common.params.MapSolrParams { + + public MapSolrParams(Map map) { + super(map); + } +} diff --git a/src/java/org/apache/solr/request/MultiMapSolrParams.java b/src/java/org/apache/solr/request/MultiMapSolrParams.java new file mode 100644 index 00000000000..4fceaa6f35c --- /dev/null +++ b/src/java/org/apache/solr/request/MultiMapSolrParams.java @@ -0,0 +1,30 @@ +/** + * 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. + */ + +package org.apache.solr.request; + +import java.util.Map; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class MultiMapSolrParams extends org.apache.solr.common.params.MultiMapSolrParams { + public MultiMapSolrParams(Map map) { + super(map); + } +} diff --git a/src/java/org/apache/solr/request/RequiredSolrParams.java b/src/java/org/apache/solr/request/RequiredSolrParams.java new file mode 100644 index 00000000000..8e843b20ee6 --- /dev/null +++ b/src/java/org/apache/solr/request/RequiredSolrParams.java @@ -0,0 +1,31 @@ +/** + * 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. + */ + +package org.apache.solr.request; + +import org.apache.solr.common.params.SolrParams; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class RequiredSolrParams extends org.apache.solr.common.params.RequiredSolrParams { + + public RequiredSolrParams(SolrParams params) { + super(params); + } +} diff --git a/src/java/org/apache/solr/request/SolrParams.java b/src/java/org/apache/solr/request/SolrParams.java new file mode 100644 index 00000000000..20dc184b244 --- /dev/null +++ b/src/java/org/apache/solr/request/SolrParams.java @@ -0,0 +1,35 @@ +/** + * 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. + */ + +package org.apache.solr.request; + + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public abstract class SolrParams extends org.apache.solr.common.params.SolrParams { + +} + + + + + + + + diff --git a/src/java/org/apache/solr/request/StandardRequestHandler.java b/src/java/org/apache/solr/request/StandardRequestHandler.java new file mode 100644 index 00000000000..3745af994ed --- /dev/null +++ b/src/java/org/apache/solr/request/StandardRequestHandler.java @@ -0,0 +1,26 @@ +/** + * 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. + */ + +package org.apache.solr.request; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class StandardRequestHandler extends org.apache.solr.handler.StandardRequestHandler { + // Don't use this class +} diff --git a/src/java/org/apache/solr/util/CommonParams.java b/src/java/org/apache/solr/util/CommonParams.java new file mode 100644 index 00000000000..e0bc9269fd0 --- /dev/null +++ b/src/java/org/apache/solr/util/CommonParams.java @@ -0,0 +1,27 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class CommonParams extends org.apache.solr.common.params.CommonParams { + +} + diff --git a/src/java/org/apache/solr/util/ContentStream.java b/src/java/org/apache/solr/util/ContentStream.java new file mode 100644 index 00000000000..6dea7686e12 --- /dev/null +++ b/src/java/org/apache/solr/util/ContentStream.java @@ -0,0 +1,26 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public interface ContentStream extends org.apache.solr.common.util.ContentStream { + +} diff --git a/src/java/org/apache/solr/util/ContentStreamBase.java b/src/java/org/apache/solr/util/ContentStreamBase.java new file mode 100644 index 00000000000..8346c75d6e8 --- /dev/null +++ b/src/java/org/apache/solr/util/ContentStreamBase.java @@ -0,0 +1,27 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public abstract class ContentStreamBase extends org.apache.solr.common.util.ContentStreamBase +{ + +} diff --git a/src/java/org/apache/solr/util/DOMUtil.java b/src/java/org/apache/solr/util/DOMUtil.java new file mode 100644 index 00000000000..c519996e88d --- /dev/null +++ b/src/java/org/apache/solr/util/DOMUtil.java @@ -0,0 +1,26 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class DOMUtil extends org.apache.solr.common.util.DOMUtil { + +} diff --git a/src/java/org/apache/solr/util/DisMaxParams.java b/src/java/org/apache/solr/util/DisMaxParams.java new file mode 100644 index 00000000000..05a3a9d7b71 --- /dev/null +++ b/src/java/org/apache/solr/util/DisMaxParams.java @@ -0,0 +1,26 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class DisMaxParams extends org.apache.solr.common.params.DisMaxParams { + +} diff --git a/src/java/org/apache/solr/util/IteratorChain.java b/src/java/org/apache/solr/util/IteratorChain.java new file mode 100644 index 00000000000..9a44a810320 --- /dev/null +++ b/src/java/org/apache/solr/util/IteratorChain.java @@ -0,0 +1,26 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class IteratorChain extends org.apache.solr.common.util.IteratorChain { + +} diff --git a/src/java/org/apache/solr/util/NamedList.java b/src/java/org/apache/solr/util/NamedList.java new file mode 100644 index 00000000000..7ea9e6e5072 --- /dev/null +++ b/src/java/org/apache/solr/util/NamedList.java @@ -0,0 +1,34 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +import java.util.List; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class NamedList extends org.apache.solr.common.util.NamedList { + public NamedList() { + super(); + } + + public NamedList(List nameValuePairs) { + super(nameValuePairs); + } +} diff --git a/src/java/org/apache/solr/util/SimpleOrderedMap.java b/src/java/org/apache/solr/util/SimpleOrderedMap.java new file mode 100644 index 00000000000..19c418711f5 --- /dev/null +++ b/src/java/org/apache/solr/util/SimpleOrderedMap.java @@ -0,0 +1,34 @@ +/** + * 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. + */ +package org.apache.solr.util; + +import java.util.List; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class SimpleOrderedMap extends org.apache.solr.common.util.SimpleOrderedMap { + + public SimpleOrderedMap() { + super(); + } + + public SimpleOrderedMap(List nameValuePairs) { + super(nameValuePairs); + } +} diff --git a/src/java/org/apache/solr/util/XML.java b/src/java/org/apache/solr/util/XML.java new file mode 100644 index 00000000000..de2820599ca --- /dev/null +++ b/src/java/org/apache/solr/util/XML.java @@ -0,0 +1,26 @@ +/** + * 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. + */ + +package org.apache.solr.util; + +/** + * This class is scheduled for deletion. Please update your code to the moved package. + */ +@Deprecated +public class XML extends org.apache.solr.common.util.XML { + +}