You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/12/17 03:11:35 UTC

svn commit: r1646137 [1/2] - in /manifoldcf/branches/release-1.8-branch: ./ connectors/activedirectory/ connectors/alfresco-webscript/ connectors/alfresco/ connectors/amazoncloudsearch/ connectors/cmis/ connectors/documentfilter/ connectors/dropbox/ co...

Author: kwright
Date: Wed Dec 17 02:11:34 2014
New Revision: 1646137

URL: http://svn.apache.org/r1646137
Log:
Pull up fix for CONNECTORS-1035 from dev_1x branch

Added:
    manifoldcf/branches/release-1.8-branch/framework/connector-common/
      - copied from r1646136, manifoldcf/branches/dev_1x/framework/connector-common/
    manifoldcf/branches/release-1.8-branch/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
      - copied unchanged from r1646136, manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
Removed:
    manifoldcf/branches/release-1.8-branch/framework/core/src/main/java/org/apache/manifoldcf/core/common/CommonsHTTPSender.java
    manifoldcf/branches/release-1.8-branch/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd
Modified:
    manifoldcf/branches/release-1.8-branch/   (props changed)
    manifoldcf/branches/release-1.8-branch/CHANGES.txt
    manifoldcf/branches/release-1.8-branch/build.xml
    manifoldcf/branches/release-1.8-branch/connectors/activedirectory/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/alfresco-webscript/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/alfresco/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/amazoncloudsearch/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/cmis/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/documentfilter/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/dropbox/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/elasticsearch/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/email/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
    manifoldcf/branches/release-1.8-branch/connectors/filesystem/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/forcedmetadata/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/generic/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/googledrive/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/gridfs/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/gts/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
    manifoldcf/branches/release-1.8-branch/connectors/hdfs/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
    manifoldcf/branches/release-1.8-branch/connectors/jcifs/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/jdbc/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/jira/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/ldap/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
    manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
    manifoldcf/branches/release-1.8-branch/connectors/nullauthority/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/nulloutput/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/nulltransformation/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/opensearchserver/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/regexpmapper/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/rss/   (props changed)
    manifoldcf/branches/release-1.8-branch/connectors/rss/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/sharepoint/   (props changed)
    manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SPSProxyHelper.java
    manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
    manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
    manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    manifoldcf/branches/release-1.8-branch/connectors/sharepoint/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/solr/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/tika/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/webcrawler/pom.xml
    manifoldcf/branches/release-1.8-branch/connectors/wiki/   (props changed)
    manifoldcf/branches/release-1.8-branch/connectors/wiki/pom.xml
    manifoldcf/branches/release-1.8-branch/framework/   (props changed)
    manifoldcf/branches/release-1.8-branch/framework/build.xml
    manifoldcf/branches/release-1.8-branch/framework/buildfiles/connector-build.xml
    manifoldcf/branches/release-1.8-branch/framework/connector-common/pom.xml
    manifoldcf/branches/release-1.8-branch/framework/core/pom.xml
    manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file-proprietary/properties.xml
    manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-file/properties.xml
    manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk-proprietary/properties.xml
    manifoldcf/branches/release-1.8-branch/framework/example-multiprocess-zk/properties.xml
    manifoldcf/branches/release-1.8-branch/framework/example-singleprocess-proprietary/properties.xml
    manifoldcf/branches/release-1.8-branch/framework/example-singleprocess/properties.xml
    manifoldcf/branches/release-1.8-branch/framework/pom.xml

Propchange: manifoldcf/branches/release-1.8-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 02:11:34 2014
@@ -32,6 +32,7 @@
 /incubator/lcf/branches/CONNECTORS-474:1340041-1349740
 /incubator/lcf/branches/CONNECTORS-96:1335360-1336940
 /manifoldcf/branches/CONNECTORS-1027:1624243-1624462
+/manifoldcf/branches/CONNECTORS-1035:1646113-1646133
 /manifoldcf/branches/CONNECTORS-1037:1628690-1629377
 /manifoldcf/branches/CONNECTORS-1048:1627756-1627957
 /manifoldcf/branches/CONNECTORS-1050:1628142-1628796
@@ -117,4 +118,5 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/branches/dev_1x:1646136
 /manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,1634155,1634188,163
 4202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931

Modified: manifoldcf/branches/release-1.8-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/CHANGES.txt?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.8-branch/CHANGES.txt Wed Dec 17 02:11:34 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= Release 1.8 =====================
 
+CONNECTORS-1035: Introduce connector-common jar, to get
+legacy Alfresco connector working again.
+(Karl Wright)
+
 CONNECTORS-1121: Plugins have moved in the dist repository, so
 point at them properly.
 (Kamil Żyta, Karl Wright)

Modified: manifoldcf/branches/release-1.8-branch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/build.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/build.xml (original)
+++ manifoldcf/branches/release-1.8-branch/build.xml Wed Dec 17 02:11:34 2014
@@ -314,6 +314,10 @@
         <copy todir="dist/connector-lib">
             <fileset dir="framework/dist/connector-lib"/>
         </copy>
+        <mkdir dir="dist/connector-common-lib"/>
+        <copy todir="dist/connector-common-lib">
+            <fileset dir="framework/dist/connector-common-lib"/>
+        </copy>
         <mkdir dir="dist/connector-lib-proprietary"/>
         <copy todir="dist/connector-lib-proprietary">
             <fileset dir="framework/dist/connector-lib-proprietary"/>

Modified: manifoldcf/branches/release-1.8-branch/connectors/activedirectory/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/activedirectory/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/activedirectory/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/activedirectory/pom.xml Wed Dec 17 02:11:34 2014
@@ -185,6 +185,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/alfresco-webscript/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/alfresco-webscript/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/alfresco-webscript/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/alfresco-webscript/pom.xml Wed Dec 17 02:11:34 2014
@@ -223,6 +223,11 @@
         </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
+          <artifactId>mcf-connector-common</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
           <artifactId>mcf-agents</artifactId>
           <version>${project.version}</version>
         </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/alfresco/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/alfresco/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/alfresco/pom.xml Wed Dec 17 02:11:34 2014
@@ -306,6 +306,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/amazoncloudsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/amazoncloudsearch/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/amazoncloudsearch/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/amazoncloudsearch/pom.xml Wed Dec 17 02:11:34 2014
@@ -190,6 +190,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/cmis/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/cmis/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/cmis/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/cmis/pom.xml Wed Dec 17 02:11:34 2014
@@ -201,6 +201,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/documentfilter/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/documentfilter/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/documentfilter/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/documentfilter/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/dropbox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/dropbox/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/dropbox/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/dropbox/pom.xml Wed Dec 17 02:11:34 2014
@@ -197,6 +197,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>mcf-connector-common</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mcf-pull-agent</artifactId>
             <version>${project.version}</version>

Modified: manifoldcf/branches/release-1.8-branch/connectors/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/elasticsearch/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/elasticsearch/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/elasticsearch/pom.xml Wed Dec 17 02:11:34 2014
@@ -206,6 +206,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/email/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/email/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/email/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/email/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java Wed Dec 17 02:11:34 2014
@@ -22,7 +22,7 @@ import org.apache.manifoldcf.core.interf
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.interfaces.*;
 import org.apache.manifoldcf.crawler.system.Logging;
-import org.apache.manifoldcf.core.extmimemap.ExtensionMimeMap;
+import org.apache.manifoldcf.connectorcommon.extmimemap.ExtensionMimeMap;
 import java.util.*;
 import java.io.*;
 import java.net.URI;

Modified: manifoldcf/branches/release-1.8-branch/connectors/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/filesystem/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/filesystem/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/filesystem/pom.xml Wed Dec 17 02:11:34 2014
@@ -191,6 +191,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/forcedmetadata/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/forcedmetadata/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/forcedmetadata/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/forcedmetadata/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/generic/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/generic/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/generic/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/generic/pom.xml Wed Dec 17 02:11:34 2014
@@ -184,6 +184,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>mcf-connector-common</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mcf-agents</artifactId>
             <version>${project.version}</version>

Modified: manifoldcf/branches/release-1.8-branch/connectors/googledrive/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/googledrive/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/googledrive/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/googledrive/pom.xml Wed Dec 17 02:11:34 2014
@@ -197,6 +197,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>mcf-connector-common</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mcf-pull-agent</artifactId>
             <version>${project.version}</version>

Modified: manifoldcf/branches/release-1.8-branch/connectors/gridfs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/gridfs/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/gridfs/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/gridfs/pom.xml Wed Dec 17 02:11:34 2014
@@ -68,6 +68,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>mcf-connector-common</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mcf-agents</artifactId>
             <version>${project.version}</version>

Modified: manifoldcf/branches/release-1.8-branch/connectors/gts/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/gts/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/gts/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/gts/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java Wed Dec 17 02:11:34 2014
@@ -30,7 +30,7 @@ import org.apache.manifoldcf.crawler.int
 import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.core.common.XThreadInputStream;
 import org.apache.manifoldcf.core.common.XThreadStringBuffer;
-import org.apache.manifoldcf.core.extmimemap.ExtensionMimeMap;
+import org.apache.manifoldcf.connectorcommon.extmimemap.ExtensionMimeMap;
 
 import java.util.*;
 import java.io.*;

Modified: manifoldcf/branches/release-1.8-branch/connectors/hdfs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/hdfs/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/hdfs/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/hdfs/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Wed Dec 17 02:11:34 2014
@@ -69,7 +69,7 @@ import org.apache.manifoldcf.core.interf
 import org.apache.manifoldcf.crawler.interfaces.IVersionActivity;
 import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.crawler.system.ManifoldCF;
-import org.apache.manifoldcf.core.extmimemap.ExtensionMimeMap;
+import org.apache.manifoldcf.connectorcommon.extmimemap.ExtensionMimeMap;
 import org.apache.manifoldcf.core.common.DateParser;
 
 /** This is the "repository connector" for a smb/cifs shared drive file system.  It's a relative of the share crawler, and should have

Modified: manifoldcf/branches/release-1.8-branch/connectors/jcifs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/jcifs/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/jcifs/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/jcifs/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/jdbc/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/jdbc/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/jdbc/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/jira/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/jira/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/jira/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/jira/pom.xml Wed Dec 17 02:11:34 2014
@@ -197,6 +197,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>mcf-connector-common</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mcf-pull-agent</artifactId>
             <version>${project.version}</version>

Modified: manifoldcf/branches/release-1.8-branch/connectors/ldap/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/ldap/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/ldap/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/ldap/pom.xml Wed Dec 17 02:11:34 2014
@@ -184,6 +184,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java Wed Dec 17 02:11:34 2014
@@ -228,7 +228,7 @@ public class MeridioAuthority extends or
           UserName, Password,
           InetAddress.getLocalHost().getHostName(),
           mySSLFactory,
-          org.apache.manifoldcf.core.common.CommonsHTTPSender.class,
+          org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.class,
           "client-config.wsdd");
       }
       catch (NumberFormatException e)

Modified: manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java Wed Dec 17 02:11:34 2014
@@ -188,7 +188,7 @@ public class MeridioConnector extends or
           params.getObfuscatedParameter("Password"),
           InetAddress.getLocalHost().getHostName(),
           mySSLFactory,
-          org.apache.manifoldcf.core.common.CommonsHTTPSender.class,
+          org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.class,
           "client-config.wsdd");
       }
       catch (NumberFormatException e)

Modified: manifoldcf/branches/release-1.8-branch/connectors/nullauthority/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/nullauthority/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/nullauthority/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/nullauthority/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/nulloutput/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/nulloutput/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/nulloutput/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/nulloutput/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/nulltransformation/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/nulltransformation/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/nulltransformation/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/nulltransformation/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/opensearchserver/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/opensearchserver/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/opensearchserver/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/opensearchserver/pom.xml Wed Dec 17 02:11:34 2014
@@ -192,6 +192,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/regexpmapper/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/regexpmapper/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/regexpmapper/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/regexpmapper/pom.xml Wed Dec 17 02:11:34 2014
@@ -184,6 +184,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Propchange: manifoldcf/branches/release-1.8-branch/connectors/rss/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 02:11:34 2014
@@ -31,6 +31,7 @@
 /incubator/lcf/branches/CONNECTORS-470/connectors/rss:1337828-1349740
 /incubator/lcf/branches/CONNECTORS-474/connectors/rss:1340041-1349740
 /incubator/lcf/branches/CONNECTORS-96/connectors/rss:1335360-1336940
+/manifoldcf/branches/CONNECTORS-1035/connectors/rss:1646113-1646133
 /manifoldcf/branches/CONNECTORS-1050/connectors/rss:1628142-1628796
 /manifoldcf/branches/CONNECTORS-120/connectors/rss:1406712-1407974,1407982-1411043,1411049-1411943,1411969,1412019
 /manifoldcf/branches/CONNECTORS-470/connectors/rss:1349741-1360750,1360808
@@ -50,4 +51,5 @@
 /manifoldcf/branches/CONNECTORS-912/connectors/rss:1579605-1582723
 /manifoldcf/branches/CONNECTORS-962/connectors/rss:1602683-1603198
 /manifoldcf/branches/CONNECTORS-990/connectors/rss:1610284-1610707
+/manifoldcf/branches/dev_1x/connectors/rss:1646136
 /manifoldcf/trunk/connectors/rss:1621613,1621855,1622740,1622850,1624906,1628798,1633727,1633764,1634202

Modified: manifoldcf/branches/release-1.8-branch/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/rss/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/rss/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/rss/pom.xml Wed Dec 17 02:11:34 2014
@@ -191,6 +191,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Propchange: manifoldcf/branches/release-1.8-branch/connectors/sharepoint/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 02:11:34 2014
@@ -31,6 +31,7 @@
 /incubator/lcf/branches/CONNECTORS-470/connectors/sharepoint:1337828-1349740
 /incubator/lcf/branches/CONNECTORS-474/connectors/sharepoint:1340041-1349740
 /incubator/lcf/branches/CONNECTORS-96/connectors/sharepoint:1335360-1336940
+/manifoldcf/branches/CONNECTORS-1035/connectors/sharepoint:1646113-1646133
 /manifoldcf/branches/CONNECTORS-1067/connectors/sharepoint:1630049-1630186
 /manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint:1640149-1640198
 /manifoldcf/branches/CONNECTORS-120/connectors/sharepoint:1406712-1407974,1411049-1416451
@@ -58,4 +59,5 @@
 /manifoldcf/branches/CONNECTORS-891/connectors/sharepoint:1568778-1568807
 /manifoldcf/branches/CONNECTORS-912/connectors/sharepoint:1579605-1582723
 /manifoldcf/branches/CONNECTORS-990/connectors/sharepoint:1610284-1610707
+/manifoldcf/branches/dev_1x/connectors/sharepoint:1646136
 /manifoldcf/trunk/connectors/sharepoint:1621613,1621855,1622740,1623599,1625023,1625108,1626973,1630188,1633668,1640199,1642531

Modified: manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SPSProxyHelper.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SPSProxyHelper.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SPSProxyHelper.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SPSProxyHelper.java Wed Dec 17 02:11:34 2014
@@ -67,7 +67,7 @@ import org.w3c.dom.Document;
 public class SPSProxyHelper {
 
 
-  public static final String HTTPCLIENT_PROPERTY = org.apache.manifoldcf.core.common.CommonsHTTPSender.HTTPCLIENT_PROPERTY;
+  public static final String HTTPCLIENT_PROPERTY = org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.HTTPCLIENT_PROPERTY;
 
   private final String serverUrl;
   private final String serverLocation;

Modified: manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java Wed Dec 17 02:11:34 2014
@@ -856,7 +856,7 @@ public class SharePointAuthority extends
       httpClient = builder.build();
       
       proxy = new SPSProxyHelper( serverUrl, encodedServerLocation, serverLocation, serverUserName, password,
-        org.apache.manifoldcf.core.common.CommonsHTTPSender.class, "client-config.wsdd",
+        org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.class, "client-config.wsdd",
         httpClient, isClaimSpace );
       
     }

Modified: manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java Wed Dec 17 02:11:34 2014
@@ -69,7 +69,7 @@ import org.w3c.dom.Document;
 public class SPSProxyHelper {
 
 
-  public static final String HTTPCLIENT_PROPERTY = org.apache.manifoldcf.core.common.CommonsHTTPSender.HTTPCLIENT_PROPERTY;
+  public static final String HTTPCLIENT_PROPERTY = org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.HTTPCLIENT_PROPERTY;
 
   private String serverUrl;
   private String serverLocation;

Modified: manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Wed Dec 17 02:11:34 2014
@@ -24,7 +24,7 @@ import org.apache.manifoldcf.crawler.int
 import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.crawler.system.ManifoldCF;
 import org.apache.manifoldcf.core.common.*;
-import org.apache.manifoldcf.core.extmimemap.ExtensionMimeMap;
+import org.apache.manifoldcf.connectorcommon.extmimemap.ExtensionMimeMap;
 import org.apache.manifoldcf.core.util.URLEncoder;
 import org.apache.manifoldcf.core.util.URLDecoder;
 
@@ -319,7 +319,7 @@ public class SharePointRepository extend
       httpClient = builder.build();
 
       proxy = new SPSProxyHelper( serverUrl, encodedServerLocation, serverLocation, userName, password,
-        org.apache.manifoldcf.core.common.CommonsHTTPSender.class, "client-config.wsdd",
+        org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender.class, "client-config.wsdd",
         httpClient );
       
     }

Modified: manifoldcf/branches/release-1.8-branch/connectors/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/sharepoint/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/sharepoint/pom.xml Wed Dec 17 02:11:34 2014
@@ -253,6 +253,11 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>wsdl4j</groupId>
       <artifactId>wsdl4j</artifactId>
       <version>1.6.2</version>

Modified: manifoldcf/branches/release-1.8-branch/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/solr/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/solr/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/tika/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/tika/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/tika/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/tika/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: manifoldcf/branches/release-1.8-branch/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/webcrawler/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/webcrawler/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Propchange: manifoldcf/branches/release-1.8-branch/connectors/wiki/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 02:11:34 2014
@@ -31,6 +31,7 @@
 /incubator/lcf/branches/CONNECTORS-470/connectors/wiki:1337828-1349740
 /incubator/lcf/branches/CONNECTORS-474/connectors/wiki:1340041-1349740
 /incubator/lcf/branches/CONNECTORS-96/connectors/wiki:1335360-1336940
+/manifoldcf/branches/CONNECTORS-1035/connectors/wiki:1646113-1646133
 /manifoldcf/branches/CONNECTORS-1050/connectors/wiki:1628142-1628796
 /manifoldcf/branches/CONNECTORS-1067/connectors/wiki:1630049-1630186
 /manifoldcf/branches/CONNECTORS-120/connectors/wiki:1406712-1407974,1407982-1411043,1411049-1411943
@@ -51,4 +52,5 @@
 /manifoldcf/branches/CONNECTORS-774/connectors/wiki:1521768-1523232
 /manifoldcf/branches/CONNECTORS-912/connectors/wiki:1579605-1582723
 /manifoldcf/branches/CONNECTORS-962/connectors/wiki:1602683-1603198
+/manifoldcf/branches/dev_1x/connectors/wiki:1646136
 /manifoldcf/trunk/connectors/wiki:1621613,1621855,1622740,1625103,1628798,1630188,1633108,1633202

Modified: manifoldcf/branches/release-1.8-branch/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/connectors/wiki/pom.xml?rev=1646137&r1=1646136&r2=1646137&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/connectors/wiki/pom.xml (original)
+++ manifoldcf/branches/release-1.8-branch/connectors/wiki/pom.xml Wed Dec 17 02:11:34 2014
@@ -183,6 +183,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-connector-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>mcf-agents</artifactId>
       <version>${project.version}</version>
     </dependency>

Propchange: manifoldcf/branches/release-1.8-branch/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 02:11:34 2014
@@ -32,6 +32,7 @@
 /incubator/lcf/branches/CONNECTORS-474/framework:1340041-1349740
 /incubator/lcf/branches/CONNECTORS-96/framework:1335360-1336940
 /manifoldcf/branches/CONNECTORS-1027/framework:1624243-1624462
+/manifoldcf/branches/CONNECTORS-1035/framework:1646113-1646133
 /manifoldcf/branches/CONNECTORS-1037/framework:1628690-1629377
 /manifoldcf/branches/CONNECTORS-1048/framework:1627756-1627957
 /manifoldcf/branches/CONNECTORS-1050/framework:1628142-1628796
@@ -111,5 +112,6 @@
 /manifoldcf/branches/CONNECTORS-981/framework:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989/framework:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990/framework:1610284-1610707
+/manifoldcf/branches/dev_1x/framework:1646136
 /manifoldcf/trunk:1629122
 /manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1641911,1
 642163,1642255,1642318,1644197,1644399