manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1601646 - in /manifoldcf/branches/CONNECTORS-856-2: ./ connectors/solr/ connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/ connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/ framewor...
Date Tue, 10 Jun 2014 14:23:19 GMT
Author: kwright
Date: Tue Jun 10 14:23:19 2014
New Revision: 1601646

URL: http://svn.apache.org/r1601646
Log:
Pull up changes from CONNECTORS-856 branch

Added:
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java
      - copied unchanged from r1583905, manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java
      - copied unchanged from r1583905, manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/SolrConnectorTest.java
      - copied unchanged from r1583905, manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/SolrConnectorTest.java
Modified:
    manifoldcf/branches/CONNECTORS-856-2/   (props changed)
    manifoldcf/branches/CONNECTORS-856-2/build.xml
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/
  (props changed)
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml
    manifoldcf/branches/CONNECTORS-856-2/framework/build.xml
    manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml
    manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt
    manifoldcf/branches/CONNECTORS-856-2/pom.xml

Propchange: manifoldcf/branches/CONNECTORS-856-2/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-856-2:r1558363-1558366,1567646-1567672,1583896-1583905
  Merged /manifoldcf/branches/CONNECTORS-856:r1557893-1558363,1558367-1567648

Modified: manifoldcf/branches/CONNECTORS-856-2/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/build.xml?rev=1601646&r1=1601645&r2=1601646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/build.xml Tue Jun 10 14:23:19 2014
@@ -1201,6 +1201,72 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
+
+    <target name="download-mock">
+        <mkdir dir="lib"/>
+        <property name="powermock-version" value="1.5.2"/>
+        <property name="powermock-package" value="org/powermock"/>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-module-junit4"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-api-mockito"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-api-support"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-core"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-reflect"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="${powermock-package}"/>
+            <param name="artifact-version" value="${powermock-version}"/>
+            <param name="artifact-name" value="powermock-module-junit4-common"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/mockito"/>
+            <param name="artifact-version" value="1.9.5"/>
+            <param name="artifact-name" value="mockito-all"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/noggit"/>
+            <param name="artifact-version" value="0.5"/>
+            <param name="artifact-name" value="noggit"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/javassist"/>
+            <param name="artifact-version" value="3.18.0-GA"/>
+            <param name="artifact-name" value="javassist"/>
+            <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="1.2"/>
+            <param name="artifact-name" value="objenesis"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
     
     <target name="download-junit">
         <mkdir dir="lib"/>
@@ -1211,7 +1277,7 @@ Use Apache Forrest version forrest-0.9-d
             <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"/>
@@ -1802,7 +1868,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
 	
-    <target name="make-core-deps" depends="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-derby,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,do
 wnload-ecj,download-hadoop,download-protobuf,download-tika,download-jackson">
+    <target name="make-core-deps" depends="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-mock,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,downloa
 d-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-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 10 14:23:19 2014
@@ -0,0 +1,92 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1405810-1419032
+/manifoldcf/branches/CONNECTORS-566/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1541770-1542875,1542879-1545621,1545632-1546964,1546969-1547166,1547171-1548079,1548085-1549104
+/manifoldcf/branches/CONNECTORS-792/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1557897-1558265
+/manifoldcf/branches/CONNECTORS-856/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1557893-1558363,1558367-1567648
+/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1558363-1558366,1583896-1583905
+/manifoldcf/branches/CONNECTORS-867/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1568778-1568807
+/manifoldcf/branches/CONNECTORS-912/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output:1579605-1582110

Modified: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml?rev=1601646&r1=1601645&r2=1601646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/connectors/solr/pom.xml Tue Jun 10 14:23:19 2014
@@ -230,6 +230,18 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-module-junit4</artifactId>
+          <version>${powerMock.version}</version>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.powermock</groupId>
+          <artifactId>powermock-api-mockito</artifactId>
+          <version>${powerMock.version}</version>
+          <scope>test</scope>
+      </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: manifoldcf/branches/CONNECTORS-856-2/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/framework/build.xml?rev=1601646&r1=1601645&r2=1601646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/framework/build.xml Tue Jun 10 14:23:19 2014
@@ -59,7 +59,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"/>
@@ -82,6 +81,22 @@
         </fileset>
 
     </path>
+
+    <path id="framework-test-classpath">
+        <path refid="framework-classpath"/>
+        <fileset dir="../lib">
+            <include name="junit*.jar"/>
+            <include name="powermock-module-junit4*.jar"/>
+            <include name="powermock-core*.jar"/>
+            <include name="powermock-reflect*.jar"/>
+            <include name="powermock-api-support*.jar"/>
+            <include name="powermock-api-mockito*.jar"/>
+            <include name="mockito-all*.jar"/>
+            <include name="noggit*.jar"/>
+            <include name="javassist*.jar"/>
+            <include name="objenesis*.jar"/>
+        </fileset>
+    </path>
     
     <target name="doc">
         <mkdir dir="dist/doc"/>
@@ -1533,7 +1548,7 @@
         <mkdir dir="build/core-tests/classes"/>
         <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" deprecation="true"
target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
             </classpath>
         </javac>
@@ -1543,7 +1558,7 @@
         <mkdir dir="build/agents-tests/classes"/>
         <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true"
target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1555,7 +1570,7 @@
         <mkdir dir="build/pull-agent-tests/classes"/>
         <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes"
deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1569,7 +1584,7 @@
         <mkdir dir="build/script-engine-tests/classes"/>
         <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes"
deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/script-engine/classes"/>
             </classpath>
@@ -1609,6 +1624,15 @@
             <fileset dir="../lib">
                 <include name="junit*.jar"/>
                 <include name="juli*.jar"/>
+                <include name="powermock-module-junit4*.jar"/>
+                <include name="powermock-core*.jar"/>
+                <include name="powermock-reflect*.jar"/>
+                <include name="powermock-api-support*.jar"/>
+                <include name="powermock-api-mockito*.jar"/>
+                <include name="mockito-all*.jar"/>
+                <include name="noggit*.jar"/>
+                <include name="javassist*.jar"/>
+                <include name="objenesis*.jar"/>
             </fileset>
             <fileset dir="build/test-jar">
                 <include name="mcf-core-tests.jar"/>
@@ -1625,7 +1649,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
             </classpath>
@@ -1643,7 +1667,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/core-tests/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1662,7 +1686,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/script-engine/classes"/>
                 <pathelement location="build/script-engine-tests/classes"/>
@@ -1679,7 +1703,7 @@
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <fileset dir="build/test-jar">
                     <include name="mcf-core-tests.jar"/>
                 </fileset>
@@ -1697,7 +1721,7 @@
         <mkdir dir="test-derby-output"/>
         <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1720,7 +1744,7 @@
         <mkdir dir="test-postgresql-output"/>
         <junit fork="true" maxmemory="128m" dir="test-postgresql-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1743,7 +1767,7 @@
         <mkdir dir="test-mysql-output"/>
         <junit fork="true" maxmemory="128m" dir="test-mysql-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1766,7 +1790,7 @@
         <mkdir dir="test-HSQLDB-output"/>
         <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>
@@ -1789,7 +1813,7 @@
         <mkdir dir="test-HSQLDBext-output"/>
         <junit fork="true" maxmemory="128m" dir="test-HSQLDBext-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <classpath>
-                <path refid="framework-classpath"/>
+                <path refid="framework-test-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>

Modified: manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml?rev=1601646&r1=1601645&r2=1601646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/framework/buildfiles/connector-build.xml Tue Jun
10 14:23:19 2014
@@ -130,7 +130,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"/>

Modified: manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt?rev=1601646&r1=1601645&r2=1601646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-856-2/lib-license/LICENSE.txt Tue Jun 10 14:23:19 2014
@@ -327,10 +327,29 @@ License: Apache 2  (http://www.apache.or
 This product includes a tagsoup.jar.
 License: Apache 2 (http://home.ccil.org/~cowan/XML/tagsoup/)
 
+This product includes a mockito-all.jar.
+License: MIT (http://code.google.com/p/mockito/wiki/License)
+
 This product may include pdf files that embed IPA-licensed fonts.
 License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)
 
 ==========================================================================
+The following license applies to mockito-all.jar:
+--------------------------------------------------------------------------
+
+
+The MIT License
+
+Copyright (c) 2007 Mockito contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+==========================================================================
 The following license applies to json.jar, which is generated from the json
 sources from http://www.json.org/java/index.html
 --------------------------------------------------------------------------

Modified: manifoldcf/branches/CONNECTORS-856-2/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/pom.xml?rev=1601646&r1=1601645&r2=1601646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/pom.xml Tue Jun 10 14:23:19 2014
@@ -38,6 +38,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- dependency versions -->
     <junit.version>4.8.2</junit.version>
+    <powerMock.version>1.5.2</powerMock.version>
     <postgresql.version>9.1-901.jdbc4</postgresql.version>
     <mysql.version>5.1.18</mysql.version>
     <hsqldb.version>2.3.1</hsqldb.version>



Mime
View raw message