Author: ivol37 at gmail.com
Date: Mon Jan 31 12:24:47 2011
New Revision: 725
Log:
Added:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/RestHttpProxyImpl.java
- copied, changed from r716,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/RestHttpProxyImpl.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/SolrRestServiceImpl.java
- copied, changed from r724,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrRestServiceImpl.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/
- copied from r716,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrIndexBean.java
- copied, changed from r724,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrIndexBean.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrSearchResultBean.java
- copied, changed from r724,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrSearchResultBean.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/util/
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/util/SolrUtil.java
- copied, changed from r716,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrUtil.java
Removed:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrService.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/RestHttpProxyImpl.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrDispatchFilter.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrRestServiceImpl.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrTest.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrUtil.java
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpProxy.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpResponse.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrApi.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrRestService.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrApiImpl.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrConfigurationImpl.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrDaemonServiceImpl.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/osgi/Activator.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrErrorBean.java
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrTenantIndicesBean.java
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpProxy.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpProxy.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpProxy.java
Mon Jan 31 12:24:47 2011
@@ -19,9 +19,27 @@
import java.io.IOException;
import java.io.InputStream;
+/**
+ * Provides a REST HTTP Proxy for invoking REST services. This is a utility
class, useful since
+ * Solr only exposes a REST interface. It should be moved to a generic bundle
however.
+ *
+ * @author ivol
+ */
public interface RestHttpProxy {
+ /**
+ * Invokes a GET request to a REST service.
+ * @param url URL of the REST service to invoke
+ * @return The response of the REST service being invoked
+ * @throws IOException In case a IO exception occurred
+ */
RestHttpResponse invokeGET(String url) throws IOException;
+ /**
+ * Invokes a PUT request to a REST service.
+ * @param url URL of the REST service to invoke
+ * @return The response of the REST service being invoked
+ * @throws IOException In case a IO exception occurred
+ */
RestHttpResponse invokePUT(String url) throws IOException;
/**
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpResponse.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpResponse.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/RestHttpResponse.java
Mon Jan 31 12:24:47 2011
@@ -16,6 +16,13 @@
*/
package org.amdatu.searchandindex.solr;
+/**
+ * This class represents the response a REST service being invoked by the
RestHttpProxy.
+ * it is a utility class which is useful using Solr since it only exposes a
REST service.
+ * It should be moved to a generic bundle however.
+ *
+ * @author ivol
+ */
public class RestHttpResponse {
private int m_statuscode;
private String m_body;
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrApi.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrApi.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrApi.java
Mon Jan 31 12:24:47 2011
@@ -27,7 +27,27 @@
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrInputDocument;
+/**
+ * This class represents a Java Solr API, a little wrapper around the Solrj
API. It is invoked by the
+ * REST service to separate HTTP logic from the Solr logic. Currently this API
is in an exported package,
+ * but in the end this interface will be moved to a private package since this
bundle will only
+ * expose a REST interface.
+ * The Solr API methods take tenants and indices as arguments and hides the
"core" concept, internally
+ * used by Solr.
+ *
+ * @author ivol
+ */
public interface SolrApi {
+ /**
+ * PID for the Solr configuration.
+ */
+ final String PID = "org.amdatu.searchandindex.solr";
+
+ /**
+ * Configuration key for the working directory to use for Solr
+ */
+ final String CONFIG_WORKDIR = "workdir";
+
void updateIndex(Tenant tenant, String index, List<SolrInputDocument>
solrDocuments) throws XMLStreamException, SolrServerException, IOException;
QueryResponse queryIndex(Tenant tenant, String index, String query) throws
SolrServerException;
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrRestService.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrRestService.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/SolrRestService.java
Mon Jan 31 12:24:47 2011
@@ -16,6 +16,14 @@
*/
package org.amdatu.searchandindex.solr;
+/**
+ * This interface represents the REST interface of the Solr bundle. Note that
the interface
+ * doesn't contain any methods, as the service should be invoked using REST
over HTTP.
+ * The sole purpose of this interface is to allow services to define a service
dependency
+ * on the availability of this REST service.
+ *
+ * @author ivol
+ */
public interface SolrRestService {
}
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrApiImpl.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrApiImpl.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrApiImpl.java
Mon Jan 31 12:24:47 2011
@@ -22,13 +22,10 @@
import java.io.InputStream;
import java.io.PrintWriter;
import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
-import javax.servlet.Filter;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -40,8 +37,7 @@
import org.amdatu.core.tenant.Tenant;
import org.amdatu.searchandindex.solr.SolrApi;
-import org.amdatu.searchandindex.solr.osgi.Activator;
-import org.apache.felix.dm.DependencyManager;
+import org.amdatu.searchandindex.solr.util.SolrUtil;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
@@ -67,7 +63,6 @@
import org.apache.solr.servlet.SolrRequestParsers;
import org.apache.solr.servlet.cache.HttpCacheHeaderUtil;
import org.apache.solr.servlet.cache.Method;
-import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -78,7 +73,6 @@
// Service dependencies injected by the dependency manager
private volatile LogService m_logService;
private volatile SolrConfiguration m_solrConfig;
- private volatile DependencyManager m_depManager;
// Private members
private CoreContainer m_coreContainer;
@@ -88,18 +82,6 @@
m_solrConfig = solrConfig;
}
- public void init() {
- Dictionary<String, Object> properties = new Hashtable<String,
Object>();
- properties.put("pattern", ".*");
- properties.put(Constants.SERVICE_RANKING, 0);
- properties.put("contextId", Activator.RESOURCE_ID);
- SolrDispatchFilter filter = new SolrDispatchFilter(m_coreContainer);
- m_depManager.add(m_depManager.createComponent()
- .setInterface(Filter.class.getName(), properties)
- .setImplementation(filter)
- );
- }
-
public void start() throws IOException, ParserConfigurationException,
SAXException {
loadCores();
}
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrConfigurationImpl.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrConfigurationImpl.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrConfigurationImpl.java
Mon Jan 31 12:24:47 2011
@@ -26,17 +26,18 @@
import java.util.Dictionary;
import org.amdatu.core.config.templates.ConfigTemplateManager;
-import org.amdatu.searchandindex.solr.SolrService;
+import org.amdatu.searchandindex.solr.SolrApi;
+import org.amdatu.searchandindex.solr.util.SolrUtil;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
/**
- * This class is responsible for management of Solr configuration files. The
default Solr configuation
+ * This class is responsible for management of Solr configuration files. The
default Solr configuration
* files are copied to solr/conf upon first startup. Whenever a new core is
added to Solr, these
* configuration files are copied to the new cores. If the configuration files
are changed in this directory,
- * new cores will be created with this new configruation.
+ * new cores will be created with this new configuration.
*
* @author ivol
*/
@@ -69,11 +70,11 @@
@SuppressWarnings("unchecked")
public void updated(Dictionary dictionary) throws ConfigurationException {
if (dictionary != null) {
- if (dictionary.get(SolrService.CONFIG_WORKDIR) == null) {
- throw new ConfigurationException("Missing configuration key",
SolrService.CONFIG_WORKDIR);
+ if (dictionary.get(SolrApi.CONFIG_WORKDIR) == null) {
+ throw new ConfigurationException("Missing configuration key",
SolrApi.CONFIG_WORKDIR);
}
File workBaseDir = new File(System.getProperty("user.dir"),
"work");
- m_workDir = new File(workBaseDir, (String)
dictionary.get(SolrService.CONFIG_WORKDIR));
+ m_workDir = new File(workBaseDir, (String)
dictionary.get(SolrApi.CONFIG_WORKDIR));
}
}
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrDaemonServiceImpl.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrDaemonServiceImpl.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrDaemonServiceImpl.java
Mon Jan 31 12:24:47 2011
@@ -22,20 +22,18 @@
import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.searchandindex.solr.SolrApi;
import org.amdatu.searchandindex.solr.SolrRestService;
-import org.amdatu.searchandindex.solr.SolrService;
+import org.amdatu.searchandindex.solr.rest.SolrRestServiceImpl;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ServiceDependency;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.SolrConfig;
-import org.apache.solr.core.SolrCore;
import org.osgi.service.log.LogService;
/**
* Implementation of the {@link SolrService} interface.
*/
-public class SolrDaemonServiceImpl implements SolrService {
+public class SolrDaemonServiceImpl {
// Services injected by the Felix dependency manager
private volatile LogService m_logService;
private volatile DependencyManager m_dependencyManager;
@@ -60,42 +58,7 @@
}
private void startSolrDaemon() throws Exception {
- // Save the current context classloader first
- final ClassLoader contextClassLoader =
Thread.currentThread().getContextClassLoader();
- try {
-
- // overwrite the context classloader, restore it later
- final ClassLoader classLoader = this.getClass().getClassLoader();
- Thread.currentThread().setContextClassLoader(classLoader);
-
- // Create the core initializer
- boolean abortOnConfigurationError = true;
- //CoreContainer.Initializer init = new CoreContainer.Initializer();
- m_coreContainer = new CoreContainer(); //init.initialize();
- /* abortOnConfigurationError = init.isAbortOnConfigurationError();
-
- // Optionally abort if we found a sever error
- if (abortOnConfigurationError && SolrConfig.severeErrors.size() >
0) {
- StringBuffer sb = new StringBuffer();
- sb.append("Severe errors in solr configuration.\n");
- sb.append("Check your log files for more detailed information
on what may be wrong.\n");
- sb.append("If you want solr to continue after configuration
errors, change: \n");
- sb.append("
<abortOnConfigurationError>false</abortOnConfigurationError>\n");
- sb.append("in " + init.getSolrConfigFilename() + "\n");
- for (Throwable t : SolrConfig.severeErrors) {
-
sb.append("-------------------------------------------------------------\n");
- sb.append(t.toString());
- }
- }*/
- } catch (Exception e) {
- SolrConfig.severeErrors.add(e);
- SolrCore.log(e);
- m_logService.log(LogService.LOG_ERROR, "Failed to initialize
Solr", e);
- throw e;
- } finally {
- // Restore classloader
- Thread.currentThread().setContextClassLoader(contextClassLoader);
- }
+ m_coreContainer = new CoreContainer();
}
// Register the Solr API
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/osgi/Activator.java
==============================================================================
---
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/osgi/Activator.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/osgi/Activator.java
Mon Jan 31 12:24:47 2011
@@ -20,13 +20,10 @@
import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.searchandindex.solr.RestHttpProxy;
import org.amdatu.searchandindex.solr.SolrApi;
-import org.amdatu.searchandindex.solr.SolrRestService;
-import org.amdatu.searchandindex.solr.SolrService;
-import org.amdatu.searchandindex.solr.impl.RestHttpProxyImpl;
import org.amdatu.searchandindex.solr.impl.SolrConfiguration;
import org.amdatu.searchandindex.solr.impl.SolrConfigurationImpl;
import org.amdatu.searchandindex.solr.impl.SolrDaemonServiceImpl;
-import org.amdatu.searchandindex.solr.impl.SolrTest;
+import org.amdatu.searchandindex.solr.rest.RestHttpProxyImpl;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
@@ -47,13 +44,6 @@
public void init(BundleContext context, DependencyManager manager) throws
Exception {
// Create and register the Solr service.
manager.add(createComponent()
- .setImplementation(SolrTest.class)
-
.add(createServiceDependency().setService(SolrRestService.class).setRequired(true))
-
.add(createServiceDependency().setService(SolrApi.class).setRequired(true))
-
.add(createServiceDependency().setService(TenantManagementService.class).setRequired(true)));
-
- // Create and register the Solr service.
- manager.add(createComponent()
.setInterface(RestHttpProxy.class.getName(), null)
.setImplementation(RestHttpProxyImpl.class));
@@ -63,11 +53,10 @@
.setImplementation(SolrConfigurationImpl.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(ConfigTemplateManager.class).setRequired(true))
- .add(createConfigurationDependency().setPid(SolrService.PID)));
+ .add(createConfigurationDependency().setPid(SolrApi.PID)));
// Create and register the Solr service.
manager.add(createComponent()
- .setInterface(SolrService.class.getName(), null)
.setImplementation(SolrDaemonServiceImpl.class)
.add(createServiceDependency().setService(SolrConfiguration.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true))
Copied:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/RestHttpProxyImpl.java
(from r716,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/RestHttpProxyImpl.java)
==============================================================================
---
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/RestHttpProxyImpl.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/RestHttpProxyImpl.java
Mon Jan 31 12:24:47 2011
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.searchandindex.solr.impl;
+package org.amdatu.searchandindex.solr.rest;
import java.io.IOException;
import java.io.InputStream;
Copied:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/SolrRestServiceImpl.java
(from r724,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrRestServiceImpl.java)
==============================================================================
---
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrRestServiceImpl.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/SolrRestServiceImpl.java
Mon Jan 31 12:24:47 2011
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.searchandindex.solr.impl;
+package org.amdatu.searchandindex.solr.rest;
import java.io.IOException;
import java.io.InputStream;
@@ -43,10 +43,11 @@
import org.amdatu.core.tenant.TenantException;
import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.searchandindex.solr.SolrRestService;
-import org.amdatu.searchandindex.solr.bean.SolrErrorBean;
-import org.amdatu.searchandindex.solr.bean.SolrIndexBean;
-import org.amdatu.searchandindex.solr.bean.SolrTenantIndicesBean;
+import org.amdatu.searchandindex.solr.impl.SolrApiImpl;
import org.amdatu.searchandindex.solr.osgi.Activator;
+import org.amdatu.searchandindex.solr.rest.bean.SolrErrorBean;
+import org.amdatu.searchandindex.solr.rest.bean.SolrIndexBean;
+import org.amdatu.searchandindex.solr.rest.bean.SolrTenantIndicesBean;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrErrorBean.java
==============================================================================
---
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrErrorBean.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrErrorBean.java
Mon Jan 31 12:24:47 2011
@@ -1,4 +1,4 @@
-package org.amdatu.searchandindex.solr.bean;
+package org.amdatu.searchandindex.solr.rest.bean;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Copied:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrIndexBean.java
(from r724,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrIndexBean.java)
==============================================================================
---
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrIndexBean.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrIndexBean.java
Mon Jan 31 12:24:47 2011
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.searchandindex.solr.bean;
+package org.amdatu.searchandindex.solr.rest.bean;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Copied:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrSearchResultBean.java
(from r724,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrSearchResultBean.java)
==============================================================================
---
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrSearchResultBean.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrSearchResultBean.java
Mon Jan 31 12:24:47 2011
@@ -1,4 +1,4 @@
-package org.amdatu.searchandindex.solr.bean;
+package org.amdatu.searchandindex.solr.rest.bean;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrTenantIndicesBean.java
==============================================================================
---
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/bean/SolrTenantIndicesBean.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/rest/bean/SolrTenantIndicesBean.java
Mon Jan 31 12:24:47 2011
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.amdatu.searchandindex.solr.bean;
+package org.amdatu.searchandindex.solr.rest.bean;
import java.util.ArrayList;
import java.util.List;
Copied:
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/util/SolrUtil.java
(from r716,
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrUtil.java)
==============================================================================
---
/sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/impl/SolrUtil.java
(original)
+++
sandbox/ivol/amdatu-searchandindex/solr/src/main/java/org/amdatu/searchandindex/solr/util/SolrUtil.java
Mon Jan 31 12:24:47 2011
@@ -1,4 +1,4 @@
-package org.amdatu.searchandindex.solr.impl;
+package org.amdatu.searchandindex.solr.util;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
