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/17 12:51:55 UTC
svn commit: r910928 - in /incubator/lcf/trunk/modules: build.xml
connectors/jcifs/build.xml connectors/meridio/build.xml
connectors/meridio/sun/ connectors/sharepoint/build.xml
Author: kwright
Date: Wed Feb 17 11:51:55 2010
New Revision: 910928
URL: http://svn.apache.org/viewvc?rev=910928&view=rev
Log:
Fix a couple of errors in required jars that were missed before.
Added:
incubator/lcf/trunk/modules/connectors/meridio/sun/
Modified:
incubator/lcf/trunk/modules/build.xml
incubator/lcf/trunk/modules/connectors/jcifs/build.xml
incubator/lcf/trunk/modules/connectors/meridio/build.xml
incubator/lcf/trunk/modules/connectors/sharepoint/build.xml
Modified: incubator/lcf/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/build.xml?rev=910928&r1=910927&r2=910928&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/build.xml (original)
+++ incubator/lcf/trunk/modules/build.xml Wed Feb 17 11:51:55 2010
@@ -216,7 +216,7 @@
<copy todir="connectors/meridio/lib" file="lib/axis.jar"/>
<copy todir="connectors/meridio/lib" file="lib/jaxrpc.jar"/>
<copy todir="connectors/meridio/lib" file="lib/saaj.jar"/>
- <copy todir="connectors/meridio/lib" file="lib/w2dl4j.jar"/>
+ <copy todir="connectors/meridio/lib" file="lib/wsdl4j.jar"/>
<copy todir="connectors/meridio/lib" file="lib/castor-1.0.5-commons.jar"/>
<copy todir="connectors/meridio/lib" file="lib/castor-1.0.5.jar"/>
<copy todir="connectors/meridio/lib" file="lib/castor-1.0.5-xml.jar"/>
@@ -269,7 +269,7 @@
<copy todir="connectors/sharepoint/lib" file="lib/axis.jar"/>
<copy todir="connectors/sharepoint/lib" file="lib/jaxrpc.jar"/>
<copy todir="connectors/sharepoint/lib" file="lib/saaj.jar"/>
- <copy todir="connectors/sharepoint/lib" file="lib/w2dl4j.jar"/>
+ <copy todir="connectors/sharepoint/lib" file="lib/wsdl4j.jar"/>
<copy todir="connectors/sharepoint/lib" file="lib/commons-discovery.jar"/>
<copy todir="connectors/sharepoint/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=910928&r1=910927&r2=910928&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/jcifs/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/jcifs/build.xml Wed Feb 17 11:51:55 2010
@@ -93,6 +93,8 @@
<target name="webapp-connector-ui" depends="compile-crawler-ui,jar-connector,precompile-check" if="canBuild">
<mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
<copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="build/jar/lcf-jcifs-connector.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="jcifs/jcifs.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/jakarta-poi.jar"/>
<mkdir dir="build/webapp/crawler-ui"/>
<copy todir="build/webapp/crawler-ui">
<fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
Modified: incubator/lcf/trunk/modules/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/meridio/build.xml?rev=910928&r1=910927&r2=910928&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/meridio/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/meridio/build.xml Wed Feb 17 11:51:55 2010
@@ -10,6 +10,8 @@
<available file="wsdls/DMDataSet.xsd" property="DMDataSetStatus"/>
<available file="wsdls/RMDataSet.xsd" property="RMDataSetStatus"/>
<available file="wsdls/RMClassificationDataSet.xsd" property="RMClassificationDataSetStatus"/>
+ <available file="sun/activation.jar" property="activationStatus"/>
+ <available file="sun/mailapi.jar" property="mailapiStatus"/>
<condition property="canBuild">
<and>
<isset property="meridioDMWS_axisStatus"/>
@@ -17,12 +19,14 @@
<isset property="DMDataSetStatus"/>
<isset property="RMDataSetStatus"/>
<isset property="RMClassificationDataSetStatus"/>
+ <isset property="activationStatus"/>
+ <isset property="mailapiStatus"/>
</and>
</condition>
</target>
<target name="precompile-check" depends="calculate-condition" unless="canBuild">
- <echo message="Meridio Connector cannot be built without MeridioDMWS_axis.wsdl, MeridioRMWS_axis.wsdl, DMDataSet.xsd, RMDataSet.xsd, and RMClassificationDataSet.xsd"/>
+ <echo message="Meridio Connector cannot be built without MeridioDMWS_axis.wsdl, MeridioRMWS_axis.wsdl, DMDataSet.xsd, RMDataSet.xsd, RMClassificationDataSet.xsd, activation.jar, and mailapi.jar"/>
</target>
<target name="classcreate-wsdl">
@@ -90,12 +94,12 @@
<target name="compile-xsds" depends="classcreate-xsds,precompile-check" if="canBuild">
<mkdir dir="build/xsdclasses"/>
- <javac srcdir="build/xsdjava" destdir="build/xsdclasses" classpath="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" target="1.5" source="1.4"/>
+ <javac srcdir="build/xsdjava" destdir="build/xsdclasses" classpath="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:sun/activation.jar" target="1.5" source="1.4"/>
</target>
<target name="compile-connector" depends="compile-wsdls,compile-xsds,precompile-check" if="canBuild">
<mkdir dir="build/connector/classes"/>
- <javac srcdir="connector" destdir="build/connector/classes" classpath="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" target="1.5" source="1.4"/>
+ <javac srcdir="connector" destdir="build/connector/classes" classpath="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:sun/activation.jar:lib/axis.jar:build/wsdlclasses:build/xsdclasses:lib/activation.jar:lib/jaxrpc.jar:lib/saaj.jar" target="1.5" source="1.4"/>
</target>
<target name="compile-crawler-ui" depends="compile-connector,compile-wsdls,compile-xsds,precompile-check" if="canBuild">
@@ -136,6 +140,9 @@
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
+ <fileset dir="sun">
+ <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"/>
@@ -152,6 +159,9 @@
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
+ <fileset dir="sun">
+ <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"/>
@@ -181,6 +191,17 @@
<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"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/axis.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/jaxrpc.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/wsdl4j.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/saaj.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/commons-discovery.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/castor-1.0.5-commons.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/castor-1.0.5.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/castor-1.0.5-xml.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib">
+ <fileset dir="sun" includes="*.jar"/>
+ </copy>
<mkdir dir="build/webapp/crawler-ui"/>
<copy todir="build/webapp/crawler-ui">
<fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
Modified: incubator/lcf/trunk/modules/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/connectors/sharepoint/build.xml?rev=910928&r1=910927&r2=910928&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/connectors/sharepoint/build.xml (original)
+++ incubator/lcf/trunk/modules/connectors/sharepoint/build.xml Wed Feb 17 11:51:55 2010
@@ -157,6 +157,11 @@
<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"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/axis.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/jaxrpc.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/wsdl4j.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/saaj.jar"/>
+ <copy todir="build/webapp/crawler-ui/WEB-INF/lib" file="lib/commons-discovery.jar"/>
<mkdir dir="build/webapp/crawler-ui"/>
<copy todir="build/webapp/crawler-ui">
<fileset dir="crawler-ui" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>