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/15 16:51:43 UTC
svn commit: r910240 - in /incubator/lcf/trunk/modules: connectors/meridio/
connectors/meridio/authorities/ connectors/meridio/com/
connectors/meridio/connector/ connectors/meridio/connector/com/
connectors/meridio/connector/com/metacarta/crawler/connec...
Author: kwright
Date: Mon Feb 15 15:51:41 2010
New Revision: 910240
URL: http://svn.apache.org/viewvc?rev=910240&view=rev
Log:
Add meridio build.xml, plus check in the modified version of xerces parser. Note that meridio build will likely be changed later to check in the generated java files instead of having those be built by ant, since the proper wsdls and xsds are not generally available.
Added:
incubator/lcf/trunk/modules/connectors/meridio/build.xml (with props)
incubator/lcf/trunk/modules/connectors/meridio/connector/
incubator/lcf/trunk/modules/connectors/meridio/connector/com/
- copied from r909915, incubator/lcf/trunk/modules/connectors/meridio/com/
incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/
incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/authorities/
- copied from r909915, incubator/lcf/trunk/modules/connectors/meridio/authorities/
incubator/lcf/trunk/modules/connectors/meridio/crawler-ui/connectors/
- copied from r909915, incubator/lcf/trunk/modules/connectors/meridio/connectors/
incubator/lcf/trunk/modules/connectors/meridio/lib/axis.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-commons.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-xml.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/lib/commons-discovery.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/lib/jaxrpc.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/lib/saaj.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/lib/wsdl4j.jar (with props)
incubator/lcf/trunk/modules/connectors/meridio/war/
incubator/lcf/trunk/modules/connectors/meridio/wsdls/
incubator/lcf/trunk/modules/connectors/meridio/wsdls/MetaCartaWS_axis.wsdl
- copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/meridio/MetaCartaWS_axis.wsdl
incubator/lcf/trunk/modules/framework/lib/xercesImpl.jar (with props)
Removed:
incubator/lcf/trunk/modules/connectors/meridio/MetaCartaWS_axis.wsdl
incubator/lcf/trunk/modules/connectors/meridio/authorities/
incubator/lcf/trunk/modules/connectors/meridio/com/
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/AddDoc.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/AddDocAcl.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/AddDocMultiple.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/AddRec.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/AddRecAcl.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/AddRecMultiple.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/DeleteDoc.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/DeleteDocAcl.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/DeleteRec.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/DeleteRecAcl.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/LookupDoc.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/LookupRec.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/MeridioLicense.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/UpdateDoc.java
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/meridiowrapper/MeridioTestWrapper.java
incubator/lcf/trunk/modules/connectors/meridio/connectors/
incubator/lcf/trunk/modules/connectors/meridio/lib/Makefile.am
Modified:
incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/MeridioConnector.java
Added: incubator/lcf/trunk/modules/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/build.xml?rev=910240&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/build.xml (added)
+++ incubator/lcf/trunk/modules/connectors/meridio/build.xml Mon Feb 15 15:51:41 2010
@@ -0,0 +1,189 @@
+<project>
+
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+
+ <target name="classcreate-wsdl">
+ <mkdir dir="build/wsdljava"/>
+ <java classname="org.apache.axis.wsdl.WSDL2Java" fork="true" classpath="lib/axis.jar:lib/commons-logging.jar:lib/commons-discovery.jar:lib/saaj.jar:lib/wsdl4j.jar:lib/jaxrpc.jar:lib/activation.jar:lib/xml-apis.jar:lib/xercesImpl.jar">
+ <arg value="--timeout"/>
+ <arg value="0"/>
+ <arg value="--noImports"/>
+ <arg value="-o"/>
+ <arg value="build/wsdljava"/>
+ <arg value="${wsdlname}"/>
+ </java>
+ </target>
+
+ <target name="classcreate-wsdls">
+ <antcall target="classcreate-wsdl">
+ <param name="wsdlname" value="wsdls/MeridioDMWS_axis.wsdl"/>
+ </antcall>
+ <antcall target="classcreate-wsdl">
+ <param name="wsdlname" value="wsdls/MeridioRMWS_axis.wsdl"/>
+ </antcall>
+ <antcall target="classcreate-wsdl">
+ <param name="wsdlname" value="wsdls/MetaCartaWS_axis.wsdl"/>
+ </antcall>
+ </target>
+
+ <target name="classcreate-xsd">
+ <mkdir dir="build/xsdjava"/>
+ <java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
+ <classpath>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <arg value="-i"/>
+ <arg value="${xsdname}"/>
+ <arg value="=f"/>
+ <arg value="-dest"/>
+ <arg value="build/xsdjava"/>
+ <arg value="-package"/>
+ <arg value="com.metacarta.crawler.connectors.meridio.${packagename}"/>
+ </java>
+ </target>
+
+ <target name="classcreate-xsds">
+ <mkdir dir="build/xsdjava"/>
+ <antcall target="classcreate-xsd">
+ <param name="xsdname" value="wsdls/DMDataSet.xsd"/>
+ <param name="packagename" value="DMDataSet"/>
+ </antcall>
+ <antcall target="classcreate-xsd">
+ <param name="xsdname" value="wsdls/RMClassificationDataSet.xsd"/>
+ <param name="packagename" value="RMClassificationDataSet"/>
+ </antcall>
+ <antcall target="classcreate-xsd">
+ <param name="xsdname" value="wsdls/RMDataSet.xsd"/>
+ <param name="packagename" value="RMDataSet"/>
+ </antcall>
+ </target>
+
+ <target name="compile-connector">
+ <property name="classpath" value="lib/log4j-1.2.jar:lib/commons-logging.jar:lib/commons-httpclient.jar:lib/commons-collections.jar:lib/commons-codec.jar:lib/lcf-core.jar:lib/lcf-agents.jar:lib/lcf-pull-agent.jar:lib/mailapi.jar:lib/castor-1.0.5-commons.jar:lib/castor-1.0.5.jar:lib/castor-1.0.5-xml.jar:lib/axis.jar:build/wsdlclasses:build/xsdclasses:lib/activation.jar:lib/jaxrpc.jar:lib/saaj.jar"/>
+ <mkdir dir="build/connector/classes"/>
+ <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
+ </target>
+
+ <target name="compile-wsdls">
+ <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/mailapi.jar:lib/axis.jar:lib/activation.jar:lib/jaxrpc.jar:lib/saaj.jar"/>
+ <mkdir dir="build/wsdlclasses"/>
+ <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" classpath="${classpath}" target="1.5" source="1.4"/>
+ </target>
+
+ <target name="compile-xsds">
+ <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/mailapi.jar:lib/castor-1.0.5-commons.jar:lib/castor-1.0.5.jar:lib/castor-1.0.5-xml.jar"/>
+ <mkdir dir="build/xsdclasses"/>
+ <javac srcdir="build/xsdjava" destdir="build/xsdclasses" classpath="${classpath}" target="1.5" source="1.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"/>
+ <pathelement location="build/wsdlclasses"/>
+ <pathelement location="build/xsdclasses"/>
+ </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" target="1.5" source="1.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"/>
+ <pathelement location="build/wsdlclasses"/>
+ <pathelement location="build/xsdclasses"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="classcreate">
+ <antcall target="classcreate-wsdls"/>
+ <antcall target="classcreate-xsds"/>
+ </target>
+
+ <target name="compile">
+ <antcall target="compile-wsdls"/>
+ <antcall target="compile-xsds"/>
+ <antcall target="compile-connector"/>
+ <antcall target="compile-crawler-ui"/>
+ </target>
+
+ <target name="jar-connector">
+ <mkdir dir="build/jar"/>
+ <jar destfile="build/jar/lcf-meridio-connector.jar" basedir="build/connector/classes"/>
+ <jar destfile="build/jar/lcf-meridio-wsdlstub.jar" basedir="build/wsdlclasses"/>
+ <jar destfile="build/jar/lcf-meridio-xsdstub.jar" basedir="build/xsdclasses"/>
+ </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-meridio-connector.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-meridio-wsdlstub.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-meridio-xsdstub.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-meridioconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+ </target>
+
+ <target name="all">
+ <antcall target="classcreate"/>
+ <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/meridio/build.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/MeridioConnector.java?rev=910240&r1=909915&r2=910240&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/MeridioConnector.java (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/connector/com/metacarta/crawler/connectors/meridio/MeridioConnector.java Mon Feb 15 15:51:41 2010
@@ -56,8 +56,6 @@
import com.metacarta.crawler.connectors.meridio.DMDataSet.*;
import com.metacarta.crawler.connectors.meridio.RMDataSet.*;
-import com.metacarta.license.LicenseFile;
-
/** This is the "repository connector" for a file system.
*/
public class MeridioConnector extends com.metacarta.crawler.connectors.BaseRepositoryConnector
@@ -120,12 +118,6 @@
if (meridio_ == null)
{
// Do the first part (which used to be in connect() itself)
- MeridioLicense license = MeridioLicense.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() + ")");
- }
-
try
{
/*=================================================================
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/axis.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/axis.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/axis.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-commons.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-commons.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-commons.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-xml.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-xml.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5-xml.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/castor-1.0.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/commons-discovery.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/commons-discovery.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/commons-discovery.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/jaxrpc.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/jaxrpc.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/jaxrpc.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/saaj.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/saaj.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/saaj.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/connectors/meridio/lib/wsdl4j.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/lib/wsdl4j.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/connectors/meridio/lib/wsdl4j.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/lcf/trunk/modules/framework/lib/xercesImpl.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/lib/xercesImpl.jar?rev=910240&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/lcf/trunk/modules/framework/lib/xercesImpl.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream