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/03/21 01:51:50 UTC
svn commit: r1579852 -
/manifoldcf/branches/CONNECTORS-912/connectors/connector-build.xml
Author: kwright
Date: Fri Mar 21 00:51:50 2014
New Revision: 1579852
URL: http://svn.apache.org/r1579852
Log:
Add general targets for delivery into dist area
Modified:
manifoldcf/branches/CONNECTORS-912/connectors/connector-build.xml
Modified: manifoldcf/branches/CONNECTORS-912/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/connector-build.xml?rev=1579852&r1=1579851&r2=1579852&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/connector-build.xml Fri Mar 21 00:51:50 2014
@@ -29,8 +29,9 @@
<delete dir="test-HSQLDBext-output"/>
</target>
+
<path id="mcf-connector-build.connector-classpath">
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -57,20 +58,25 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
</fileset>
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl*.jar"/>
<include name="commons-discovery*.jar"/>
<include name="activation*.jar"/>
</fileset>
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="castor*.jar"/>
<include name="geronimo-activation_1.1_spec*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
</fileset>
- <fileset dir="../../framework/build/jar"/>
+ <fileset dir="${mcf-dist}/lib">
+ <include name="mcf-core.jar"/>
+ <include name="mcf-agents.jar"/>
+ <include name="mcf-pullagent.jar"/>
+ <include name="mcf-ui-core.jar"/>
+ </fileset>
<pathelement location="build/stubclasses"/>
<pathelement location="build/wsdlclasses"/>
<pathelement location="build/xsdclasses"/>
@@ -85,13 +91,13 @@
<path id="mcf-connector-build.connector-test-classpath">
<path refid="connector-classpath"/>
<pathelement location="build/connector/classes"/>
- <fileset dir="../../framework/build/test-jar"/>
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/test-lib"/>
+ <fileset dir="${mcf-dist}/lib">
<include name="postgresql*.jar"/>
<include name="derby*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
- <fileset dir="../../lib-proprietary">
+ <fileset dir="${mcf-dist}/lib-proprietary">
<include name="mysql*.jar"/>
</fileset>
</path>
@@ -247,7 +253,7 @@
<mkdir dir="build/wsdljava"/>
<java classname="org.apache.axis.wsdl.WSDL2Java" fork="true">
<classpath>
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl*.jar"/>
@@ -271,7 +277,7 @@
<mkdir dir="build/xsdjava"/>
<java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
<classpath>
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="castor*.jar"/>
<include name="geronimo-activation_1.1_spec*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
@@ -300,7 +306,7 @@
<mkdir dir="build/wsdlclasses"/>
<javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl*.jar"/>
@@ -322,7 +328,7 @@
<mkdir dir="build/xsdclasses"/>
<javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="castor*.jar"/>
</fileset>
</classpath>
@@ -514,7 +520,7 @@
<target name="lib-wsdls" depends="has-wsdls-check" if="hasWSDLs">
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl*.jar"/>
@@ -527,7 +533,7 @@
<target name="lib-xsds" depends="has-xsds-check" if="hasXSDs">
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
- <fileset dir="../../lib">
+ <fileset dir="${mcf-dist}/lib">
<include name="castor*.jar"/>
<include name="geronimo-activation_1.1_spec*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
@@ -584,8 +590,174 @@
</copy>
</target>
+ <!-- Override this target to provide integration materials to the connector dist area -->
<target name="integration"/>
+ <!-- Delivery targets. These targets conditionally deliver code and connectors.xml lines
+ into the main distribution area.
+ -->
+
+ <target name="general-connector-integration-check" depends="integration">
+ <available file="dist/integration" type="dir" property="has-integration"/>
+ </target>
+
+ <target name="general-server-process-check" depends="server-process">
+ <available file="dist/server-process" type="dir" property="has-server-process"/>
+ </target>
+
+ <target name="general-registry-process-check" depends="registry-process">
+ <available file="dist/registry-process" type="dir" property="has-registry-process"/>
+ </target>
+
+ <target name="general-connector-delivery-integration" depends="general-connector-integration-check" if="has-integration">
+ <mkdir dir="${mcf-dist}/${ant.project.name}-integration"/>
+ <copy todir="${mcf-dist}/${ant.project.name}-integration">
+ <fileset dir="dist/integration"/>
+ </copy>
+ </target>
+
+ <target name="general-delivery-server-process" depends="general-server-process-check" if="has-server-process">
+ <mkdir dir="${mcf-dist}/${ant.project.name}-server-process"/>
+ <copy todir="${mcf-dist}/${ant.project.name}-server-process">
+ <fileset dir="dist/server-process"/>
+ </copy>
+ </target>
+
+ <target name="general-delivery-registry-process" depends="general-registry-process-check" if="has-registry-process">
+ <mkdir dir="${mcf-dist}/${ant.project.name}-registry-process"/>
+ <copy todir="${mcf-dist}/${ant.project.name}-registry-process">
+ <fileset dir="dist/registry-process"/>
+ </copy>
+ </target>
+
+ <target name="general-connector-delivery-processes" depends="general-delivery-server-process,general-delivery-registry-process"/>
+
+ <target name="general-connector-proprietary-only-check" depends="lib-proprietary-instructions,lib-proprietary-README">
+ <available file="dist/lib-proprietary-only" type="dir" property="has-proprietary-only"/>
+ </target>
+
+ <target name="general-connector-proprietary-only-delivery" depends="general-connector-proprietary-only-check" if="has-proprietary-only">
+ <mkdir dir="${mcf-dist}/connector-lib-proprietary"/>
+ <copy todir="${mcf-dist}/connector-lib-proprietary">
+ <fileset dir="dist/lib-proprietary-only"/>
+ </copy>
+ </target>
+
+ <target name="general-connector-delivery" depends="general-connector-proprietary-only-delivery,general-connector-delivery-integration,general-connector-delivery-processes">
+ <mkdir dir="${mcf-dist}/connector-lib"/>
+ <copy todir="${mcf-dist}/connector-lib">
+ <fileset dir="dist/lib"/>
+ </copy>
+ </target>
+
+ <target name="general-connector-doc-check" depends="doc">
+ <available file="dist/doc" type="dir" property="has-doc"/>
+ </target>
+
+ <target name="general-connector-doc-delivery" depends="general-connector-doc-check" if="has-doc">
+ <mkdir dir="${mcf-dist}/doc/api/${ant.project.name}"/>
+ <copy todir="${mcf-dist}/doc/api/${ant.project.name}">
+ <fileset dir="dist/doc"/>
+ </copy>
+ </target>
+
+ <target name="general-connector-proprietary-runnable-check" depends="lib-proprietary-instructions">
+ <available file="dist/lib-proprietary-only/${ant.project.name}-PLACEHOLDER.txt" property="has-placeholder"/>
+ <condition property="is-proprietary-runnable">
+ <not>
+ <isset property="has-placeholder"/>
+ </not>
+ </condition>
+ </target>
+
+ <target name="general-connector-runnable-check" depends="general-connector-proprietary-runnable-check">
+ <available file="lib-proprietary" type="dir" property="has-lib-proprietary"/>
+ <condition property="is-runnable">
+ <not>
+ <isset property="has-lib-proprietary"/>
+ </not>
+ </condition>
+ </target>
+
+ <target name="general-add-mapping-connector-commented" depends="general-connector-runnable-check" unless="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your mapping connectors here -->" value="<!-- Add your mapping connectors here -->
 <!--mappingconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-mapping-connector-non-commented" depends="general-connector-runnable-check" if="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your mapping connectors here -->" value="<!-- Add your mapping connectors here -->
 <mappingconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-mapping-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your mapping connectors here -->" value="<!-- Add your mapping connectors here -->
 <!--mappingconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-mapping-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your mapping connectors here -->" value="<!-- Add your mapping connectors here -->
 <mappingconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-mapping-connector" depends="general-add-mapping-connector-commented,general-add-mapping-connector-non-commented,general-add-mapping-connector-proprietary-commented,general-add-mapping-connector-proprietary-non-commented">
+ </target>
+
+ <target name="general-add-authority-connector-commented" depends="general-connector-runnable-check" unless="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <!--authorityconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-authority-connector-non-commented" depends="general-connector-runnable-check" if="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-authority-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <!--authorityconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-authority-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your authority connectors here -->" value="<!-- Add your authority connectors here -->
 <authorityconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-authority-connector" depends="general-add-authority-connector-commented,general-add-authority-connector-non-commented,general-add-authority-connector-proprietary-commented,general-add-authority-connector-proprietary-non-commented">
+ </target>
+
+ <target name="general-add-output-connector-commented" depends="general-connector-runnable-check" unless="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <!--outputconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-output-connector-non-commented" depends="general-connector-runnable-check" if="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-output-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <!--outputconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-output-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-output-connector" depends="general-add-output-connector-commented,general-add-output-connector-non-commented,general-add-output-connector-proprietary-commented,general-add-output-connector-proprietary-non-commented">
+ </target>
+
+ <target name="general-add-repository-connector-commented" depends="general-connector-runnable-check" unless="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <!--repositoryconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-repository-connector-non-commented" depends="general-connector-runnable-check" if="is-runnable">
+ <replace file="${mcf-dist}/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-repository-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <!--repositoryconnector name="${connector-label}" class="${connector-class}"/-->"/>
+ </target>
+
+ <target name="general-add-repository-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="is-proprietary-runnable">
+ <replace file="${mcf-dist}/connectors-proprietary.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="${connector-label}" class="${connector-class}"/>"/>
+ </target>
+
+ <target name="general-add-repository-connector" depends="general-add-repository-connector-commented,general-add-repository-connector-non-commented,general-add-repository-connector-proprietary-commented,general-add-repository-connector-proprietary-non-commented">
+ </target>
+
+ <!-- Main targets -->
+
+
<target name="build" depends="lib,lib-proprietary-instructions,lib-proprietary-README,server-process,registry-process,integration"/>
<target name="build-tests" depends="build,jar-tests"/>