Modified: manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml?rev=1582281&r1=1582280&r2=1582281&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml (original) +++ manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml Thu Mar 27 12:51:51 2014 @@ -56,15 +56,9 @@ <path refid="mcf-connector-build.connector-classpath"/> <fileset dir="lib-proprietary" includes="*.jar"/> <fileset dir="../../lib"> - <include name="axis*.jar"/> - <include name="saaj*.jar"/> - <include name="commons-discovery*.jar"/> <include name="jaxrpc*.jar"/> <include name="opensaml*.jar"/> - <include name="wsdl4j*.jar"/> <include name="wss4j*.jar"/> - <!--include name="xalan*.jar"/--> - <!--include name="xercesImpl*.jar"/--> <include name="xmlsec*.jar"/> </fileset> </path> @@ -72,21 +66,16 @@ <path id="connector-test-classpath"> <path refid="mcf-connector-build.connector-test-classpath"/> <fileset file="../../lib/h2*.jar"/> + <fileset file="lib-proprietary/alfresco-web-service-client*.jar"/> </path> <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild"> <mkdir dir="dist/lib"/> <copy todir="dist/lib"> <fileset dir="../../lib"> - <include name="axis*.jar"/> - <include name="saaj*.jar"/> - <include name="commons-discovery*.jar"/> <include name="jaxrpc*.jar"/> <include name="opensaml*.jar"/> - <include name="wsdl4j*.jar"/> <include name="wss4j*.jar"/> - <!--include name="xalan*.jar"/--> - <!--include name="xercesImpl*.jar"/--> <include name="xmlsec*.jar"/> </fileset> </copy> @@ -98,15 +87,6 @@ </copy> </target> - <target name="build-test-materials" depends="pretest-check" if="canTest"> - <mkdir dir="build/alfresco-4-war"/> - <copy todir="build/alfresco-4-war"> - <fileset dir="test-materials-proprietary"> - <include name="alfresco*.war"/> - </fileset> - </copy> - </target> - <target name="download-alfresco-ws-client"> <get src="https://artifacts.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/4.2.c/alfresco-web-service-client-4.2.c.jar"; dest="lib-proprietary"/> </target> @@ -126,4 +106,33 @@ </antcall> </target> + <target name="run-IT-derby" depends="compile-tests,pretest-check" if="canTest"> + <mkdir dir="test-derby-output"/> + <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> + <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> + <jvmarg value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/> + <jvmarg value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/> + <jvmarg value="-DcombinedWarPath=${mcf-dist}/web/war/mcf-combined-service.war"/> + <jvmarg value="-DalfrescoServerWarPath=../test-materials-proprietary/alfresco.war"/> + <jvmarg value="-Xms512m"/> + <jvmarg value="-Xmx1024m"/> + <jvmarg value="-Xss1024k"/> + <jvmarg value="-XX:MaxPermSize=256m"/> + <jvmarg value="-XX:NewSize=256m"/> + <classpath> + <fileset dir="${env.JAVA_HOME}/lib"> + <include name="tools.jar"/> + </fileset> + <path refid="connector-test-classpath"/> + <pathelement location="build/connector-tests/classes"/> + </classpath> + <formatter type="brief" usefile="false"/> + <batchtest todir="test-derby-output"> + <fileset dir="build/connector-tests/classes"> + <include name="**/*DerbyIT.class"/> + </fileset> + </batchtest> + </junit> + </target> + </project>
Modified: manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml?rev=1582281&r1=1582280&r2=1582281&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml (original) +++ manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml Thu Mar 27 12:51:51 2014 @@ -753,18 +753,20 @@ </target> <!-- Main targets --> + + <target name="download-dependencies"/> + + <target name="download-cleanup"/> <target name="deliver-connector" depends="general-connector-delivery"/> <target name="deliver-connector-doc" depends="general-connector-doc-delivery"/> - + <target name="build" depends="lib,lib-proprietary-instructions,lib-proprietary-README,server-process,registry-process,integration"/> <target name="build-tests" depends="build,compile-tests"/> - <target name="build-test-materials"/> - - <target name="run-IT-derby" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-IT-derby" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-derby-output"/> <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -787,7 +789,7 @@ </junit> </target> - <target name="run-IT-postgresql" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-IT-postgresql" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-postgresql-output"/> <junit fork="true" maxmemory="128m" dir="test-postgresql-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -810,7 +812,7 @@ </junit> </target> - <target name="run-IT-HSQLDB" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-IT-HSQLDB" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-HSQLDB-output"/> <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -833,7 +835,7 @@ </junit> </target> - <target name="run-IT-HSQLDBext" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-IT-HSQLDBext" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-HSQLDBext-output"/> <junit fork="true" maxmemory="128m" dir="test-HSQLDBext-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -856,7 +858,7 @@ </junit> </target> - <target name="run-IT-mysql" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-IT-mysql" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-mysql-output"/> <junit fork="true" maxmemory="128m" dir="test-mysql-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web-proprietary/war/mcf-crawler-ui.war"/> @@ -879,7 +881,7 @@ </junit> </target> - <target name="run-LT-derby" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-LT-derby" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-derby-output"/> <junit fork="true" maxmemory="384m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -902,7 +904,7 @@ </junit> </target> - <target name="run-LT-postgresql" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-LT-postgresql" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-postgresql-output"/> <junit fork="true" maxmemory="384m" dir="test-postgresql-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -925,7 +927,7 @@ </junit> </target> - <target name="run-LT-HSQLDB" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-LT-HSQLDB" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-HSQLDB-output"/> <junit fork="true" maxmemory="384m" dir="test-HSQLDB-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -948,7 +950,7 @@ </junit> </target> - <target name="run-LT-HSQLDBext" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-LT-HSQLDBext" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-HSQLDBext-output"/> <junit fork="true" maxmemory="384m" dir="test-HSQLDBext-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -971,7 +973,7 @@ </junit> </target> - <target name="run-LT-mysql" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-LT-mysql" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-mysql-output"/> <junit fork="true" maxmemory="384m" dir="test-mysql-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web-proprietary/war/mcf-crawler-ui.war"/> @@ -994,7 +996,7 @@ </junit> </target> - <target name="run-UI-derby" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-UI-derby" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-derby-output"/> <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -1017,7 +1019,7 @@ </junit> </target> - <target name="run-UI-postgresql" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-UI-postgresql" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-postgresql-output"/> <junit fork="true" maxmemory="128m" dir="test-postgresql-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -1040,7 +1042,7 @@ </junit> </target> - <target name="run-UI-HSQLDB" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-UI-HSQLDB" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-HSQLDB-output"/> <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -1063,7 +1065,7 @@ </junit> </target> - <target name="run-UI-HSQLDBext" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-UI-HSQLDBext" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-HSQLDBext-output"/> <junit fork="true" maxmemory="128m" dir="test-HSQLDBext-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/> @@ -1086,7 +1088,7 @@ </junit> </target> - <target name="run-UI-mysql" depends="compile-tests,has-tests-check" if="hasTests"> + <target name="run-UI-mysql" depends="compile-tests,pretest-check" if="canTest"> <mkdir dir="test-mysql-output"/> <junit fork="true" maxmemory="128m" dir="test-mysql-output" outputtoformatters="true" showoutput="true" haltonfailure="true"> <jvmarg value="-DcrawlerWarPath=${mcf-dist}/web-proprietary/war/mcf-crawler-ui.war"/> @@ -1206,10 +1208,6 @@ </junit> </target> - <target name="download-dependencies"/> - - <target name="download-cleanup"/> - <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/> </project>
