manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1583903 [1/2] - in /manifoldcf/branches/CONNECTORS-856-2: ./ connectors/solr/ connectors/solr/connector/src/test/java/org/apache/ connectors/solr/connector/src/test/java/org/apache/manifoldcf/ connectors/solr/connector/src/test/java/org/ap...
Date Wed, 02 Apr 2014 07:15:41 GMT
Author: kwright
Date: Wed Apr  2 07:15:40 2014
New Revision: 1583903

URL: http://svn.apache.org/r1583903
Log:
Merge code from CONNECTORS-856 branch

Added:
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java   (with props)
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java   (with props)
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/SolrConnectorTest.java   (with props)
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/   (props changed)
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/   (props changed)
    manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/   (props changed)
    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/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/   (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
  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=1583903&r1=1583902&r2=1583903&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856-2/build.xml Wed Apr  2 07:15:40 2014
@@ -2128,6 +2128,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"/>
@@ -2138,7 +2204,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"/>
@@ -2518,7 +2584,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
     
-    <target name="make-core-deps" depends="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,download-ecj,download-hadoop,
 download-protobuf">
+    <target name="make-core-deps" depends="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,download-chemistry,download-ecj,do
 wnload-hadoop,download-protobuf">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr  2 07:15:40 2014
@@ -0,0 +1,92 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/solr/connector/src/test/java/org/apache:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/solr/connector/src/test/java/org/apache:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/solr/connector/src/test/java/org/apache:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/solr/connector/src/test/java/org/apache:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/solr/connector/src/test/java/org/apache:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/solr/connector/src/test/java/org/apache:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/solr/connector/src/test/java/org/apache:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/solr/connector/src/test/java/org/apache:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/solr/connector/src/test/java/org/apache:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/solr/connector/src/test/java/org/apache:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/solr/connector/src/test/java/org/apache:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/solr/connector/src/test/java/org/apache:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/solr/connector/src/test/java/org/apache:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/solr/connector/src/test/java/org/apache:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/solr/connector/src/test/java/org/apache:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/solr/connector/src/test/java/org/apache:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/solr/connector/src/test/java/org/apache:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/solr/connector/src/test/java/org/apache:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/solr/connector/src/test/java/org/apache:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/solr/connector/src/test/java/org/apache:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/solr/connector/src/test/java/org/apache:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/solr/connector/src/test/java/org/apache:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/solr/connector/src/test/java/org/apache:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/solr/connector/src/test/java/org/apache:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/solr/connector/src/test/java/org/apache:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/solr/connector/src/test/java/org/apache:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/solr/connector/src/test/java/org/apache:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/solr/connector/src/test/java/org/apache:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/solr/connector/src/test/java/org/apache:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/solr/connector/src/test/java/org/apache:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/solr/connector/src/test/java/org/apache:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/solr/connector/src/test/java/org/apache:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/connectors/solr/connector/src/test/java/org/apache:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/connectors/solr/connector/src/test/java/org/apache:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/solr/connector/src/test/java/org/apache:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/solr/connector/src/test/java/org/apache:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/solr/connector/src/test/java/org/apache:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/solr/connector/src/test/java/org/apache:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/solr/connector/src/test/java/org/apache:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/solr/connector/src/test/java/org/apache:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/solr/connector/src/test/java/org/apache:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/connectors/solr/connector/src/test/java/org/apache:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/connectors/solr/connector/src/test/java/org/apache:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/connectors/solr/connector/src/test/java/org/apache:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/connectors/solr/connector/src/test/java/org/apache:1405810-1419032
+/manifoldcf/branches/CONNECTORS-566/connectors/solr/connector/src/test/java/org/apache:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/connectors/solr/connector/src/test/java/org/apache:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/connectors/solr/connector/src/test/java/org/apache:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/connectors/solr/connector/src/test/java/org/apache:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/connectors/solr/connector/src/test/java/org/apache:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/connectors/solr/connector/src/test/java/org/apache:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/connectors/solr/connector/src/test/java/org/apache:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/test/java/org/apache:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/connectors/solr/connector/src/test/java/org/apache:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/connectors/solr/connector/src/test/java/org/apache:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/connectors/solr/connector/src/test/java/org/apache:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/connectors/solr/connector/src/test/java/org/apache:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/connectors/solr/connector/src/test/java/org/apache:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/connectors/solr/connector/src/test/java/org/apache:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/connectors/solr/connector/src/test/java/org/apache:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/connectors/solr/connector/src/test/java/org/apache:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/connectors/solr/connector/src/test/java/org/apache:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/connectors/solr/connector/src/test/java/org/apache:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/connectors/solr/connector/src/test/java/org/apache:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/connectors/solr/connector/src/test/java/org/apache:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/connectors/solr/connector/src/test/java/org/apache:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/connectors/solr/connector/src/test/java/org/apache:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/connectors/solr/connector/src/test/java/org/apache:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/connectors/solr/connector/src/test/java/org/apache:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/connectors/solr/connector/src/test/java/org/apache:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/connectors/solr/connector/src/test/java/org/apache:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/connectors/solr/connector/src/test/java/org/apache:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/connectors/solr/connector/src/test/java/org/apache:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/connectors/solr/connector/src/test/java/org/apache:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/connectors/solr/connector/src/test/java/org/apache:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/connectors/solr/connector/src/test/java/org/apache:1541770-1542875,1542879-1545621,1545632-1546964,1546969-1547166,1547171-1548079,1548085-1549104
+/manifoldcf/branches/CONNECTORS-792/connectors/solr/connector/src/test/java/org/apache:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/connectors/solr/connector/src/test/java/org/apache:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/connectors/solr/connector/src/test/java/org/apache:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/test/java/org/apache:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/test/java/org/apache:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/test/java/org/apache:1557897-1558265
+/manifoldcf/branches/CONNECTORS-856/connectors/solr/connector/src/test/java/org/apache:1557893-1558363,1558367-1567648
+/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache:1558363-1558366
+/manifoldcf/branches/CONNECTORS-867/connectors/solr/connector/src/test/java/org/apache:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/connectors/solr/connector/src/test/java/org/apache:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/connectors/solr/connector/src/test/java/org/apache:1568778-1568807
+/manifoldcf/branches/CONNECTORS-912/connectors/solr/connector/src/test/java/org/apache:1579605-1582723

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr  2 07:15:40 2014
@@ -0,0 +1,92 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1405810-1419032
+/manifoldcf/branches/CONNECTORS-566/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/connectors/solr/connector/src/test/java/org/apache/manifoldcf: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:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1557897-1558265
+/manifoldcf/branches/CONNECTORS-856/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1557893-1558363,1558367-1567648
+/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1558363-1558366
+/manifoldcf/branches/CONNECTORS-867/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1568778-1568807
+/manifoldcf/branches/CONNECTORS-912/connectors/solr/connector/src/test/java/org/apache/manifoldcf:1579605-1582723

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr  2 07:15:40 2014
@@ -0,0 +1,92 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1405810-1419032
+/manifoldcf/branches/CONNECTORS-566/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents: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:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1557897-1558265
+/manifoldcf/branches/CONNECTORS-856/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1557893-1558363,1558367-1567648
+/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1558363-1558366
+/manifoldcf/branches/CONNECTORS-867/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1568778-1568807
+/manifoldcf/branches/CONNECTORS-912/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents:1579605-1582723

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr  2 07:15:40 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
+/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-1582723

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr  2 07:15:40 2014
@@ -0,0 +1,92 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1335360-1336940
+/manifoldcf/branches/CONNECTORS-120/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1405810-1419032
+/manifoldcf/branches/CONNECTORS-566/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr: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/solr:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1557897-1558265
+/manifoldcf/branches/CONNECTORS-856/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1557893-1558363,1558367-1567648
+/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1558363-1558366
+/manifoldcf/branches/CONNECTORS-867/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1568778-1568807
+/manifoldcf/branches/CONNECTORS-912/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr:1579605-1582723

Added: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java?rev=1583903&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java (added)
+++ manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java Wed Apr  2 07:15:40 2014
@@ -0,0 +1,221 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.manifoldcf.agents.output.solr;
+
+import junit.framework.TestCase;
+import org.apache.log4j.Logger;
+import org.apache.manifoldcf.agents.interfaces.IOutputAddActivity;
+import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
+import org.apache.manifoldcf.agents.system.Logging;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.*;
+
+/**
+ * @Author: Alessandro Benedetti Date: 19/12/2013
+ */
+
+@RunWith( PowerMockRunner.class )
+@PrepareForTest( { HttpPoster.class } )
+public class HttpPosterTest
+  extends TestCase
+{
+
+
+  HttpPoster httpPosterToTest;
+
+  RepositoryDocument document;
+
+  IOutputAddActivity act;
+
+  @Override
+  public void setUp()
+    throws Exception
+  {
+
+    httpPosterToTest = spy(new HttpPoster( "localhost", "collection1", 5000, 500, "update", "removePath", "statusPath",
+                 "allowAttributeName", "denyAttributeName", "idAttributeName",
+                 "modifiedDateAttributeName", "createdDateAttributeName", "indexedDateAttributeName",
+                 "fileNameAttributeName", "mimeTypeAttributeName", new Long( 5000 ), "true"));
+  }
+
+  /**
+   * Verify  the IndexPost Method create the correct IngestThread class
+   * @throws Exception
+   */
+  public void testIndexPost()
+    throws Exception
+  {
+    String[] shareAcls = new String[]{ "shareAcl1", "shareAcl2" };
+    String[] shareDenyAcls = new String[]{ "denyShareAcl1", "denyShareAcl2" };
+    String[] acls = new String[]{ "acl1", "acl2" };
+    String[] denyAcls = new String[]{ "denyAcl1", "denyAcl2" };
+
+    Logging.ingest = mock( Logger.class );
+    when( Logging.ingest.isDebugEnabled() ).thenReturn( false );
+    initRepositoryDocumentMock( shareAcls, shareDenyAcls, acls, denyAcls );
+
+    act = mock( IOutputAddActivity.class );
+    when(act.qualifyAccessToken( eq( "AuthorityString"), anyString() )).thenAnswer(new Answer<String>() {
+      @Override
+      public String answer(InvocationOnMock invocation) throws Throwable {
+        Object[] args = invocation.getArguments();
+        return (String) args[1];
+      }
+    });
+
+    Map<String, List<String>> sourceTargets = this.getMappingsMap();
+    Map<String, List<String>> streamParam = this.getArgumentsMap();
+
+    String commitWithin = "true";
+    HttpPoster.IngestThread mockIngestionThread=mock(HttpPoster.IngestThread.class);
+    Mockito.doThrow(new RuntimeException()).when( mockIngestionThread ).run();
+
+    whenNew( HttpPoster.IngestThread.class).withArguments("Document Id", document, streamParam, true, sourceTargets,shareAcls,
+      shareDenyAcls, acls, denyAcls,commitWithin).thenReturn(mockIngestionThread);
+    httpPosterToTest.indexPost("Document Id", document, streamParam,
+      sourceTargets,true, "AuthorityString",act);
+
+    verifyNew(HttpPoster.IngestThread.class).withArguments("Document Id", document, streamParam, true, sourceTargets, shareAcls,
+      shareDenyAcls, acls, denyAcls, commitWithin );
+  }
+
+  private void initRepositoryDocumentMock( String[] shareAcls, String[] shareDenyAcls, String[] acls,
+    String[] denyAcls )
+    throws IOException
+  {
+    document = mock( RepositoryDocument.class );
+    List<String> fields = getFields();
+    Iterator<String> fieldsIterator = fields.iterator();
+    when( document.getFields() ).thenReturn( fieldsIterator );
+    when( document.getFieldAsStrings( "cm:description" ) ).thenReturn( new String[]{ "description" } );
+    when( document.getFieldAsStrings( "cm:name" ) ).thenReturn( new String[]{ "name" } );
+    when( document.getFieldAsStrings( "cm:title" ) ).thenReturn( new String[]{ "title" } );
+    when( document.getFieldAsStrings( "extraMetadata1" ) ).thenReturn( new String[]{ "value1" } );
+    when( document.getFieldAsStrings( "extraMetadata2" ) ).thenReturn( new String[]{ "value2" } );
+    when( document.getFieldAsStrings( "extraMetadata3" ) ).thenReturn( new String[]{ "value3" } );
+    when( document.getACL()).thenReturn(acls);
+    when( document.getShareACL()).thenReturn(shareAcls);
+    when( document.getShareDenyACL()).thenReturn( shareDenyAcls );
+    when( document.getDenyACL()).thenReturn(denyAcls);
+  }
+
+  /**
+   * inits the expected solr params for both the tests, in the first one we expect the extra params not to be present
+   * because they are not in the mappings
+   *
+   * @param test2
+   * @return
+   * @throws java.io.UnsupportedEncodingException
+   */
+  private ModifiableSolrParams initExpectedSolrParams( Boolean test2 )
+    throws UnsupportedEncodingException
+  {
+    ModifiableSolrParams expectedParams = new ModifiableSolrParams();
+    expectedParams.add( "literal.idAttributeName", "document id" );
+    expectedParams.add( "literal.allowAttributeNameshare", "shareAcl1" );
+    expectedParams.add( "literal.allowAttributeNameshare", "shareAcl2" );
+    expectedParams.add( "literal.denyAttributeNameshare", "denyShareAcl1" );
+    expectedParams.add( "literal.denyAttributeNameshare", "denyShareAcl2" );
+    expectedParams.add( "literal.allowAttributeNamedocument", "acl1" );
+    expectedParams.add( "literal.allowAttributeNamedocument", "acl2" );
+    expectedParams.add( "literal.denyAttributeNamedocument", "denyAcl1" );
+    expectedParams.add( "literal.denyAttributeNamedocument", "denyAcl2" );
+    expectedParams.add( "stream.type", "text/plain" );
+    expectedParams.add( "literal.cm_description_s", "description" );
+    expectedParams.add( "literal.cm_title_s", "title" );
+    expectedParams.add( "literal.cm_name_s", "name" );
+    if ( test2 )
+    {
+      expectedParams.add( "literal.extraMetadata1", "value1" );
+      expectedParams.add( "literal.extraMetadata2", "value2" );
+      expectedParams.add( "literal.extraMetadata3", "value3" );
+    }
+    expectedParams.add( "commitWithin", "true" );
+    return expectedParams;
+  }
+
+  /**
+   * return a list of example metadata fields present in a mock document
+   *
+   * @return
+   */
+  private List<String> getFields()
+  {
+    List<String> fields = new ArrayList<String>();
+    fields.add( "cm:description" );
+    fields.add( "cm:title" );
+    fields.add( "cm:name" );
+    fields.add( "extraMetadata1" );
+    fields.add( "extraMetadata2" );
+    fields.add( "extraMetadata3" );
+    return fields;
+  }
+
+  /**
+   * returns a testing mapping map
+   *
+   * @return
+   */
+  private Map<String, List<String>> getMappingsMap()
+  {
+    Map<String, List<String>> sourceTargets = new HashMap<String, List<String>>();
+    List<String> firstList = new ArrayList<String>();
+    firstList.add( "cm_description_s" );
+    List<String> secondList = new ArrayList<String>();
+    secondList.add( "cm_name_s" );
+    List<String> thirdList = new ArrayList<String>();
+    thirdList.add( "cm_title_s" );
+
+    sourceTargets.put( "cm:description", firstList );
+    sourceTargets.put( "cm:name", secondList );
+    sourceTargets.put( "cm:title", thirdList );
+    return sourceTargets;
+  }
+
+  /**
+   * returns a testing argument map
+   *
+   * @return
+   */
+  private Map<String, List<String>> getArgumentsMap()
+  {
+    Map<String, List<String>> sourceTargets = new HashMap<String, List<String>>();
+    List<String> firstList = new ArrayList<String>();
+    firstList.add( "text/plain" );
+    sourceTargets.put( "stream.type", firstList );
+    return sourceTargets;
+  }
+}

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/HttpPosterTest.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java?rev=1583903&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java (added)
+++ manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java Wed Apr  2 07:15:40 2014
@@ -0,0 +1,255 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.manifoldcf.agents.output.solr;
+
+import junit.framework.TestCase;
+import org.apache.log4j.Logger;
+import org.apache.manifoldcf.agents.interfaces.IOutputAddActivity;
+import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
+import org.apache.manifoldcf.agents.system.Logging;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
+import org.apache.solr.client.solrj.response.UpdateResponse;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.doCallRealMethod;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.spy;
+import static org.powermock.api.mockito.PowerMockito.*;
+
+/**
+ * @Author: Alessandro Benedetti Date: 19/12/2013
+ */
+@RunWith( PowerMockRunner.class )
+@PrepareForTest( { HttpPoster.IngestThread.class } )
+public class IngestThreadTest
+  extends TestCase
+{
+
+  HttpPoster.IngestThread ingestThreadToTestKeepAllMetadata;
+  HttpPoster.IngestThread ingestThreadToTest;
+
+  HttpPoster poster;
+
+  RepositoryDocument document;
+
+  IOutputAddActivity act;
+
+  @Override
+  public void setUp()
+    throws Exception
+  {
+
+    poster =new HttpPoster( "zkHost", "collection1", 5000, 500, "update", "removePath", "statusPath",
+                 "allowAttributeName", "denyAttributeName", "idAttributeName",
+                 "modifiedDateAttributeName", "createdDateAttributeName", "indexedDateAttributeName",
+                 "fileNameAttributeName", "mimeTypeAttributeName", new Long( 5000 ), "true" );
+
+    Logging.ingest = mock( Logger.class );
+    when( Logging.ingest.isDebugEnabled() ).thenReturn( false );
+    document = mock( RepositoryDocument.class );
+    List<String> fields = getFields();
+    Iterator<String> fieldsIterator = fields.iterator();
+    when( document.getFields() ).thenReturn( fieldsIterator );
+    when( document.getFieldAsStrings( "cm:description" ) ).thenReturn( new String[]{ "description" } );
+    when( document.getFieldAsStrings( "cm:name" ) ).thenReturn( new String[]{ "name" } );
+    when( document.getFieldAsStrings( "cm:title" ) ).thenReturn( new String[]{ "title" } );
+    when( document.getFieldAsStrings( "extraMetadata1" ) ).thenReturn( new String[]{ "value1" } );
+    when( document.getFieldAsStrings( "extraMetadata2" ) ).thenReturn( new String[]{ "value2" } );
+    when( document.getFieldAsStrings( "extraMetadata3" ) ).thenReturn( new String[]{ "value3" } );
+
+    act = mock( IOutputAddActivity.class );
+
+    Map<String, List<String>> sourceTargets = this.getMappingsMap();
+    Map<String, List<String>> streamParam = this.getArgumentsMap();
+    String[] shareAcls = new String[]{ "shareAcl1", "shareAcl2" };
+    String[] shareDenyAcls = new String[]{ "denyShareAcl1", "denyShareAcl2" };
+    String[] acls = new String[]{ "acl1", "acl2" };
+    String[] denyAcls = new String[]{ "denyAcl1", "denyAcl2" };
+    Map<String,String[]> aclsMap = new HashMap<String,String[]>();
+    Map<String,String[]> denyAclsMap = new HashMap<String,String[]>();
+    aclsMap.put("share",shareAcls);
+    aclsMap.put("document",acls);
+    denyAclsMap.put("share",shareDenyAcls);
+    denyAclsMap.put("document",denyAcls);
+    String commitWithin = "true";
+
+    ingestThreadToTestKeepAllMetadata = spy(
+      poster.new IngestThread( "document id", document, streamParam, true, sourceTargets,
+                   aclsMap, denyAclsMap, commitWithin ) );
+    ingestThreadToTest = spy(
+      poster.new IngestThread( "document id", document, streamParam, false, sourceTargets,
+                   aclsMap, denyAclsMap, commitWithin ) );
+
+  }
+
+
+  public void testIndexPostNotKeepMetadata()
+    throws Exception
+  {
+    this.indexPostNotKeepMetadata( ingestThreadToTestKeepAllMetadata, true );
+    this.indexPostNotKeepMetadata( ingestThreadToTest, false );
+
+  }
+
+  /**
+   * Verify the behaviour, when the keep variable is set to true, we want to send to Solr all the metadata fields
+   *
+   * @param keep
+   * @throws Exception
+   */
+  private void indexPostNotKeepMetadata( HttpPoster.IngestThread it, boolean keep )
+    throws Exception
+  {
+    ContentStreamUpdateRequest contentStreamUpdateRequest = mock( ContentStreamUpdateRequest.class );
+    whenNew( ContentStreamUpdateRequest.class ).withArguments( anyString() ).thenReturn(
+      contentStreamUpdateRequest );
+    UpdateResponse mockResponse = mock( UpdateResponse.class );
+    when( contentStreamUpdateRequest.process( any( SolrServer.class ) ) ).thenReturn( mockResponse );
+    doCallRealMethod().when( contentStreamUpdateRequest ).setParams( any( ModifiableSolrParams.class ) );
+    doCallRealMethod().when( contentStreamUpdateRequest ).getParams();
+    it.run();
+    verifyNew( ContentStreamUpdateRequest.class, atLeastOnce() ).withArguments( anyString() );
+
+    ModifiableSolrParams expectedParams = initExpectedSolrParams( keep );
+    assertEqualsModifiableSolrParams( expectedParams, contentStreamUpdateRequest.getParams() );
+    verify( contentStreamUpdateRequest ).process( any( SolrServer.class ) );
+
+  }
+
+  /**
+   * asserts that 2 ModifiableSolrParams are equals
+   *
+   * @param expected
+   * @param actual
+   * @return
+   */
+  private boolean assertEqualsModifiableSolrParams( ModifiableSolrParams expected, ModifiableSolrParams actual )
+  {
+    Set<String> expectedParameterNames = expected.getParameterNames();
+    Set<String> actualParameterNames = actual.getParameterNames();
+    int expectedSize = expectedParameterNames.size();
+    assertEquals( expectedSize, actualParameterNames.size() );
+    for ( String parameterName : expectedParameterNames )
+    {
+      assertEquals( expected.get( parameterName ), actual.get( parameterName ) );
+    }
+    return true;
+  }
+
+  /**
+   * inits the expected solr params for both the tests, in the first one we expect the extra params not to be present
+   * because they are not in the mappings
+   *
+   * @param test2
+   * @return
+   * @throws UnsupportedEncodingException
+   */
+  private ModifiableSolrParams initExpectedSolrParams( boolean test2 )
+    throws UnsupportedEncodingException
+  {
+    ModifiableSolrParams expectedParams = new ModifiableSolrParams();
+    expectedParams.add( "literal.idAttributeName", "document id" );
+    expectedParams.add( "literal.allowAttributeNameshare", "shareAcl1" );
+    expectedParams.add( "literal.allowAttributeNameshare", "shareAcl2" );
+    expectedParams.add( "literal.denyAttributeNameshare", "denyShareAcl1" );
+    expectedParams.add( "literal.denyAttributeNameshare", "denyShareAcl2" );
+    expectedParams.add( "literal.allowAttributeNamedocument", "acl1" );
+    expectedParams.add( "literal.allowAttributeNamedocument", "acl2" );
+    expectedParams.add( "literal.denyAttributeNamedocument", "denyAcl1" );
+    expectedParams.add( "literal.denyAttributeNamedocument", "denyAcl2" );
+    expectedParams.add( "stream.type", "text/plain" );
+    expectedParams.add( "literal.cm_description_s", "description" );
+    expectedParams.add( "literal.cm_title_s", "title" );
+    expectedParams.add( "literal.cm_name_s", "name" );
+    if ( test2 )
+    {
+      expectedParams.add( "literal.extraMetadata1", "value1" );
+      expectedParams.add( "literal.extraMetadata2", "value2" );
+      expectedParams.add( "literal.extraMetadata3", "value3" );
+    }
+    expectedParams.add( "commitWithin", "true" );
+    return expectedParams;
+  }
+
+  /**
+   * return a list of example metadata fields present in a mock document
+   *
+   * @return
+   */
+  private List<String> getFields()
+  {
+    List<String> fields = new ArrayList<String>();
+    fields.add( "cm:description" );
+    fields.add( "cm:title" );
+    fields.add( "cm:name" );
+    fields.add( "extraMetadata1" );
+    fields.add( "extraMetadata2" );
+    fields.add( "extraMetadata3" );
+    return fields;
+  }
+
+  /**
+   * returns a testing mapping map
+   *
+   * @return
+   */
+  private Map<String, List<String>> getMappingsMap()
+  {
+    Map<String, List<String>> sourceTargets = new HashMap<String, List<String>>();
+    List<String> firstList = new ArrayList<String>();
+    firstList.add( "cm_description_s" );
+    List<String> secondList = new ArrayList<String>();
+    secondList.add( "cm_name_s" );
+    List<String> thirdList = new ArrayList<String>();
+    thirdList.add( "cm_title_s" );
+
+    sourceTargets.put( "cm:description", firstList );
+    sourceTargets.put( "cm:name", secondList );
+    sourceTargets.put( "cm:title", thirdList );
+    return sourceTargets;
+  }
+
+  /**
+   * returns a testing argument map
+   *
+   * @return
+   */
+  private Map<String, List<String>> getArgumentsMap()
+  {
+    Map<String, List<String>> sourceTargets = new HashMap<String, List<String>>();
+    List<String> firstList = new ArrayList<String>();
+    firstList.add( "text/plain" );
+    sourceTargets.put( "stream.type", firstList );
+    return sourceTargets;
+  }
+}

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-856-2/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/IngestThreadTest.java
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message