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/02 20:47:44 UTC
svn commit: r1629039 - in /manifoldcf/branches/CONNECTORS-1037: build.xml
connectors/alfresco-webscript/ connectors/alfresco-webscript/build.xml
framework/build.xml
Author: kwright
Date: Thu Oct 2 18:47:44 2014
New Revision: 1629039
URL: http://svn.apache.org/r1629039
Log:
Hook up testing (add wiremock framework)
Modified:
manifoldcf/branches/CONNECTORS-1037/build.xml
manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/ (props changed)
manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml
manifoldcf/branches/CONNECTORS-1037/framework/build.xml
Modified: manifoldcf/branches/CONNECTORS-1037/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1037/build.xml?rev=1629039&r1=1629038&r2=1629039&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1037/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1037/build.xml Thu Oct 2 18:47:44 2014
@@ -94,7 +94,10 @@
<property name="alfresco-indexer-client.version" value="0.6"/>
<property name="gson.version" value="2.2.4"/>
<property name="guava.version" value="15.0"/>
-
+ <property name="mockito.version" value="1.9.5"/>
+ <property name="wiremock.version" value="1.34"/>
+ <property name="objenesis.version" value="2.1"/>
+
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
<available file="lib/hsqldb-${hsqldb.version}.jar" property="hsqldb-found"/>
@@ -1172,6 +1175,28 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
+ <target name="download-mockito">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/mockito"/>
+ <param name="artifact-version" value="${mockito.version}"/>
+ <param name="artifact-name" value="mockito-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/github/tomakehurst"/>
+ <param name="artifact-version" value="${wiremock.version}"/>
+ <param name="artifact-name" value="wiremock"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/objenesis"/>
+ <param name="artifact-version" value="${objenesis.version}"/>
+ <param name="artifact-name" value="objenesis"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-log4j">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -1755,7 +1780,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps" depends="download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,dow
nload-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps" depends="download-mockito,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework
,download-poi,download-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Propchange: manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct 2 18:47:44 2014
@@ -1,2 +1,10 @@
build
+dist
+doc
target
+test-output
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output
Modified: manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml?rev=1629039&r1=1629038&r2=1629039&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1037/connectors/alfresco-webscript/build.xml Thu Oct 2 18:47:44 2014
@@ -50,7 +50,7 @@
</copy>
</target>
- <target name="calculate-testcode-condition">
+ <!-- target name="calculate-testcode-condition">
<available file="test-materials-proprietary/alfresco.war" property="alfrescoTestcodeStatus"/>
<condition property="tests-present">
<isset property="alfrescoTestcodeStatus"/>
@@ -59,7 +59,7 @@
<target name="pretest-warn" depends="calculate-testcode-condition" unless="tests-present">
<echo message="Alfresco Connector integration tests cannot be be performed without alfresco.war"/>
- </target>
+ </target -->
<target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-repository-connector">
Modified: manifoldcf/branches/CONNECTORS-1037/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1037/framework/build.xml?rev=1629039&r1=1629038&r2=1629039&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1037/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1037/framework/build.xml Thu Oct 2 18:47:44 2014
@@ -60,7 +60,6 @@
<include name="slf4j*.jar"/>
<include name="jsp-2.1*.jar"/>
<include name="jsp-api*.jar"/>
- <include name="junit*.jar"/>
<include name="log4j*.jar"/>
<include name="serializer*.jar"/>
<include name="servlet-api*.jar"/>
@@ -75,6 +74,12 @@
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
+ <fileset dir="../lib">
+ <include name="junit*.jar"/>
+ <include name="mockito-core*.jar"/>
+ <include name="wiremock*.jar"/>
+ <include name="objenesis*.jar"/>
+ </fileset>
<fileset dir="../lib-proprietary">
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
@@ -1646,6 +1651,9 @@
<copy todir="dist/test-lib">
<fileset dir="../lib">
<include name="junit*.jar"/>
+ <include name="mockito-core*.jar"/>
+ <include name="wiremock*.jar"/>
+ <include name="objenesis*.jar"/>
<include name="juli*.jar"/>
</fileset>
<fileset dir="build/test-jar">