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 2014/10/27 14:36:48 UTC
svn commit: r1634533 - in /manifoldcf/branches/CONNECTORS-1085: ./
framework/ framework/buildfiles/
framework/example-multiprocess-file-proprietary/
framework/example-multiprocess-file/
framework/example-multiprocess-zk-proprietary/ framework/example-m...
Author: kwright
Date: Mon Oct 27 13:36:48 2014
New Revision: 1634533
URL: http://svn.apache.org/r1634533
Log:
Introduce connector-common-lib directory, mentioned in all properties.xml files
Modified:
manifoldcf/branches/CONNECTORS-1085/build.xml
manifoldcf/branches/CONNECTORS-1085/framework/build.xml
manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml
manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file-proprietary/properties.xml
manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file/properties.xml
manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk-proprietary/properties.xml
manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk/properties.xml
manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess-proprietary/properties.xml
manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess/properties.xml
Modified: manifoldcf/branches/CONNECTORS-1085/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/build.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/build.xml Mon Oct 27 13:36:48 2014
@@ -309,6 +309,10 @@
<copy todir="dist/connector-lib">
<fileset dir="framework/dist/connector-lib"/>
</copy>
+ <mkdir dir="dist/connector-common-lib"/>
+ <copy todir="dist/connector-common-lib">
+ <fileset dir="framework/dist/connector-common-lib"/>
+ </copy>
<mkdir dir="dist/connector-lib-proprietary"/>
<copy todir="dist/connector-lib-proprietary">
<fileset dir="framework/dist/connector-lib-proprietary"/>
Modified: manifoldcf/branches/CONNECTORS-1085/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/build.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/build.xml Mon Oct 27 13:36:48 2014
@@ -1338,15 +1338,11 @@
</antcall>
</target>
- <!-- Set up example directories -->
+ <!-- Set up connector-common-lib -->
- <target name="example-common" depends="wars,wars-proprietary,jar-connector-common">
- <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
- <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
- <mkdir dir="dist/connector-lib"/>
- <mkdir dir="dist/connector-lib-proprietary"/>
- <copy file="example-common/README.txt" todir="dist/connector-lib-proprietary"/>
- <copy todir="dist/connector-lib">
+ <target name="connector-common-lib" depends="jar-connector-common">
+ <mkdir dir="dist/connector-common-lib"/>
+ <copy todir="dist/connector-common-lib">
<fileset dir="build/jar">
<include name="mcf-connector-common.jar"/>
</fileset>
@@ -1404,6 +1400,16 @@
</copy>
</target>
+ <!-- Set up example directories -->
+
+ <target name="example-common" depends="wars,wars-proprietary,connector-common-lib">
+ <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
+ <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
+ <mkdir dir="dist/connector-lib"/>
+ <mkdir dir="dist/connector-lib-proprietary"/>
+ <copy file="example-common/README.txt" todir="dist/connector-lib-proprietary"/>
+ </target>
+
<target name="multi-processes-file" depends="lib">
<antcall target="setup-processes">
<param name="processes-dir" value="dist/multiprocess-file-example"/>
Modified: manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/buildfiles/connector-build.xml Mon Oct 27 13:36:48 2014
@@ -105,7 +105,7 @@
</target>
<path id="mcf-connector-build.connector-classpath">
- <fileset dir="${mcf-dist}/connector-lib">
+ <fileset dir="${mcf-dist}/connector-common-lib">
<include name="mcf-connector-common.jar"/>
</fileset>
<fileset dir="${mcf-dist}/lib">
@@ -142,7 +142,7 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
</fileset>
- <fileset dir="${mcf-dist}/connector-lib">
+ <fileset dir="${mcf-dist}/connector-common-lib">
<include name="tika-core*.jar"/>
<include name="jackson-core*.jar"/>
<include name="jackson-databind*.jar"/>
@@ -181,7 +181,7 @@
<include name="jmatio*.jar"/>
<include name="java-libpst*.jar"/>
</fileset>
- <fileset dir="${mcf-dist}/connector-lib">
+ <fileset dir="${mcf-dist}/connector-common-lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
@@ -370,7 +370,7 @@
<mkdir dir="build/wsdljava"/>
<java classname="org.apache.axis.wsdl.WSDL2Java" fork="true">
<classpath>
- <fileset dir="${mcf-dist}/connector-lib">
+ <fileset dir="${mcf-dist}/connector-common-lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl*.jar"/>
@@ -396,7 +396,7 @@
<mkdir dir="build/xsdjava"/>
<java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
<classpath>
- <fileset dir="${mcf-dist}/connector-lib">
+ <fileset dir="${mcf-dist}/connector-common-lib">
<include name="castor*.jar"/>
<include name="geronimo-activation_1.1_spec*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
@@ -427,7 +427,7 @@
<mkdir dir="build/wsdlclasses"/>
<javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
- <fileset dir="${mcf-dist}/connector-lib">
+ <fileset dir="${mcf-dist}/connector-common-lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl*.jar"/>
@@ -449,7 +449,7 @@
<mkdir dir="build/xsdclasses"/>
<javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
- <fileset dir="${mcf-dist}/connector-lib">
+ <fileset dir="${mcf-dist}/connector-common-lib">
<include name="castor*.jar"/>
</fileset>
</classpath>
Modified: manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file-proprietary/properties.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file-proprietary/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file-proprietary/properties.xml Mon Oct 27 13:36:48 2014
@@ -40,6 +40,7 @@
<property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
<!-- Tell MCF where to find the connector jars -->
<libdir path="../connector-lib"/>
+ <libdir path="../connector-common-lib"/>
<libdir path="../connector-lib-proprietary"/>
<!-- WSDD references -->
<!-- Any additional properties go here -->
Modified: manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file/properties.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-file/properties.xml Mon Oct 27 13:36:48 2014
@@ -40,6 +40,7 @@
<property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
<!-- Tell MCF where to find the connector jars -->
<libdir path="../connector-lib"/>
+ <libdir path="../connector-common-lib"/>
<libdir path="../connector-lib-proprietary"/>
<!-- WSDD references -->
<!-- Any additional properties go here -->
Modified: manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk-proprietary/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk-proprietary/properties.xml Mon Oct 27 13:36:48 2014
@@ -35,6 +35,7 @@
<property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
<!-- Tell MCF where to find the connector jars -->
<libdir path="../connector-lib"/>
+ <libdir path="../connector-common-lib"/>
<libdir path="../connector-lib-proprietary"/>
<!-- Any additional local properties go here -->
</configuration>
Modified: manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk/properties.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/example-multiprocess-zk/properties.xml Mon Oct 27 13:36:48 2014
@@ -35,6 +35,7 @@
<property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
<!-- Tell MCF where to find the connector jars -->
<libdir path="../connector-lib"/>
+ <libdir path="../connector-common-lib"/>
<libdir path="../connector-lib-proprietary"/>
<!-- Any additional local properties go here -->
</configuration>
Modified: manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess-proprietary/properties.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess-proprietary/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess-proprietary/properties.xml Mon Oct 27 13:36:48 2014
@@ -37,6 +37,7 @@
<property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
<!-- Tell MCF where to find the connector jars -->
<libdir path="../connector-lib"/>
+ <libdir path="../connector-common-lib"/>
<libdir path="../connector-lib-proprietary"/>
<!-- WSDD references -->
<!-- Any additional properties go here -->
Modified: manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess/properties.xml?rev=1634533&r1=1634532&r2=1634533&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess/properties.xml (original)
+++ manifoldcf/branches/CONNECTORS-1085/framework/example-singleprocess/properties.xml Mon Oct 27 13:36:48 2014
@@ -37,6 +37,7 @@
<property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
<!-- Tell MCF where to find the connector jars -->
<libdir path="../connector-lib"/>
+ <libdir path="../connector-common-lib"/>
<libdir path="../connector-lib-proprietary"/>
<!-- WSDD references -->
<!-- Any additional properties go here -->