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/02/14 15:15:55 UTC
svn commit: r910008 - in /incubator/lcf/trunk/modules/connectors:
nulloutput/ nulloutput/com/ nulloutput/connector/ nulloutput/connector/com/
nulloutput/crawler-ui/ nulloutput/crawler-ui/output/ nulloutput/lib/
nulloutput/output/ nulloutput/war/ rss/ r...
Author: kwright
Date: Sun Feb 14 14:15:54 2010
New Revision: 910008
URL: http://svn.apache.org/viewvc?rev=910008&view=rev
Log:
Build scripts for the rest of the uncomplicated connectors.
Added:
incubator/lcf/trunk/modules/connectors/nulloutput/build.xml (with props)
incubator/lcf/trunk/modules/connectors/nulloutput/connector/
incubator/lcf/trunk/modules/connectors/nulloutput/connector/com/
- copied from r909915, incubator/lcf/trunk/modules/connectors/nulloutput/com/
incubator/lcf/trunk/modules/connectors/nulloutput/crawler-ui/
incubator/lcf/trunk/modules/connectors/nulloutput/crawler-ui/output/
- copied from r909915, incubator/lcf/trunk/modules/connectors/nulloutput/output/
incubator/lcf/trunk/modules/connectors/nulloutput/lib/
incubator/lcf/trunk/modules/connectors/nulloutput/war/
incubator/lcf/trunk/modules/connectors/rss/build.xml (with props)
incubator/lcf/trunk/modules/connectors/rss/connector/
incubator/lcf/trunk/modules/connectors/rss/connector/com/
- copied from r909915, incubator/lcf/trunk/modules/connectors/rss/com/
incubator/lcf/trunk/modules/connectors/rss/crawler-ui/
incubator/lcf/trunk/modules/connectors/rss/crawler-ui/connectors/
- copied from r909915, incubator/lcf/trunk/modules/connectors/rss/connectors/
incubator/lcf/trunk/modules/connectors/rss/lib/
incubator/lcf/trunk/modules/connectors/rss/war/
incubator/lcf/trunk/modules/connectors/webcrawler/build.xml (with props)
incubator/lcf/trunk/modules/connectors/webcrawler/connector/
incubator/lcf/trunk/modules/connectors/webcrawler/connector/com/
- copied from r909915, incubator/lcf/trunk/modules/connectors/webcrawler/com/
incubator/lcf/trunk/modules/connectors/webcrawler/crawler-ui/
incubator/lcf/trunk/modules/connectors/webcrawler/crawler-ui/connectors/
- copied from r909915, incubator/lcf/trunk/modules/connectors/webcrawler/connectors/
incubator/lcf/trunk/modules/connectors/webcrawler/lib/
incubator/lcf/trunk/modules/connectors/webcrawler/war/
Removed:
incubator/lcf/trunk/modules/connectors/nulloutput/com/
incubator/lcf/trunk/modules/connectors/nulloutput/output/
incubator/lcf/trunk/modules/connectors/rss/com/
incubator/lcf/trunk/modules/connectors/rss/connector/com/metacarta/crawler/connectors/rss/RSSLicense.java
incubator/lcf/trunk/modules/connectors/rss/connectors/
incubator/lcf/trunk/modules/connectors/webcrawler/com/
incubator/lcf/trunk/modules/connectors/webcrawler/connector/com/metacarta/crawler/connectors/webcrawler/WebLicense.java
incubator/lcf/trunk/modules/connectors/webcrawler/connectors/
Modified:
incubator/lcf/trunk/modules/connectors/rss/connector/com/metacarta/crawler/connectors/rss/RSSConnector.java
incubator/lcf/trunk/modules/connectors/webcrawler/connector/com/metacarta/crawler/connectors/webcrawler/WebcrawlerConnector.java
Added: incubator/lcf/trunk/modules/connectors/nulloutput/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/nulloutput/build.xml?rev=910008&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/nulloutput/build.xml (added)
+++ incubator/lcf/trunk/modules/connectors/nulloutput/build.xml Sun Feb 14 14:15:54 2010
@@ -0,0 +1,103 @@
+<project>
+
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+
+ <target name="compile-connector">
+ <property name="classpath" value="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/lcf-core.jar:lib/lcf-agents.jar"/>
+ <mkdir dir="build/connector/classes"/>
+ <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.4"/>
+ </target>
+
+ <target name="compile-crawler-ui">
+ <!-- Unpack the crawler war -->
+ <mkdir dir="build/crawler-war"/>
+ <unwar src="war/lcf-crawler-ui.war" dest="build/crawler-war"/>
+ <!-- Create a copy of everything in the proper environment -->
+ <mkdir dir="build/jsp-environment/WEB-INF/lib"/>
+ <mkdir dir="build/jsp-environment/WEB-INF/jsp"/>
+ <copy todir="build/jsp-environment/WEB-INF" file="build/crawler-war/WEB-INF/web.xml"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/adminHeaders.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/adminDefaults.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/error.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/checkAdminLogin.jsp"/>
+
+ <copy todir="build/jsp-environment">
+ <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/lib">
+ <fileset dir="build/crawler-war/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/jsp">
+ <fileset dir="build/crawler-war/WEB-INF/jsp">
+ <include name="*.tld"/>
+ </fileset>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/classes">
+ <fileset dir="build/connector/classes"/>
+ </copy>
+ <!-- Compile to java, as a check -->
+ <mkdir dir="build/crawler-ui/java"/>
+ <!-- Define the jsp compilation task using tomcat libraries -->
+ <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
+ <classpath id="jspc.classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
+ <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
+ <pathelement location="build/connector/classes"/>
+ </classpath>
+ </taskdef>
+ <jasper2 validateXml="false" uriroot="build/jsp-environment" webXmlFragment="build/jsp-environment/WEB-INF/web-generated.xml" outputDir="build/crawler-ui/java" />
+ <!-- Compile java classes -->
+ <mkdir dir="build/crawler-ui/classes"/>
+ <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" compiler="javac1.4">
+ <classpath id="classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
+ <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
+ <pathelement location="build/connector/classes"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile">
+ <antcall target="compile-connector"/>
+ <antcall target="compile-crawler-ui"/>
+ </target>
+
+ <target name="jar-connector">
+ <mkdir dir="build/jar"/>
+ <jar destfile="build/jar/lcf-nulloutput-connector.jar" basedir="build/connector/classes"/>
+ </target>
+
+ <target name="webapp-connector-ui">
+ <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-nulloutput-connector.jar"/>
+ <mkdir dir="build/webapp/crawler-ui"/>
+ <copy todir="build/webapp/crawler-ui">
+ <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+ </copy>
+ </target>
+
+ <target name="iar-connector-ui">
+ <mkdir dir="build/iar"/>
+ <jar destfile="build/iar/lcf-nulloutputconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+ </target>
+
+ <target name="all">
+ <antcall target="compile"/>
+ <antcall target="jar-connector"/>
+ <antcall target="webapp-connector-ui"/>
+ <antcall target="iar-connector-ui"/>
+ </target>
+
+</project>
Propchange: incubator/lcf/trunk/modules/connectors/nulloutput/build.xml
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/lcf/trunk/modules/connectors/rss/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/build.xml?rev=910008&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/build.xml (added)
+++ incubator/lcf/trunk/modules/connectors/rss/build.xml Sun Feb 14 14:15:54 2010
@@ -0,0 +1,103 @@
+<project>
+
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+
+ <target name="compile-connector">
+ <property name="classpath" value="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/lcf-core.jar:lib/lcf-agents.jar:lib/lcf-pull-agent.jar:lib/commons-httpclient.jar:lib/commons-collections.jar:lib/commons-codec.jar"/>
+ <mkdir dir="build/connector/classes"/>
+ <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.4"/>
+ </target>
+
+ <target name="compile-crawler-ui">
+ <!-- Unpack the crawler war -->
+ <mkdir dir="build/crawler-war"/>
+ <unwar src="war/lcf-crawler-ui.war" dest="build/crawler-war"/>
+ <!-- Create a copy of everything in the proper environment -->
+ <mkdir dir="build/jsp-environment/WEB-INF/lib"/>
+ <mkdir dir="build/jsp-environment/WEB-INF/jsp"/>
+ <copy todir="build/jsp-environment/WEB-INF" file="build/crawler-war/WEB-INF/web.xml"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/adminHeaders.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/adminDefaults.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/error.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/checkAdminLogin.jsp"/>
+
+ <copy todir="build/jsp-environment">
+ <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/lib">
+ <fileset dir="build/crawler-war/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/jsp">
+ <fileset dir="build/crawler-war/WEB-INF/jsp">
+ <include name="*.tld"/>
+ </fileset>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/classes">
+ <fileset dir="build/connector/classes"/>
+ </copy>
+ <!-- Compile to java, as a check -->
+ <mkdir dir="build/crawler-ui/java"/>
+ <!-- Define the jsp compilation task using tomcat libraries -->
+ <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
+ <classpath id="jspc.classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
+ <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
+ <pathelement location="build/connector/classes"/>
+ </classpath>
+ </taskdef>
+ <jasper2 validateXml="false" uriroot="build/jsp-environment" webXmlFragment="build/jsp-environment/WEB-INF/web-generated.xml" outputDir="build/crawler-ui/java" />
+ <!-- Compile java classes -->
+ <mkdir dir="build/crawler-ui/classes"/>
+ <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" compiler="javac1.4">
+ <classpath id="classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
+ <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
+ <pathelement location="build/connector/classes"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile">
+ <antcall target="compile-connector"/>
+ <antcall target="compile-crawler-ui"/>
+ </target>
+
+ <target name="jar-connector">
+ <mkdir dir="build/jar"/>
+ <jar destfile="build/jar/lcf-rss-connector.jar" basedir="build/connector/classes"/>
+ </target>
+
+ <target name="webapp-connector-ui">
+ <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-rss-connector.jar"/>
+ <mkdir dir="build/webapp/crawler-ui"/>
+ <copy todir="build/webapp/crawler-ui">
+ <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+ </copy>
+ </target>
+
+ <target name="iar-connector-ui">
+ <mkdir dir="build/iar"/>
+ <jar destfile="build/iar/lcf-rssconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+ </target>
+
+ <target name="all">
+ <antcall target="compile"/>
+ <antcall target="jar-connector"/>
+ <antcall target="webapp-connector-ui"/>
+ <antcall target="iar-connector-ui"/>
+ </target>
+
+</project>
Propchange: incubator/lcf/trunk/modules/connectors/rss/build.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/lcf/trunk/modules/connectors/rss/connector/com/metacarta/crawler/connectors/rss/RSSConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/connector/com/metacarta/crawler/connectors/rss/RSSConnector.java?rev=910008&r1=909915&r2=910008&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/connector/com/metacarta/crawler/connectors/rss/RSSConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/rss/connector/com/metacarta/crawler/connectors/rss/RSSConnector.java Sun Feb 14 14:15:54 2010
@@ -31,7 +31,6 @@
import com.metacarta.agents.common.XMLContext;
import com.metacarta.agents.common.XMLStringContext;
import com.metacarta.agents.common.XMLFileContext;
-import com.metacarta.license.LicenseFile;
import java.io.*;
import java.util.*;
@@ -42,8 +41,6 @@
import org.apache.commons.httpclient.methods.*;
import org.apache.commons.httpclient.params.*;
-import com.metacarta.core.MetaCartaVersion;
-
/** This is the RSS implementation of the IRepositoryConnector interface.
* This connector basically looks at an RSS document in order to seed the
* document queue. The document is always fetched from the same URL (it's
@@ -227,21 +224,12 @@
{
if (!isInitialized)
{
- RSSLicense license = RSSLicense.getInstance();
- LicenseFile.Error license_error = license.verify();
- if (! license.verify().equals(LicenseFile.Error.E_NOERROR)) {
- throw new MetacartaException("License error. Contact MetaCarta customer service. (" + license_error.toString() + ")");
- }
-
String x;
String emailAddress = params.getParameter(emailParameter);
- userAgent = "MetaCartaRSSFeedReader/"+MetaCartaVersion.string+" Beta ("+MetaCartaVersion.build_date+"; "+((emailAddress==null)?"":emailAddress)+")";
- from = emailAddress;
-
if (emailAddress == null)
throw new MetacartaException("Missing email address");
- userAgent = "MetaCartaRSSFeedReader/"+MetaCartaVersion.string+" Beta ("+MetaCartaVersion.build_date+"; "+emailAddress+")";
+ userAgent = "ApacheLCFRSSFeedReader; "+((emailAddress==null)?"":emailAddress)+")";
from = emailAddress;
String robotsUsageString = params.getParameter(robotsUsageParameter);
Added: incubator/lcf/trunk/modules/connectors/webcrawler/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/webcrawler/build.xml?rev=910008&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/webcrawler/build.xml (added)
+++ incubator/lcf/trunk/modules/connectors/webcrawler/build.xml Sun Feb 14 14:15:54 2010
@@ -0,0 +1,103 @@
+<project>
+
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+
+ <target name="compile-connector">
+ <property name="classpath" value="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/lcf-core.jar:lib/lcf-agents.jar:lib/lcf-pull-agent.jar:lib/commons-httpclient.jar:lib/commons-collections.jar:lib/commons-codec.jar"/>
+ <mkdir dir="build/connector/classes"/>
+ <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.4"/>
+ </target>
+
+ <target name="compile-crawler-ui">
+ <!-- Unpack the crawler war -->
+ <mkdir dir="build/crawler-war"/>
+ <unwar src="war/lcf-crawler-ui.war" dest="build/crawler-war"/>
+ <!-- Create a copy of everything in the proper environment -->
+ <mkdir dir="build/jsp-environment/WEB-INF/lib"/>
+ <mkdir dir="build/jsp-environment/WEB-INF/jsp"/>
+ <copy todir="build/jsp-environment/WEB-INF" file="build/crawler-war/WEB-INF/web.xml"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/adminHeaders.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/adminDefaults.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/error.jsp"/>
+ <copy todir="build/jsp-environment" file="build/crawler-war/checkAdminLogin.jsp"/>
+
+ <copy todir="build/jsp-environment">
+ <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/lib">
+ <fileset dir="build/crawler-war/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/jsp">
+ <fileset dir="build/crawler-war/WEB-INF/jsp">
+ <include name="*.tld"/>
+ </fileset>
+ </copy>
+ <copy todir="build/jsp-environment/WEB-INF/classes">
+ <fileset dir="build/connector/classes"/>
+ </copy>
+ <!-- Compile to java, as a check -->
+ <mkdir dir="build/crawler-ui/java"/>
+ <!-- Define the jsp compilation task using tomcat libraries -->
+ <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
+ <classpath id="jspc.classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
+ <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
+ <pathelement location="build/connector/classes"/>
+ </classpath>
+ </taskdef>
+ <jasper2 validateXml="false" uriroot="build/jsp-environment" webXmlFragment="build/jsp-environment/WEB-INF/web-generated.xml" outputDir="build/crawler-ui/java" />
+ <!-- Compile java classes -->
+ <mkdir dir="build/crawler-ui/classes"/>
+ <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" compiler="javac1.4">
+ <classpath id="classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="build/crawler-war/WEB-INF/lib/jstl.jar"/>
+ <pathelement location="build/crawler-war/WEB-INF/lib/standard.jar"/>
+ <pathelement location="build/connector/classes"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile">
+ <antcall target="compile-connector"/>
+ <antcall target="compile-crawler-ui"/>
+ </target>
+
+ <target name="jar-connector">
+ <mkdir dir="build/jar"/>
+ <jar destfile="build/jar/lcf-web-connector.jar" basedir="build/connector/classes"/>
+ </target>
+
+ <target name="webapp-connector-ui">
+ <mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-web-connector.jar"/>
+ <mkdir dir="build/webapp/crawler-ui"/>
+ <copy todir="build/webapp/crawler-ui">
+ <fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+ </copy>
+ </target>
+
+ <target name="iar-connector-ui">
+ <mkdir dir="build/iar"/>
+ <jar destfile="build/iar/lcf-webconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+ </target>
+
+ <target name="all">
+ <antcall target="compile"/>
+ <antcall target="jar-connector"/>
+ <antcall target="webapp-connector-ui"/>
+ <antcall target="iar-connector-ui"/>
+ </target>
+
+</project>
Propchange: incubator/lcf/trunk/modules/connectors/webcrawler/build.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/lcf/trunk/modules/connectors/webcrawler/connector/com/metacarta/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/webcrawler/connector/com/metacarta/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=910008&r1=909915&r2=910008&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/webcrawler/connector/com/metacarta/crawler/connectors/webcrawler/WebcrawlerConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/webcrawler/connector/com/metacarta/crawler/connectors/webcrawler/WebcrawlerConnector.java Sun Feb 14 14:15:54 2010
@@ -31,7 +31,6 @@
import com.metacarta.agents.common.XMLContext;
import com.metacarta.agents.common.XMLStringContext;
import com.metacarta.agents.common.XMLFileContext;
-import com.metacarta.license.LicenseFile;
import java.io.*;
import java.util.*;
@@ -42,8 +41,6 @@
import org.apache.commons.httpclient.methods.*;
import org.apache.commons.httpclient.params.*;
-import com.metacarta.core.MetaCartaVersion;
-
/** This is the Web Crawler implementation of the IRepositoryConnector interface.
* This connector may be superceded by one that calls out to python, or by a entirely
* python Connector Framework, depending on how the winds blow.
@@ -417,19 +414,12 @@
// Handle everything else
if (!isInitialized)
{
- WebLicense license = WebLicense.getInstance();
- LicenseFile.Error license_error = license.verify();
- if (! license.verify().equals(LicenseFile.Error.E_NOERROR))
- {
- throw new MetacartaException("License error. Contact MetaCarta customer service. (" + license_error.toString() + ")");
- }
-
String x;
String emailAddress = params.getParameter(WebcrawlerConfig.PARAMETER_EMAIL);
if (emailAddress == null)
throw new MetacartaException("Missing email address");
- userAgent = "MetaCartaWebCrawler/"+MetaCartaVersion.string+" Beta ("+MetaCartaVersion.build_date+"; "+emailAddress+")";
+ userAgent = "ApacheLCFWebCrawler; "+emailAddress+")";
from = emailAddress;
x = params.getParameter(WebcrawlerConfig.PARAMETER_ROBOTSUSAGE);