You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/03/04 20:00:21 UTC
svn commit: r919130 - in /incubator/lcf/trunk/modules/connectors/solr: ./
connector/org/apache/lcf/agents/output/lucene/
connector/org/apache/lcf/agents/output/solr/ crawler-ui/output/lucene/
crawler-ui/output/solr/
Author: kwright
Date: Thu Mar 4 19:00:21 2010
New Revision: 919130
URL: http://svn.apache.org/viewvc?rev=919130&view=rev
Log:
Rename Lucene connector packages, class names, jsp paths, etc. to Solr.
Added:
incubator/lcf/trunk/modules/connectors/solr/50_solrconnector
- copied unchanged from r919118, incubator/lcf/trunk/modules/connectors/solr/50_luceneconnector
incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/
- copied from r919118, incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/
incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConfig.java
- copied, changed from r919118, incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConfig.java
incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConnector.java
- copied, changed from r919118, incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java
incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/
- copied from r919118, incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/lucene/
Removed:
incubator/lcf/trunk/modules/connectors/solr/50_luceneconnector
incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/
incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/LuceneConfig.java
incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/LuceneConnector.java
incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/lucene/
Modified:
incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/HttpPoster.java
incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/editconfig.jsp
incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/headerconfig.jsp
incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/postconfig.jsp
Modified: incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/HttpPoster.java?rev=919130&r1=919118&r2=919130&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/HttpPoster.java (original)
+++ incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/HttpPoster.java Thu Mar 4 19:00:21 2010
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lcf.agents.output.lucene;
+package org.apache.lcf.agents.output.solr;
import org.apache.lcf.core.interfaces.*;
import org.apache.lcf.core.common.Base64;
@@ -33,7 +33,7 @@
import org.apache.log4j.*;
/**
-* Posts an input stream to Lucene
+* Posts an input stream to SOLR
*
* @author James Sablatura, modified by Karl Wright
*/
@@ -183,7 +183,7 @@
// Log the activity, if any, regardless of any exception
if (t.getActivityCode() != null)
- activities.recordActivity(t.getActivityStart(),LuceneConnector.INGEST_ACTIVITY,t.getActivityBytes(),documentURI,t.getActivityCode(),t.getActivityDetails());
+ activities.recordActivity(t.getActivityStart(),SolrConnector.INGEST_ACTIVITY,t.getActivityBytes(),documentURI,t.getActivityCode(),t.getActivityDetails());
readFromDocumentStreamYet = (readFromDocumentStreamYet || t.getReadFromDocumentStreamYet());
@@ -349,7 +349,7 @@
// Log the activity, if any, regardless of any exception
if (t.getActivityCode() != null)
- activities.recordActivity(t.getActivityStart(),LuceneConnector.REMOVE_ACTIVITY,null,documentURI,t.getActivityCode(),t.getActivityDetails());
+ activities.recordActivity(t.getActivityStart(),SolrConnector.REMOVE_ACTIVITY,null,documentURI,t.getActivityCode(),t.getActivityDetails());
Throwable thr = t.getException();
if (thr != null)
@@ -814,7 +814,7 @@
OutputStream out = socket.getOutputStream();
try
{
- // Create the output stream to Lucene
+ // Create the output stream to SOLR
byte[] tmp = ("POST " + postUpdateAction + " HTTP/1.0\r\n").getBytes("ASCII");
out.write(tmp, 0, tmp.length);
@@ -1555,7 +1555,7 @@
if (doc != null)
{
if (Logging.ingest.isDebugEnabled())
- Logging.ingest.debug("LUCENE: Saw ingestion response document '"+doc.getXML()+"'");
+ Logging.ingest.debug("SOLR: Saw ingestion response document '"+doc.getXML()+"'");
//Object root = doc.getRoot();
ArrayList list = doc.processPath("*",null);
int k = 0;
@@ -1617,7 +1617,7 @@
if (doc != null)
{
if (Logging.ingest.isDebugEnabled())
- Logging.ingest.debug("LUCENE: Saw status response document '"+doc.getXML()+"'");
+ Logging.ingest.debug("SOLR: Saw status response document '"+doc.getXML()+"'");
//Object root = doc.getRoot();
ArrayList list = doc.processPath("*",null);
int k = 0;
Copied: incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConfig.java (from r919118, incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConfig.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConfig.java?p2=incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConfig.java&p1=incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConfig.java&r1=919118&r2=919130&rev=919130&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConfig.java (original)
+++ incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConfig.java Thu Mar 4 19:00:21 2010
@@ -16,12 +16,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lcf.agents.output.lucene;
+package org.apache.lcf.agents.output.solr;
-/** Parameters and output data for Lucene output connector.
+/** Parameters and output data for SOLR output connector.
*/
-public class LuceneConfig
+public class SolrConfig
{
public static final String _rcsid = "@(#)$Id$";
Copied: incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConnector.java (from r919118, incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConnector.java?p2=incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConnector.java&p1=incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java&r1=919118&r2=919130&rev=919130&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/lucene/LuceneConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/solr/connector/org/apache/lcf/agents/output/solr/SolrConnector.java Thu Mar 4 19:00:21 2010
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lcf.agents.output.lucene;
+package org.apache.lcf.agents.output.solr;
import org.apache.lcf.core.interfaces.*;
import org.apache.lcf.agents.interfaces.*;
@@ -25,7 +25,7 @@
/** This is the output connector for SOLR. Currently, no frills.
*/
-public class LuceneConnector extends org.apache.lcf.agents.output.BaseOutputConnector
+public class SolrConnector extends org.apache.lcf.agents.output.BaseOutputConnector
{
public static final String _rcsid = "@(#)$Id$";
@@ -41,7 +41,7 @@
/** Constructor.
*/
- public LuceneConnector()
+ public SolrConnector()
{
}
@@ -60,7 +60,7 @@
*/
public String getJSPFolder()
{
- return "lucene";
+ return "solr";
}
/** Connect.
@@ -88,37 +88,37 @@
{
if (poster == null)
{
- String protocol = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PROTOCOL);
+ String protocol = params.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PROTOCOL);
if (protocol == null || protocol.length() == 0)
- throw new LCFException("Missing parameter: "+org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PROTOCOL);
+ throw new LCFException("Missing parameter: "+org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PROTOCOL);
- String server = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_SERVER);
+ String server = params.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_SERVER);
if (server == null || server.length() == 0)
- throw new LCFException("Missing parameter: "+org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_SERVER);
+ throw new LCFException("Missing parameter: "+org.apache.lcf.agents.output.solr.SolrConfig.PARAM_SERVER);
- String port = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PORT);
+ String port = params.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PORT);
if (port == null || port.length() == 0)
port = "80";
- String webapp = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_WEBAPPNAME);
+ String webapp = params.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_WEBAPPNAME);
if (webapp == null || webapp.length() == 0)
webapp = "";
- String updatePath = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_UPDATEPATH);
+ String updatePath = params.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_UPDATEPATH);
if (updatePath == null || updatePath.length() == 0)
updatePath = "";
- String removePath = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_REMOVEPATH);
+ String removePath = params.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_REMOVEPATH);
if (removePath == null || removePath.length() == 0)
removePath = "";
- String statusPath = params.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_STATUSPATH);
+ String statusPath = params.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_STATUSPATH);
if (statusPath == null || statusPath.length() == 0)
statusPath = "";
- String userID = params.getParameter(LuceneConfig.PARAM_USERID);
- String password = params.getObfuscatedParameter(LuceneConfig.PARAM_PASSWORD);
- String realm = params.getParameter(LuceneConfig.PARAM_REALM);
+ String userID = params.getParameter(SolrConfig.PARAM_USERID);
+ String password = params.getObfuscatedParameter(SolrConfig.PARAM_PASSWORD);
+ String realm = params.getParameter(SolrConfig.PARAM_REALM);
try
{
poster = new HttpPoster(protocol,server,Integer.parseInt(port),webapp,updatePath,removePath,statusPath,realm,userID,password);
Modified: incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/editconfig.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/editconfig.jsp?rev=919130&r1=919118&r2=919130&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/editconfig.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/editconfig.jsp Thu Mar 4 19:00:21 2010
@@ -38,48 +38,48 @@
if (tabName == null)
out.println("No tab name!");
- String protocol = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PROTOCOL);
+ String protocol = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PROTOCOL);
if (protocol == null)
protocol = "http";
- String server = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_SERVER);
+ String server = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_SERVER);
if (server == null)
server = "localhost";
- String port = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PORT);
+ String port = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PORT);
if (port == null)
port = "8983";
- String webapp = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_WEBAPPNAME);
+ String webapp = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_WEBAPPNAME);
if (webapp == null)
webapp = "solr";
- String updatePath = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_UPDATEPATH);
+ String updatePath = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_UPDATEPATH);
if (updatePath == null)
updatePath = "/update/extract";
- String removePath = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_REMOVEPATH);
+ String removePath = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_REMOVEPATH);
if (removePath == null)
removePath = "/update";
- String statusPath = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_STATUSPATH);
+ String statusPath = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_STATUSPATH);
if (statusPath == null)
statusPath = "/admin/ping";
- String realm = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_REALM);
+ String realm = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_REALM);
if (realm == null)
realm = "";
- String userID = parameters.getParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_USERID);
+ String userID = parameters.getParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_USERID);
if (userID == null)
userID = "";
- String password = parameters.getObfuscatedParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PASSWORD);
+ String password = parameters.getObfuscatedParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PASSWORD);
if (password == null)
password = "";
// "Appliance" tab
- if (tabName.equals("Lucene"))
+ if (tabName.equals("SOLR"))
{
%>
<table class="displaytable">
@@ -153,7 +153,7 @@
}
else
{
- // Lucene tab hiddens
+ // SOLR tab hiddens
%>
<input type="hidden" name="serverprotocol" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(protocol)%>'/>
<input type="hidden" name="servername" value='<%=org.apache.lcf.ui.util.Encoder.attributeEscape(server)%>'/>
Modified: incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/headerconfig.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/headerconfig.jsp?rev=919130&r1=919118&r2=919130&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/headerconfig.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/headerconfig.jsp Thu Mar 4 19:00:21 2010
@@ -23,7 +23,7 @@
%>
<%
- // This file is included in the head section by every place that the configuration information for the Lucene connector
+ // This file is included in the head section by every place that the configuration information for the Solr connector
// needs to be edited. When it is called, the parameter Map object is placed in the thread context
// under the name "Parameters".
@@ -42,7 +42,7 @@
if (tabsArray == null)
out.println("No tabs array!");
- tabsArray.add("Lucene");
+ tabsArray.add("SOLR");
%>
@@ -53,13 +53,13 @@
{
if (editconnection.servername.value == "")
{
- alert("Please supply a valid Lucene server name");
+ alert("Please supply a valid SOLR server name");
editconnection.servername.focus();
return false;
}
if (editconnection.serverport.value != "" && !isInteger(editconnection.serverport.value))
{
- alert("Lucene server port must be a valid integer");
+ alert("SOLR server port must be a valid integer");
editconnection.serverport.focus();
return false;
}
@@ -94,43 +94,43 @@
{
if (editconnection.servername.value == "")
{
- alert("Please supply a valid Lucene server name");
- SelectTab("Lucene");
+ alert("Please supply a valid SOLR server name");
+ SelectTab("SOLR");
editconnection.servername.focus();
return false;
}
if (editconnection.serverport.value != "" && !isInteger(editconnection.serverport.value))
{
- alert("Lucene server port must be a valid integer");
- SelectTab("Lucene");
+ alert("SOLR server port must be a valid integer");
+ SelectTab("SOLR");
editconnection.serverport.focus();
return false;
}
if (editconnection.webappname.value != "" && editconnection.webappname.value.indexOf("/") != -1)
{
alert("Web application name cannot have '/' characters");
- SelectTab("Lucene");
+ SelectTab("SOLR");
editconnection.webappname.focus();
return false;
}
if (editconnection.updatepath.value != "" && editconnection.updatepath.value.substring(0,1) != "/")
{
alert("Update path must start with a '/' character");
- SelectTab("Lucene");
+ SelectTab("SOLR");
editconnection.updatepath.focus();
return false;
}
if (editconnection.removepath.value != "" && editconnection.removepath.value.substring(0,1) != "/")
{
alert("Remove path must start with a '/' character");
- SelectTab("Lucene");
+ SelectTab("SOLR");
editconnection.removepath.focus();
return false;
}
if (editconnection.statuspath.value != "" && editconnection.statuspath.value.substring(0,1) != "/")
{
alert("Status path must start with a '/' character");
- SelectTab("Lucene");
+ SelectTab("SOLR");
editconnection.statuspath.focus();
return false;
}
Modified: incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/postconfig.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/postconfig.jsp?rev=919130&r1=919118&r2=919130&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/postconfig.jsp (original)
+++ incubator/lcf/trunk/modules/connectors/solr/crawler-ui/output/solr/postconfig.jsp Thu Mar 4 19:00:21 2010
@@ -39,42 +39,42 @@
String protocol = variableContext.getParameter("serverprotocol");
if (protocol != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PROTOCOL,protocol);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PROTOCOL,protocol);
String server = variableContext.getParameter("servername");
if (server != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_SERVER,server);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_SERVER,server);
String port = variableContext.getParameter("serverport");
if (port != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PORT,port);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PORT,port);
String webapp = variableContext.getParameter("webappname");
if (webapp != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_WEBAPPNAME,webapp);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_WEBAPPNAME,webapp);
String updatePath = variableContext.getParameter("updatepath");
if (updatePath != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_UPDATEPATH,updatePath);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_UPDATEPATH,updatePath);
String removePath = variableContext.getParameter("removepath");
if (removePath != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_REMOVEPATH,removePath);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_REMOVEPATH,removePath);
String statusPath = variableContext.getParameter("statuspath");
if (statusPath != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_STATUSPATH,statusPath);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_STATUSPATH,statusPath);
String realm = variableContext.getParameter("realm");
if (realm != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_REALM,realm);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_REALM,realm);
String userID = variableContext.getParameter("userid");
if (userID != null)
- parameters.setParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_USERID,userID);
+ parameters.setParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_USERID,userID);
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter(org.apache.lcf.agents.output.lucene.LuceneConfig.PARAM_PASSWORD,password);
+ parameters.setObfuscatedParameter(org.apache.lcf.agents.output.solr.SolrConfig.PARAM_PASSWORD,password);
%>