incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r910327 - in /incubator/lcf/trunk/modules/connectors/sharepoint: ./ com/ connector/ connector/com/ connector/com/metacarta/crawler/connectors/sharepoint/ connectors/ crawler-ui/ crawler-ui/connectors/ lib/ war/ wsdls/
Date Mon, 15 Feb 2010 20:16:24 GMT
Author: kwright
Date: Mon Feb 15 20:16:23 2010
New Revision: 910327

URL: http://svn.apache.org/viewvc?rev=910327&view=rev
Log:
Set up ant build script for SharePoint connector.

Added:
    incubator/lcf/trunk/modules/connectors/sharepoint/build.xml   (with props)
    incubator/lcf/trunk/modules/connectors/sharepoint/connector/
    incubator/lcf/trunk/modules/connectors/sharepoint/connector/com/
      - copied from r909915, incubator/lcf/trunk/modules/connectors/sharepoint/com/
    incubator/lcf/trunk/modules/connectors/sharepoint/crawler-ui/
    incubator/lcf/trunk/modules/connectors/sharepoint/crawler-ui/connectors/
      - copied from r909915, incubator/lcf/trunk/modules/connectors/sharepoint/connectors/
    incubator/lcf/trunk/modules/connectors/sharepoint/lib/
    incubator/lcf/trunk/modules/connectors/sharepoint/lib/axis.jar   (with props)
    incubator/lcf/trunk/modules/connectors/sharepoint/lib/commons-discovery.jar   (with props)
    incubator/lcf/trunk/modules/connectors/sharepoint/lib/jaxrpc.jar   (with props)
    incubator/lcf/trunk/modules/connectors/sharepoint/lib/saaj.jar   (with props)
    incubator/lcf/trunk/modules/connectors/sharepoint/lib/wsdl4j.jar   (with props)
    incubator/lcf/trunk/modules/connectors/sharepoint/war/
    incubator/lcf/trunk/modules/connectors/sharepoint/wsdls/
    incubator/lcf/trunk/modules/connectors/sharepoint/wsdls/MCPermissions.wsdl
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/sharepoint/MCPermissions.wsdl
Removed:
    incubator/lcf/trunk/modules/connectors/sharepoint/MCPermissions.wsdl
    incubator/lcf/trunk/modules/connectors/sharepoint/com/
    incubator/lcf/trunk/modules/connectors/sharepoint/connector/com/metacarta/crawler/connectors/sharepoint/SharepointLicense.java
    incubator/lcf/trunk/modules/connectors/sharepoint/connectors/
    incubator/lcf/trunk/modules/connectors/sharepoint/readme.txt
Modified:
    incubator/lcf/trunk/modules/connectors/sharepoint/connector/com/metacarta/crawler/connectors/sharepoint/SharePointRepository.java

Added: incubator/lcf/trunk/modules/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/build.xml?rev=910327&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/sharepoint/build.xml (added)
+++ incubator/lcf/trunk/modules/connectors/sharepoint/build.xml Mon Feb 15 20:16:23 2010
@@ -0,0 +1,155 @@
+<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/DspSts.wsdl"/>
+        </antcall>
+        <antcall target="classcreate-wsdl">
+            <param name="wsdlname" value="wsdls/Lists.wsdl"/>
+        </antcall>
+        <antcall target="classcreate-wsdl">
+            <param name="wsdlname" value="wsdls/MCPermissions.wsdl"/>
+        </antcall>
+        <antcall target="classcreate-wsdl">
+            <param name="wsdlname" value="wsdls/Permissions.wsdl"/>
+        </antcall>
+        <antcall target="classcreate-wsdl">
+            <param name="wsdlname" value="wsdls/usergroup.wsdl"/>
+        </antcall>
+        <antcall target="classcreate-wsdl">
+            <param name="wsdlname" value="wsdls/versions.wsdl"/>
+        </antcall>
+        <antcall target="classcreate-wsdl">
+            <param name="wsdlname" value="wsdls/webs.wsdl"/>
+        </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/axis.jar:lib/activation.jar:lib/jaxrpc.jar:lib/saaj.jar:build/wsdlclasses"/>
+        <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-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"/>
+            </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"/>
+            </classpath>
+        </javac>
+    </target>
+    
+    <target name="classcreate">
+        <antcall target="classcreate-wsdls"/>
+    </target>
+    
+    <target name="compile">
+        <antcall target="compile-wsdls"/>
+        <antcall target="compile-connector"/>
+        <antcall target="compile-crawler-ui"/>
+    </target>
+    
+    <target name="jar-connector">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-sharepoint-connector.jar" basedir="build/connector/classes"/>
+        <jar destfile="build/jar/lcf-sharepoint-wsdlstub.jar" basedir="build/wsdlclasses"/>
+    </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-sharepoint-connector.jar"/>
+        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-sharepoint-wsdlstub.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-sharepointconnector-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/sharepoint/build.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/lcf/trunk/modules/connectors/sharepoint/connector/com/metacarta/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/connector/com/metacarta/crawler/connectors/sharepoint/SharePointRepository.java?rev=910327&r1=909915&r2=910327&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/sharepoint/connector/com/metacarta/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++ incubator/lcf/trunk/modules/connectors/sharepoint/connector/com/metacarta/crawler/connectors/sharepoint/SharePointRepository.java
Mon Feb 15 20:16:23 2010
@@ -24,7 +24,6 @@
 import com.metacarta.crawler.system.Logging;
 import com.metacarta.crawler.system.Metacarta;
 import com.metacarta.core.common.*;
-import com.metacarta.license.LicenseFile;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -110,12 +109,6 @@
 	{
 		if (proxy == null)
 		{
-			SharepointLicense license = SharepointLicense.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 serverVersion = params.getParameter( "serverVersion" );
 			if (serverVersion == null)
 				serverVersion = "2.0";

Added: incubator/lcf/trunk/modules/connectors/sharepoint/lib/axis.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/lib/axis.jar?rev=910327&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/modules/connectors/sharepoint/lib/axis.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/modules/connectors/sharepoint/lib/commons-discovery.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/lib/commons-discovery.jar?rev=910327&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/modules/connectors/sharepoint/lib/commons-discovery.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/modules/connectors/sharepoint/lib/jaxrpc.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/lib/jaxrpc.jar?rev=910327&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/modules/connectors/sharepoint/lib/jaxrpc.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/modules/connectors/sharepoint/lib/saaj.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/lib/saaj.jar?rev=910327&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/modules/connectors/sharepoint/lib/saaj.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/modules/connectors/sharepoint/lib/wsdl4j.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/lib/wsdl4j.jar?rev=910327&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/modules/connectors/sharepoint/lib/wsdl4j.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message