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 21:37:09 UTC

svn commit: r910070 - in /incubator/lcf/trunk/modules: connectors/filesystem/ connectors/gts/ connectors/jcifs/ connectors/jdbc/ connectors/livelink/ connectors/lucene/ connectors/memex/ connectors/nulloutput/ connectors/rss/ connectors/webcrawler/ fra...

Author: kwright
Date: Sun Feb 14 20:37:08 2010
New Revision: 910070

URL: http://svn.apache.org/viewvc?rev=910070&view=rev
Log:
Get the Java version specification correct.  Now the memex connector will build.

Modified:
    incubator/lcf/trunk/modules/connectors/filesystem/build.xml
    incubator/lcf/trunk/modules/connectors/gts/build.xml
    incubator/lcf/trunk/modules/connectors/jcifs/build.xml
    incubator/lcf/trunk/modules/connectors/jdbc/build.xml
    incubator/lcf/trunk/modules/connectors/livelink/build.xml
    incubator/lcf/trunk/modules/connectors/lucene/build.xml
    incubator/lcf/trunk/modules/connectors/memex/build.xml
    incubator/lcf/trunk/modules/connectors/nulloutput/build.xml
    incubator/lcf/trunk/modules/connectors/rss/build.xml
    incubator/lcf/trunk/modules/connectors/webcrawler/build.xml
    incubator/lcf/trunk/modules/framework/build.xml

Modified: incubator/lcf/trunk/modules/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/filesystem/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/filesystem/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/filesystem/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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"/>
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/gts/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/gts/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/gts/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/gts/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jcifs/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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:jcifs/jcifs.jar:lib/jakarta-poi.jar"/>
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/jdbc/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/jdbc/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jdbc/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/jdbc/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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/jdbcpool-0.99.jar"/>
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/livelink/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/livelink/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/livelink/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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:lapi/lapi.jar:lib/commons-httpclient.jar:lib/commons-codec.jar:lib/commons-collections.jar"/>
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/lucene/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/lucene/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/lucene/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/lucene/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/memex/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/memex/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/memex/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/memex/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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:mxie-java/JavaMXIELIB.jar"/>
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" compiler="javac1.5"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.5"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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.5">
+        <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" target="1.5" source="1.5">
             <classpath id="classpath">
                 <pathelement location="${java.home}/../lib/tools.jar"/>
                 <fileset dir="lib"> 

Modified: incubator/lcf/trunk/modules/connectors/nulloutput/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/nulloutput/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/nulloutput/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/nulloutput/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/rss/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/rss/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/rss/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/rss/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/connectors/webcrawler/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/webcrawler/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/webcrawler/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/webcrawler/build.xml Sun Feb 14 20:37:08 2010
@@ -7,7 +7,7 @@
     <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"/>
+        <javac srcdir="connector" destdir="build/connector/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-crawler-ui">
@@ -56,7 +56,7 @@
         <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">
+        <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"> 

Modified: incubator/lcf/trunk/modules/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/build.xml?rev=910070&r1=910069&r2=910070&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/build.xml (original)
+++ incubator/lcf/trunk/modules/framework/build.xml Sun Feb 14 20:37:08 2010
@@ -6,27 +6,27 @@
     
     <target name="compile-core">
         <mkdir dir="build/core/classes"/>
-        <javac srcdir="core" destdir="build/core/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="core" destdir="build/core/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-ui-core">
         <mkdir dir="build/ui-core/classes"/>
-        <javac srcdir="ui-core" destdir="build/ui-core/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="ui-core" destdir="build/ui-core/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-agents">
         <mkdir dir="build/agents/classes"/>
-        <javac srcdir="agents" destdir="build/agents/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="agents" destdir="build/agents/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-pull-agent">
         <mkdir dir="build/pull-agent/classes"/>
-        <javac srcdir="pull-agent" destdir="build/pull-agent/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="pull-agent" destdir="build/pull-agent/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
     <target name="compile-authority-webapp">
         <mkdir dir="build/authority-webapp/classes"/>
-        <javac srcdir="authority-webapp" destdir="build/authority-webapp/classes" classpath="${classpath}" compiler="javac1.4"/>
+        <javac srcdir="authority-webapp" destdir="build/authority-webapp/classes" classpath="${classpath}" target="1.5" source="1.4"/>
     </target>
 
 
@@ -49,7 +49,7 @@
         <jasper2 validateXml="false" uriroot="crawler-ui" webXmlFragment="crawler-ui/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">
+        <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">