svn commit: r1837793 - in /manifoldcf/branches/CONNECTORS-1490/connectors/mongodb: build.xml connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java

[piergiorgio]

Author: piergiorgio
Date: Fri Aug 10 11:09:29 2018
New Revision: 1837793

URL: http://svn.apache.org/viewvc?rev=1837793&view=rev
Log:
- fix for MongoDB Output Connector ant build (CONNECTORS-1490)

Modified:
    manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/build.xml
    
manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java

Modified: manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/build.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/build.xml?rev=1837793&r1=1837792&r2=1837793&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/build.xml Fri Aug 10 
11:09:29 2018
@@ -27,12 +27,6 @@
             <isset property="env.MCFDISTPATH"/>
         </not>
     </condition>
-    <condition property="is-on-Windows">
-        <os family="windows" />
-    </condition>
-    <condition property="is-on-Unix">
-        <os family="unix" />
-    </condition>
 
     <import file="${mcf-dist}/connector-build.xml"/>
 
@@ -65,34 +59,6 @@
                    
value="org.apache.manifoldcf.agents.output.mongodboutput.MongodbOutputConnector"/>
         </antcall>
     </target>
-
-    <target name="run-IT-HSQLDB" depends="run-maven-IT-on-unix, 
run-maven-IT-on-windows"/>
-
-    <target name="run-maven-IT-on-windows" if="is-on-Windows">
-        <exec dir="." executable="cmd" resultproperty="result">
-            <arg line="/c mvn verify" />
-        </exec>
-        <fail>
-            <condition>
-                <not>
-                <equals arg1="${result}" arg2="0" />
-                </not>
-            </condition>
-        </fail>
-    </target>
-
-    <target name="run-maven-IT-on-unix" if="is-on-Unix">
-        <exec dir="." executable="sh" resultproperty="result">
-            <arg line="-c 'mvn verify'" />
-        </exec>
-        <fail>
-            <condition>
-                <not>
-                    <equals arg1="${result}" arg2="0" />
-                </not>
-            </condition>
-        </fail>
-    </target>
        
          <property name="embedded-mongodb.version.label" value="2.1.2"/>
     <property name="embedded-mongodb.version.snapshot" 
value="20180621.063700-1" />
@@ -106,7 +72,14 @@
     <property name="embedded-mongodb.process.jar" 
value="${embedded-mongodb.process.artifactId}-${embedded-mongodb.process.version.label}.jar"/>
        
          <target name="calculate-testcode-condition">
-           <available file="test-lib/${embedded-mongodb.snapshot-jar}" 
property="tests-present"/>
+           <available file="test-materials/${embedded-mongodb.snapshot-jar}" 
property="tests-present"/>
+      <available file="test-materials/${embedded-mongodb.process.jar}" 
property="tests-present"/>
+               
+               <copy todir="${mcf-dist}/test-lib">
+          <fileset dir="test-materials">
+              <include name="de.flapdoodle.embed*.jar"/>
+          </fileset>
+      </copy>
          </target>
 
     <target name="pretest-warn" depends="calculate-testcode-condition" 
unless="tests-present">

Modified: 
manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java?rev=1837793&r1=1837792&r2=1837793&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1490/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java
 Fri Aug 10 11:09:29 2018
@@ -21,8 +21,6 @@ package org.apache.manifoldcf.agents.out
 import org.junit.After;
 import org.junit.Before;
 
-import com.mongodb.Mongo;
-
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodProcess;
 import de.flapdoodle.embed.mongo.MongodStarter;
@@ -41,7 +39,6 @@ public class BaseITHSQLDB extends org.ap
 
        private MongodExecutable mongodExecutable;
        private MongodProcess mongod;
-       private Mongo mongo;
 
        protected String[] getConnectorNames() {
                return new String[] { "CMIS" };