manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r910514 - in /incubator/lcf/trunk/modules/connectors/filenet: ./ com/ connector/ connector/com/ connector/com/metacarta/ connector/com/metacarta/crawler/ connector/com/metacarta/crawler/connectors/ connector/com/metacarta/crawler/connectors...
Date Tue, 16 Feb 2010 13:51:51 GMT
Author: kwright
Date: Tue Feb 16 13:51:50 2010
New Revision: 910514

URL: http://svn.apache.org/viewvc?rev=910514&view=rev
Log:
Set up an ant build for filenet.

Added:
    incubator/lcf/trunk/modules/connectors/filenet/build.xml   (with props)
    incubator/lcf/trunk/modules/connectors/filenet/connector/
    incubator/lcf/trunk/modules/connectors/filenet/connector/com/
    incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/
    incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/
    incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/connectors/
      - copied from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/connectors/
    incubator/lcf/trunk/modules/connectors/filenet/crawler-ui/
    incubator/lcf/trunk/modules/connectors/filenet/crawler-ui/connectors/
      - copied from r909915, incubator/lcf/trunk/modules/connectors/filenet/connectors/
    incubator/lcf/trunk/modules/connectors/filenet/filenet-api/
    incubator/lcf/trunk/modules/connectors/filenet/implementation/
    incubator/lcf/trunk/modules/connectors/filenet/implementation/com/
    incubator/lcf/trunk/modules/connectors/filenet/implementation/com/metacarta/
    incubator/lcf/trunk/modules/connectors/filenet/implementation/com/metacarta/crawler/
    incubator/lcf/trunk/modules/connectors/filenet/implementation/com/metacarta/crawler/common/
    incubator/lcf/trunk/modules/connectors/filenet/implementation/com/metacarta/crawler/common/filenet/
    incubator/lcf/trunk/modules/connectors/filenet/implementation/com/metacarta/crawler/common/filenet/FilenetFactoryImpl.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/FilenetFactoryImpl.java
    incubator/lcf/trunk/modules/connectors/filenet/implementation/com/metacarta/crawler/common/filenet/FilenetImpl.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/FilenetImpl.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/DocumentClassDefinition.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/DocumentClassDefinition.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/FileInfo.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/FileInfo.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/FileSeedInfo.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/FileSeedInfo.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/FilenetException.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/FilenetException.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/IFilenet.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/IFilenet.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/IFilenetFactory.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/IFilenetFactory.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/LocalClientSocket.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/LocalClientSocket.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/MetadataFieldDefinition.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/MetadataFieldDefinition.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/NameDescription.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/NameDescription.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/RMILocalClientSocketFactory.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/RMILocalClientSocketFactory.java
    incubator/lcf/trunk/modules/connectors/filenet/interface/com/metacarta/crawler/common/filenet/RMILocalSocketFactory.java
      - copied unchanged from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/common/filenet/RMILocalSocketFactory.java
    incubator/lcf/trunk/modules/connectors/filenet/lib/
    incubator/lcf/trunk/modules/connectors/filenet/registry/
    incubator/lcf/trunk/modules/connectors/filenet/registry/com/
    incubator/lcf/trunk/modules/connectors/filenet/registry/com/metacarta/
    incubator/lcf/trunk/modules/connectors/filenet/registry/com/metacarta/crawler/
    incubator/lcf/trunk/modules/connectors/filenet/registry/com/metacarta/crawler/registry/
      - copied from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/registry/
    incubator/lcf/trunk/modules/connectors/filenet/server/
    incubator/lcf/trunk/modules/connectors/filenet/server/com/
    incubator/lcf/trunk/modules/connectors/filenet/server/com/metacarta/
    incubator/lcf/trunk/modules/connectors/filenet/server/com/metacarta/crawler/
    incubator/lcf/trunk/modules/connectors/filenet/server/com/metacarta/crawler/server/
      - copied from r909915, incubator/lcf/trunk/modules/connectors/filenet/com/metacarta/crawler/server/
    incubator/lcf/trunk/modules/connectors/filenet/war/
Removed:
    incubator/lcf/trunk/modules/connectors/filenet/com/
    incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/connectors/filenet/FilenetLicense.java
    incubator/lcf/trunk/modules/connectors/filenet/connectors/
Modified:
    incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/connectors/filenet/FilenetConnector.java

Added: incubator/lcf/trunk/modules/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filenet/build.xml?rev=910514&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filenet/build.xml (added)
+++ incubator/lcf/trunk/modules/connectors/filenet/build.xml Tue Feb 16 13:51:50 2010
@@ -0,0 +1,218 @@
+<project>
+
+    <target name="clean">
+        <delete dir="build"/>
+    </target>
+
+    <target name="compile-interface">
+        <mkdir dir="build/interface/classes"/>
+        <javac srcdir="interface" destdir="build/interface/classes" classpath="" target="1.5"
source="1.4"/>
+    </target>
+
+    <target name="compile-implementation">
+        <mkdir dir="build/implementation/classes"/>
+        <javac srcdir="implementation" destdir="build/implementation/classes" target="1.5"
source="1.4">
+            <classpath id="implementation.classpath">
+                <fileset dir="filenet-api"> 
+                    <include name="*.jar"/> 
+                </fileset> 
+                <pathelement location="build/interface/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="rmic-build">
+        <rmic base="build/rmijava" classname="${classname}">
+            <classpath id="rmi.classpath">
+                <fileset dir="filenet-api"> 
+                    <include name="*.jar"/> 
+                </fileset> 
+                <pathelement location="build/interface/classes"/>
+                <pathelement location="build/implementation/classes"/>
+            </classpath>
+        </rmic>
+    </target>
+    
+    <target name="compile-rmic">
+        <mkdir dir="build/rmijava"/>
+        <copy todir="build/rmijava">
+            <fileset dir="implementation"/>
+        </copy>
+        <!-- The ant version I have doesn't seem to handle class specifications based
on file names, so this is the best I could come up with -->
+        <antcall target="rmic-build">
+            <param name="classname" value="com.metacarta.crawler.common.filenet.FilenetFactoryImpl"/>
+        </antcall>
+        <antcall target="rmic-build">
+            <param name="classname" value="com.metacarta.crawler.common.filenet.FilenetImpl"/>
+        </antcall>
+        <mkdir dir="build/rmiskel/classes"/>
+        <copy todir="build/rmiskel/classes">
+            <fileset dir="build/rmijava">
+                <include name="**/*_Skel.class"/>
+            </fileset>
+        </copy>
+        <mkdir dir="build/rmistub/classes"/>
+        <copy todir="build/rmistub/classes">
+            <fileset dir="build/rmijava">
+                <include name="**/*_Stub.class"/>
+            </fileset>
+        </copy>
+    </target>
+    
+    <target name="compile-server">
+        <property name="classpath" value="build/interface/classes:build/implementation/classes:build/rmistub/classes:build/rmiskel/classes"/>
+        <mkdir dir="build/server/classes"/>
+        <javac srcdir="server" destdir="build/server/classes" classpath="${classpath}"
target="1.5" source="1.4"/>
+    </target>
+
+    <target name="compile-registry">
+        <property name="classpath" value="build/interface/classes"/>
+        <mkdir dir="build/registry/classes"/>
+        <javac srcdir="registry" destdir="build/registry/classes" classpath="${classpath}"
target="1.5" source="1.4"/>
+    </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:build/interface/classes:build/rmistub/classes"/>
+        <mkdir dir="build/connector/classes"/>
+        <javac srcdir="connector" destdir="build/connector/classes" 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/rmistub/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/interface/classes"/>
+                <pathelement location="build/rmistub/classes"/>
+                <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" 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/interface/classes"/>
+                <pathelement location="build/rmistub/classes"/>
+                <pathelement location="build/connector/classes"/>
+            </classpath>
+        </javac>
+    </target>
+    
+    <target name="compile">
+        <antcall target="compile-interface"/>
+        <antcall target="compile-implementation"/>
+        <antcall target="compile-rmic"/>
+        <antcall target="compile-server"/>
+        <antcall target="compile-registry"/>
+        <antcall target="compile-connector"/>
+        <antcall target="compile-crawler-ui"/>
+    </target>
+    
+    <target name="jar-interface">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-filenet-interface.jar" basedir="build/interface/classes"/>
+    </target>
+
+    <target name="jar-implementation">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-filenet-implementation.jar" basedir="build/implementation/classes"/>
+    </target>
+
+    <target name="jar-rmiskel">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-filenet-rmiskel.jar" basedir="build/rmiskel/classes"/>
+    </target>
+
+    <target name="jar-rmistub">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-filenet-rmistub.jar" basedir="build/rmistub/classes"/>
+    </target>
+
+    <target name="jar-server">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-filenet-server.jar" basedir="build/server/classes"/>
+    </target>
+
+    <target name="jar-registry">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-filenet-registry.jar" basedir="build/registry/classes"/>
+    </target>
+    
+    <target name="jar-connector">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/lcf-filenet-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-filenet-connector.jar"/>
+        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-filenet-rmistub.jar"/>
+        <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-filenet-interface.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-filenetconnector-crawler-ui.iar" basedir="build/webapp/crawler-ui"/>
+    </target>
+
+    <target name="all">
+        <antcall target="compile"/>
+        <antcall target="jar-interface"/>
+        <antcall target="jar-implementation"/>
+        <antcall target="jar-rmiskel"/>
+        <antcall target="jar-rmistub"/>
+        <antcall target="jar-server"/>
+        <antcall target="jar-registry"/>
+        <antcall target="jar-connector"/>
+        <antcall target="webapp-connector-ui"/>
+        <antcall target="iar-connector-ui"/>
+    </target>
+    
+</project>

Propchange: incubator/lcf/trunk/modules/connectors/filenet/build.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/connectors/filenet/FilenetConnector.java?rev=910514&r1=909915&r2=910514&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/connectors/filenet/FilenetConnector.java
(original)
+++ incubator/lcf/trunk/modules/connectors/filenet/connector/com/metacarta/crawler/connectors/filenet/FilenetConnector.java
Tue Feb 16 13:51:50 2010
@@ -25,7 +25,6 @@
 import com.metacarta.crawler.system.Logging;
 import java.util.*;
 import java.io.*;
-import com.metacarta.license.LicenseFile;
 import com.metacarta.crawler.common.filenet.*;
 import java.rmi.*;
 import java.text.SimpleDateFormat;
@@ -145,13 +144,6 @@
 	{
 		if (session == null)
 		{
-			// Do license check at the point we get ready to talk to the server
-			FilenetLicense license = FilenetLicense.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() + ")");
-			}
-
 			// Check for parameter validity
 			if (userID == null || userID.length() < 1)
 				throw new MetacartaException("Parameter "+CONFIG_PARAM_USERID+" required but not set");



Mime
View raw message